Changeset 24

Timestamp:

Sep 23, 2010, 12:10:39 PM (15 years ago)

Author:

markus

Message:

for watcom build: use watcom calling convention as default, _cdecl where needed

Location:

trunk/src/os2ahci

Files:

• ata.c (modified) (1 diff)
• os2ahci.c (modified) (3 diffs)
• os2ahci.h (modified) (4 diffs)
• wmakefile (modified) (1 diff)

trunk/src/os2ahci/ata.c

@@ -89 +89 @@
   memset(&ata_cmd, 0x00, sizeof(ata_cmd));
   ata_cmd.cmd = (u8) cmd;
-
-  _asm int 3;
 
   /* parse variable arguments */

trunk/src/os2ahci/os2ahci.c

@@ -42 +42 @@
 /* -------------------------- function prototypes -------------------------- */
 
-       void small_code_          (void);
+void     _cdecl small_code_          (void);
 
 /* ------------------------ global/static variables ------------------------ */
@@ -93 +93 @@
  * device driver's strategy function.
  */
-USHORT c_strat(RPH _far *req)
+USHORT _cdecl c_strat(RPH _far *req)
 { 
   u16 rc;
@@ -1026 +1026 @@
  * error that occurrs when linking WATCOM objects with DDK's link.exe
  */
-void small_code_(void)
-{
-}
+void _cdecl small_code_(void)
+{
+}

trunk/src/os2ahci/os2ahci.h

@@ -45 +45 @@
 
 #ifdef __WATCOMC__
+/* include WATCOM specific DEVHELP stubs */
 #include <devhelp.h>
 #else
@@ -339 +340 @@
 
 /* init.asm */
-extern u32        readl         (void _far *addr);
-extern u32        writel        (void _far *addr, u32 val);
-extern void _far *memcpy        (void _far *v_dst, void _far *v_src, int len);
-extern void _far *memset        (void _far *p, int ch, size_t len);
-extern void _far  restart_hook  (void);
-extern void _far  reset_hook    (void);
-extern void _far  engine_hook   (void);
+extern u32        _cdecl readl         (void _far *addr);
+extern u32        _cdecl writel        (void _far *addr, u32 val);
+extern void _far *_cdecl memcpy        (void _far *v_dst, void _far *v_src, int len);
+extern void _far *_cdecl memset        (void _far *p, int ch, size_t len);
+extern void _far  _cdecl restart_hook  (void);
+extern void _far  _cdecl reset_hook    (void);
+extern void _far  _cdecl engine_hook   (void);
 
 /* os2ahci.c */
@@ -405 +406 @@
 
 /* libc.c */
-extern void       init_com1     (void);
-extern int        vsprintf      (char _far *buf, const char *fmt, va_list va);
-extern int        sprintf       (char _far *buf, const char *fmt, ...);
-extern void       vfprintf      (const char *fmt, va_list va);
-extern void       printf        (const char *fmt, ...);
-extern void       cprintf       (const char *fmt, ...);
-extern void       phex          (const void _far *p, int len,
-                                 const char *fmt, ...);
-extern size_t     strlen        (const char _far *s);
-extern char _far *strcpy        (char _far *dst, const char _far *src);
-extern int        memcmp        (void _far *p1, void _far *p2, size_t len);
-extern long       strtol        (const char _far *buf,
-                                 const char _far * _far *ep, int base);
-extern void      *malloc        (size_t len);
-extern void       free          (void *ptr);
-extern void       mdelay_cal    (void);
-extern void       mdelay        (u32 millies);
-extern void       msleep        (u32 millies);
-extern void       panic         (char *msg);
-extern int        disable       (void);
-extern void       enable        (void);
+extern void        init_com1     (void);
+extern int         vsprintf      (char _far *buf, const char *fmt, va_list va);
+extern int         sprintf       (char _far *buf, const char *fmt, ...);
+extern void        vfprintf      (const char *fmt, va_list va);
+extern void _cdecl printf        (const char *fmt, ...);
+extern void        cprintf       (const char *fmt, ...);
+extern void        phex          (const void _far *p, int len,
+                                  const char *fmt, ...);
+extern size_t      strlen        (const char _far *s);
+extern char _far  *strcpy        (char _far *dst, const char _far *src);
+extern int         memcmp        (void _far *p1, void _far *p2, size_t len);
+extern long        strtol        (const char _far *buf,
+                                  const char _far * _far *ep, int base);
+extern void       *malloc        (size_t len);
+extern void        free          (void *ptr);
+extern void        mdelay_cal    (void);
+extern void        mdelay        (u32 millies);
+extern void        msleep        (u32 millies);
+extern void        panic         (char *msg);
+extern int         disable       (void);
+extern void        enable        (void);
 
 /* pci.c */
@@ -434 +435 @@
 
 /* ctxhook.c */
-extern void      restart_ctxhook    (ULONG parm);
-extern void      reset_ctxhook      (ULONG parm);
-extern void      engine_ctxhook     (ULONG parm);
+extern void      _cdecl restart_ctxhook    (ULONG parm);
+extern void      _cdecl reset_ctxhook      (ULONG parm);
+extern void      _cdecl engine_ctxhook     (ULONG parm);
 
 /* ---------------------------- global variables --------------------------- */
 
-extern char          end_of_data;   /* label at the end of all data segments */
-extern void    _near end_of_code(); /* label at the end of all code segments */
+extern char _cdecl       end_of_data;   /* label at the end of all data segments */
+extern void _cdecl _near end_of_code(); /* label at the end of all code segments */
 
 extern int           debug;         /* if != 0, print debug messages to COM1 */

trunk/src/os2ahci/wmakefile

@@ -59 +59 @@
 
 AFLAGS        = -Mb
-CFLAGS        = -ecc -d3 -hc -bt=os2 -ms -zu -5 -w2 -wcd=138 -zp1 -q -s -zgp -zfp -oi
+CFLAGS        = -d3 -hc -bt=os2 -ms -zu -5 -w2 -wcd=138 -zp1 -q -s -zgp -zfp -oi
 CFLAGS_DEBUG  = -d3 -hc
 LFLAGS        = /noe /nod /packd /a:16 /batch /map /line