Changeset 25

Timestamp:

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

Author:

markus

Message:

watcom calling conventions...

Location:

trunk/src

Files:

• include/devhelp.h (modified) (7 diffs)
• os2ahci/ahci.c (modified) (13 diffs)
• os2ahci/libc.c (modified) (9 diffs)
• os2ahci/os2ahci.c (modified) (9 diffs)
• os2ahci/os2ahci.h (modified) (2 diffs)

trunk/src/include/devhelp.h

@@ -1 +1 @@
 /* DEVHELP.H - DevHelp header file for Watcom-based device drivers
+ *
+ * Markus Thielen 09/2010:
+ *    some modifications for OpenWatcom/os2ahci.add
+ *
 */
 
@@ -5 +9 @@
 #define DEVHELP_INCLUDED
 
-#ifdef __WATCOMC__ 
+#ifdef __WATCOMC__
 
 #ifndef OS2_INCLUDED
@@ -242 +246 @@
 
 typedef struct _SELDESCINFO {
-  UCHAR    Type;                        
-  UCHAR    Granularity;                 
-  LIN      BaseAddr;                    
-  ULONG    Limit;                       
-} SELDESCINFO, __far *PSELDESCINFO;  
-                                        
-typedef struct _GATEDESCINFO {         
-  UCHAR    Type;                        
-  UCHAR    ParmCount;                   
-  SEL      Selector;                    
-  USHORT   Reserved_1;                  
-  ULONG    Offset;                      
+  UCHAR    Type;
+  UCHAR    Granularity;
+  LIN      BaseAddr;
+  ULONG    Limit;
+} SELDESCINFO, __far *PSELDESCINFO;
+
+typedef struct _GATEDESCINFO {
+  UCHAR    Type;
+  UCHAR    ParmCount;
+  SEL      Selector;
+  USHORT   Reserved_1;
+  ULONG    Offset;
 } GATEDESCINFO, __far *PGATEDESCINFO;
 
@@ -383 +387 @@
 
 /* DevHelp_MonWrite has one change compared to the original specification.
-   The DataRecord parameter was originally a far (16:16) pointer.  It has 
+   The DataRecord parameter was originally a far (16:16) pointer.  It has
    been changed to a near pointer because DS must point to the default data
-   segment and therefore the DataRecord parameter must be near.  This 
+   segment and therefore the DataRecord parameter must be near.  This
    allows the compiler to catch the error.
 */
@@ -443 +447 @@
    modify exact [ax cx dx di];
 
-/* NOTE: After the DevHelp call, SI contains the modified selector. However, 
+/* NOTE: After the DevHelp call, SI contains the modified selector. However,
    the C interface has no provisions for returning this value to the caller.
    You can, however, use the _SI() inline function defined in include.h.
@@ -913 +917 @@
 USHORT DevHelp_VirtToPhys(PVOID SelOffset, PULONG PhysAddr);
 #pragma aux DevHelp_VirtToPhys = \
+   "int 3" \
    "push ds" \
    "mov  dl,16h" \
@@ -939 +944 @@
 #define VMDHA_RESERVE           0x0100                               /*@V76282*/
 #define VMDHA_USEHIGHMEM        0x0800                               /*@V76282*/
- 
+
 USHORT DevHelp_VMAlloc(ULONG Flags, ULONG Size, ULONG PhysAddr, PLIN LinearAddr, PPVOID SelOffset);
 #pragma aux DevHelp_VMAlloc = \

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);

trunk/src/os2ahci/libc.c

@@ -45 +45 @@
 /* -------------------------- function prototypes -------------------------- */
 
-static void      long_to_asc            (long val, char _far *buf, int base,
-                                         int zero, int flen);
-static void _far mdelay_timer_callback  (ULONG timer_handle, ULONG parm1,
-                                         ULONG parm2);
-static int       mdelay_cal_end         (void);
+static void                long_to_asc            (long val,
+                                                   char _far *buf,
+                                                   int base,
+                                                   int zero, int flen);
+static void APIENTRY  _far  mdelay_timer_callback  (ULONG timer_handle,
+                                                   ULONG parm1,
+                                                   ULONG parm2);
+static int                 mdelay_cal_end         (void);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -140 +143 @@
         }
       }
