Floppy Disk Controller — Änderungen 8177 → 8331

Bevor man Daten bzw. Befehle ins Datenregister schreiben darf, muss man im MSR testen, ob das DIO-Bit gelöscht und das MRQ-Bit gesetzt ist. Erst dann ist das Datenregister leer und bereit Daten zu empfangen.

#define NO_ERROR = 0;

#define ERROR_TIMEOUT = 1;

#define ERROR_TIMEOUT 1;

~~BYTE~~ error=NO_ERROR;

uint8_t error = NO_ERROR;

~~VOID~~ send_cmd(~~BYTE~~ cmd)

void send_cmd(uint8_t cmd)

~~VOID~~ send_data(~~BYTE~~ data)

void send_data(uint8_t data)

for (uint8_t timeout = 0; timeout < 200; timeout++)

for (timeout=0; timeout<200; timeout++)

if ( (inb(MSR) & (MSR_MASK_DATAREG|MSR_MASK_DIO2CPU)) == MSR_MASK_DATAREG)

if ( (inb(MSR) & (MSR_MASK_DATAREG | MSR_MASK_DIO2CPU)) == MSR_MASK_DATAREG)

~~BYTE~~ read_data()

for(uint8_t timeout = 0; timeout < 200; timeout++)

for(timeout=0; timeout<200; timeout++)

if( (inb(MSR) & (MSR_MASK_DATAREG|MSR_MASK_DIO2CPU)) == (MSR_MASK_DATAREG|MSR_MASK_DIO2CPU))

if( (inb(MSR) & (MSR_MASK_DATAREG | MSR_MASK_DIO2CPU)) == (MSR_MASK_DATAREG | MSR_MASK_DIO2CPU))

=== Motor starten/anhalten ===

~~VOID~~ start_motor(~~BYTE~~ n)

void start_motor(uint8_t n)

if (!drive_states[n].motor_on)

outb(DOR,n | (0x01<<(n+4)) | DOR_MASK_NRESET | DOR_MASK_DMA);

outb(DOR, n | (0x01<<(n+4)) | DOR_MASK_NRESET | DOR_MASK_DMA);

~~VOID~~ stop_motor(~~BYTE~~ n)

void stop_motor(uint8_t n)

if (drive_states[n].motor_on)

outb(DOR,n | DOR_MASK_NRESET | DOR_MASK_DMA);

outb(DOR, n | DOR_MASK_NRESET | DOR_MASK_DMA);

=== Laufwerk kallibrieren ===

~~VOID~~ calibrate_drive(~~BYTE~~ drive)

void calibrate_drive(uint8_t drive)

=== Schreib-/Lesekopf postionieren ===

~~BOOL~~ seek_head(~~BYTE~~ cyl, ~~BYTE~~ head, ~~BYTE~~ sector)

bool seek_head(uint8_t cyl, uint8_t head, uint8_t sector)

outb(DOR, DOR_MASK_NRESET | DOR_MASK_DMA);

for(int i = 0; i < 4; i++)

check_interrupt_status();

#define CMD_READ_SECTOR (0x06 | 0x40)

~~BOOL~~ transfer_sector(~~BYTE~~ drive, ~~BYTE~~ cylinder, ~~BYTE~~ head, ~~BYTE~~ sector, ~~BOOL~~ write, ~~VOID~~* buffer)

bool transfer_sector(uint8_t drive, uint8_t cylinder, uint8_t head, uint8_t sector, bool write, void* buffer)

select_drive(drive); //TODO

start_motor(drive); //TODO

dma_begin_transfer(buffer, write);

for (int i = 0; i<5; i++)

send_command(wrie ? CMD_WRIE_SECTOR : CMD_READ_SECTOR);

send_data(drive | head<<2) );

send_data(drive | head<<2);

send_data(cylinder);

check_interrupt_status();

/* fünf Fehlversuche */

@@ Zeile 518: / Zeile 518: @@
 Bevor man Daten bzw. Befehle ins Datenregister schreiben darf, muss man im MSR testen, ob das DIO-Bit gelöscht und das MRQ-Bit gesetzt ist. Erst dann ist das Datenregister leer und bereit Daten zu empfangen.
 <c>
-#define NO_ERROR = 0;
+#define NO_ERROR      0;
-#define ERROR_TIMEOUT = 1;
+#define ERROR_TIMEOUT  1;
-BYTE error=NO_ERROR;
+uint8_t error = NO_ERROR;
-VOID send_cmd(BYTE cmd)
+void send_cmd(uint8_t cmd)
 {
    send_data(cmd);
 }
