Changeset 25 for trunk/src/os2ahci/ahci.c

Timestamp:

Sep 23, 2010, 4:39:43 PM (15 years ago)

Author:

markus

Message:

watcom calling conventions...

File:

• trunk/src/os2ahci/ahci.c (modified) (13 diffs)

trunk/src/os2ahci/ahci.c

@@ -103 +103 @@
 #define call_ahci_intr(i)   return(ahci_intr(irq_map[i]) >> 1)
 
-static USHORT _far irq_handler_00(void)  { call_ahci_intr(0); }
-static USHORT _far irq_handler_01(void)  { call_ahci_intr(1); }
-static USHORT _far irq_handler_02(void)  { call_ahci_intr(2); }
-static USHORT _far irq_handler_03(void)  { call_ahci_intr(3); }
-static USHORT _far irq_handler_04(void)  { call_ahci_intr(4); }
-static USHORT _far irq_handler_05(void)  { call_ahci_intr(5); }
-static USHORT _far irq_handler_06(void)  { call_ahci_intr(6); }
-static USHORT _far irq_handler_07(void)  { call_ahci_intr(7); }
+static USHORT _far APIENTRY irq_handler_00(void)  { call_ahci_intr(0); }
+static USHORT _far APIENTRY irq_handler_01(void)  { call_ahci_intr(1); }
+static USHORT _far APIENTRY irq_handler_02(void)  { call_ahci_intr(2); }
+static USHORT _far APIENTRY irq_handler_03(void)  { call_ahci_intr(3); }
+static USHORT _far APIENTRY irq_handler_04(void)  { call_ahci_intr(4); }
+static USHORT _far APIENTRY irq_handler_05(void)  { call_ahci_intr(5); }
+static USHORT _far APIENTRY irq_handler_06(void)  { call_ahci_intr(6); }
+static USHORT _far APIENTRY irq_handler_07(void)  { call_ahci_intr(7); }
 
 PFN irq_handlers[] = {
@@ -185 +185 @@
         if (val & HOST_CAP2_NVMHCI)    printf(" nvmhci");
         if (val & HOST_CAP2_APST)      printf(" apst");
-      
+
       }
       printf("\n");
@@ -427 +427 @@
     goto exit_port_scan;
   }
-  
+
   /* perform port scan */
   dprintf("scanning ports on adapter #%d\n", ad_no(ai));
@@ -456 +456 @@
       /* this port has a device attached and is ready to accept commands */
       ddprintf("port #%d seems to be attached to a device; probing...\n", p);
-      rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_ID_ATA, 
+      rc = ahci_exec_polled_cmd(ai, p, 0, 500, ATA_CMD_ID_ATA,
                                 AP_VADDR, (void _far *) id_buf, 512,
                                 AP_END);
@@ -865 +865 @@
     if (aws->is_ncq && port->reg_cmds == 0 || !aws->is_ncq && port->ncq_cmds == 0) {
 
-      /* Find next available command slot. We use a simple round-robin 
+      /* Find next available command slot. We use a simple round-robin
        * algorithm for this to prevent commands with higher slot indexes
        * from stalling when new commands are coming in frequently.
@@ -954 +954 @@
     goto restore_bios_config;
   }
-  
+
   /* save port configuration */
   if ((pc = ahci_save_port_config(ai, p)) == NULL) {
@@ -1132 +1132 @@
   u32 active_cmds;
   u32 done_mask;
-  
+
   ddprintf("port interrupt for adapter #%d, port #%d\n", ad_no(ai), p);
   memset(&done_queue, 0x00, sizeof(done_queue));
@@ -1140 +1140 @@
   writel(port_mmio + PORT_IRQ_STAT, irq_stat);
   readl(port_mmio + PORT_IRQ_STAT); /* flush */
-  
+
   if (irq_stat & PORT_IRQ_ERROR) {
     /* this is an error interrupt */
@@ -1258 +1258 @@
     /* no point analyzing device errors after a reset... */
     return;
-  } 
+  }
 
   /* Handle device-specific errors. Those errors typically involve restarting
@@ -1269 +1269 @@
   }
 }
-   
+
 /******************************************************************************
  * Get device or media geometry. Device and media geometry are expected to be
@@ -1304 +1304 @@
 
   ahci_exec_iorb(iorb, 1, cmd_func(iorb, read));
-}  
+}
 
 /******************************************************************************
@@ -1344 +1344 @@
         ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
         "ahci_execute_cdb(%d.%d.%d)", a, p, d);
-  
+
   if (ad_infos[a].ports[p].devs[d].atapi) {
     ahci_exec_iorb(iorb, 0, atapi_execute_cdb);
@@ -1361 +1361 @@
   int p = iorb_unit_port(iorb);
   int d = iorb_unit_device(iorb);
-  
+
   dphex(((IORB_ADAPTER_PASSTHRU _far *) iorb)->pControllerCmd,
         ((IORB_ADAPTER_PASSTHRU _far *) iorb)->ControllerCmdLen,
         "ahci_execute_cdb(%d.%d.%d)", a, p, d);
-  
+
   if (ad_infos[a].ports[p].devs[d].atapi) {
     iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);