-      
+
       /* data type modifiers */
       lmod = (*fmt == 'l') ? 1 : 0;
@@ -161 +164 @@
 
       case 'c':
-        *(buf++) = (char) va_arg(va, int); 
+        *(buf++) = (char) va_arg(va, int);
         break;
 
@@ -246 +249 @@
      * definitions, it's safer and easier to put the whole thing
      * into an _asm block.
-     * 
+     *
      * The C equivalent would look like this:
      *
@@ -279 +282 @@
 {
   va_list va;
-  
+
   va_start(va, fmt);
   vprintf(fmt, va);
@@ -296 +299 @@
   va_list va;
   size_t len;
-  
+
   va_start(va, fmt);
   vsprintf(buf, fmt, va);
@@ -476 +479 @@
         return(heap_buf + (n - units) * HEAP_UNIT);
       }
-      
+
       /* keep searching... */
       i = n;
@@ -536 +539 @@
 
   dprintf("calibrating delay loop... ");
+
+  _asm int 3;
 
   mdelay_loops_per_ms = 100000;
@@ -727 +732 @@
  * Timer callback handler for 'mdelay_calibrate()'
  */
-static void _far mdelay_timer_callback(ULONG timer_handle, ULONG parm1,
-                                       ULONG parm2)
+static void APIENTRY  _far mdelay_timer_callback(ULONG timer_handle,
+                                                ULONG parm1,
+                                                ULONG parm2)
 {
   mdelay_cal_status = MD_CALIBRATION_END;

trunk/src/os2ahci/os2ahci.c

@@ -94 +94 @@
  */
 USHORT _cdecl c_strat(RPH _far *req)
-{ 
+{
   u16 rc;
 
@@ -237 +237 @@
       goto init_fail;
     }
-    
+
     /* allocate context hooks */
     if (DevHelp_AllocateCtxHook(mk_NPFN(restart_hook), &restart_ctxhook_h) != 0 ||
@@ -285 +285 @@
  *       details.
  */
-void _far _loadds add_entry(IORBH _far *first_iorb)
+void _far APIENTRY _loadds add_entry(IORBH _far *first_iorb)
 {
   IORBH _far *iorb;
@@ -315 +315 @@
       int p = iorb_unit_port(iorb);
       int d = iorb_unit_device(iorb);
-      
+
       if (a >= ad_info_cnt ||
           p > ad_infos[a].port_max ||
@@ -559 +559 @@
 
   switch (iorb->CommandModifier) {
-  
+
   case IOCM_ABORT:
     /* abort all pending commands on specified port and device */
@@ -577 +577 @@
     DevHelp_ArmCtxHook(0, reset_ctxhook_h);
     break;
-    
+
   case IOCM_SUSPEND:
   case IOCM_RESUME:
@@ -842 +842 @@
     ahci_write(iorb);
     break;
-    
+
   default:
     iorb_seterr(iorb, IOERR_CMD_NOT_SUPPORTED);
@@ -952 +952 @@
   return(!found);
 }
-        
+
 /******************************************************************************
  * Set the error code in the specified IORB
- * 
+ *
  * NOTE: This function does *not* call iorb_done(). It merely sets the IORB
  *       status to the specified error code.
@@ -1023 +1023 @@
 
 /******************************************************************************
- * small_code_ - this dummy func resolves the undefined reference linker 
+ * small_code_ - this dummy func resolves the undefined reference linker
  * error that occurrs when linking WATCOM objects with DDK's link.exe
  */

trunk/src/os2ahci/os2ahci.h

@@ -164 +164 @@
  *  mapping                   comment
  *  -----------------------------------------------------------------------
- *  4 bits for the adapter    current max is 8 adapters 
+ *  4 bits for the adapter    current max is 8 adapters
  *  4 bits for the port       AHCI spec defines up to 32 ports
  *  4 bits for the device     SATA spec defines up to 15 devices behind PMP
@@ -350 +350 @@
 /* os2ahci.c */
 extern USHORT  init_drv               (RPINITIN _far *req);
-extern void _far _loadds add_entry    (IORBH _far *iorb);
+extern void _far APIENTRY _loadds add_entry    (IORBH _far *iorb);
 extern void    trigger_engine         (void);
 extern int     trigger_engine_1       (void);