-VOID send_data(BYTE data)
+void send_data(uint8_t data)
 {
-  BYTE timeout;
+   for (uint8_t timeout = 0; timeout < 200; timeout++)
-   for (timeout=0; timeout<200; timeout++)
    {
-     if ( (inb(MSR) & (MSR_MASK_DATAREG|MSR_MASK_DIO2CPU)) == MSR_MASK_DATAREG)
+     if ( (inb(MSR) & (MSR_MASK_DATAREG | MSR_MASK_DIO2CPU)) == MSR_MASK_DATAREG)
      {
-       outb(CMD,cmd);
+       outb(CMD, cmd);
        error = NO_ERROR;
        return;
@@ Zeile 550: / Zeile 549: @@
 <c>
-BYTE read_data()
+uint8_t read_data()
 {
-  BYTE timeout;
+   for(uint8_t timeout = 0; timeout < 200; timeout++)
-   for(timeout=0; timeout<200; timeout++)
    {
-     if( (inb(MSR) & (MSR_MASK_DATAREG|MSR_MASK_DIO2CPU)) == (MSR_MASK_DATAREG|MSR_MASK_DIO2CPU))
+     if( (inb(MSR) & (MSR_MASK_DATAREG | MSR_MASK_DIO2CPU)) == (MSR_MASK_DATAREG | MSR_MASK_DIO2CPU))
      {
        error = NO_ERROR;
@@ Zeile 569: / Zeile 567: @@
 === Motor starten/anhalten ===
 <c>
-VOID start_motor(BYTE n)
+void start_motor(uint8_t n)
 {
    if (!drive_states[n].motor_on)
    {
-     outb(DOR,n | (0x01<<(n+4)) | DOR_MASK_NRESET | DOR_MASK_DMA);
+     outb(DOR, n | (0x01<<(n+4)) | DOR_MASK_NRESET | DOR_MASK_DMA);
    }
 }
-VOID stop_motor(BYTE n)
+void stop_motor(uint8_t n)
 {
    if (drive_states[n].motor_on)
    {
-     outb(DOR,n | DOR_MASK_NRESET | DOR_MASK_DMA);
+     outb(DOR, n | DOR_MASK_NRESET | DOR_MASK_DMA);
    }
 }
@@ Zeile 588: / Zeile 586: @@
 === Laufwerk kallibrieren ===
 <c>
-VOID calibrate_drive(BYTE drive)
+void calibrate_drive(uint8_t drive)
 {
 ...TODO
@@ Zeile 595: / Zeile 593: @@
 === Schreib-/Lesekopf postionieren ===
 <c>
-BOOL seek_head(BYTE cyl, BYTE head, BYTE sector)
+bool seek_head(uint8_t cyl, uint8_t head, uint8_t sector)
 {
 ...TODO
@@ Zeile 602: / Zeile 600: @@
 === Reset ===
 <c>
-VOID reset()
+void reset()
 {
-  int i;
    outb(DOR, 0);
    sleep(10);
    outb(DOR, DOR_MASK_NRESET | DOR_MASK_DMA);
    wait_irq();
-   for(i=0; i<4; i++)
+   for(int i = 0; i < 4; i++)
    {
      check_interrupt_status();
@@ Zeile 626: / Zeile 622: @@
 #define CMD_READ_SECTOR		(0x06 | 0x40)
-BOOL transfer_sector(BYTE drive, BYTE cylinder, BYTE head, BYTE sector, BOOL write, VOID* buffer)
+bool transfer_sector(uint8_t drive, uint8_t cylinder, uint8_t head, uint8_t sector, bool write, void* buffer)
 {
-  int i;
    select_drive(drive);   //TODO
    start_motor(drive);    //TODO
@@ Zeile 634: / Zeile 629: @@
    dma_begin_transfer(buffer, write);
-   for (i=0; i<5; i++)
+   for (int i = 0; i<5; i++)
    {
      send_command(wrie ? CMD_WRIE_SECTOR : CMD_READ_SECTOR);
-     send_data(drive | head<<2) );
+     send_data(drive | head<<2);
      send_data(cylinder);
      send_data(head);
@@ Zeile 656: / Zeile 651: @@
      {
        check_interrupt_status();
-       return TRUE;
+       return true;
      }
    }
    /* fünf Fehlversuche */
-   return FALSE;
+   return false;
 }
 </c>