Changeset 112 for trunk/src/os2ahci/wmakefile

Timestamp:

Jul 6, 2011, 10:02:47 AM (14 years ago)

Author:

Markus Thielen

Message:

• removed RAS calls (tracing to OS/2 kernel trace buffer was unreliable)
• added private trace ring buffer implementation
• support read from OS2AHCI$ character device
• contents of trace ring buffer are accesible via OS2AHCI$ character device
• updated WATCOM makefile; WATCOM build still produces a non-working driver
• code cleanup (unused variables etc.)

File:

• trunk/src/os2ahci/wmakefile (modified) (8 diffs)

trunk/src/os2ahci/wmakefile

@@ -3 +3 @@
 #
 # Copyright (c) 2010 Christian Mueller, Markus Thielen.
-# Parts copied from/inspired by the Linux AHCI driver; 
+# Parts copied from/inspired by the Linux AHCI driver;
 # those parts are (c) Linux AHCI/ATA maintainers
 #
@@ -19 +19 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+###############################################################################
+# Calling Syntax
+#
+# wmake -ms -f wmakefile
+#
+# NOTE: we use MS compatibility mode (-ms) so we can use a syntax similar
+#       to the well known nmake syntax.
+#
+
+#
+# THE WATCOM BUILD IS BROKEN!
+#
+# It might run through but produces a non-working driver
+#
+
+###############################################################################
+# wmake directives
+.HOLD # do not prompt for deletion of created files on error; leave them alone
+
 
 
@@ -38 +58 @@
                -I$(DDK)\base\ibmh \
                -I$(DDK)\base\src\dev\dasd\diskh \
-               -I$(WATCOM)\h
+               -I$(DDK)\base\src\dev\thinkpad\dockii\apmcalls \
+               -I$(CC16)\include
 
 AS_INCLUDE   = -I:$(DDK)\base\inc \
@@ -45 +66 @@
 LIB_DIRS     = $(DDK)\base\lib\ \
                $(DDK)\base\src\dev\dasd\devhlp\ \
-
+               $(DDK)\base\src\dev\thinkpad\dockii\apmcalls\ \
 
 ###############################################################################
 # Tool Chain
 #
-# This makefile uses the Watcom 16bit compiler. 
+# This makefile uses the Watcom 16bit compiler.
 # Linker and assembler are link.exe and alp.exe that ship with the OS/2 DDK
 #
@@ -62 +83 @@
 
 AFLAGS        = -Mb
-CFLAGS        = -d3 -hc -bt=os2 -ms -zu -5 -w2 -wcd=138 -zp1 -q -s -zgp -zfp -oi
+CFLAGS        = -d3 -hc -bt=os2 -ms -zu -5 -w3 -wcd=138 -wcd=300 -ecc -zp1 -q -s -zgp -zfp -oi
 CFLAGS_DEBUG  = -d3 -hc
-LFLAGS        = /noe /nod /packd /a:16 /batch /map /line 
+LFLAGS        = /noe /nod /packd /a:16 /batch /map /line
 
 ###############################################################################
@@ -71 +92 @@
 TARGET   = os2ahci.add
 
-LIBS     = addcalls doscalls rmcalls # dhcalls not needed, see local devhelp.h
+LIBS     = addcalls doscalls rmcalls apmcalls # dhcalls not needed, see local devhelp.h
 
 SRCS     = init.asm math.asm libc.c os2ahci.c pci.c ahci.c ata.c atapi.c \
-           ctxhook.c
+           ctxhook.c trace.c ioctl.c apm.c
 
 OBJS     = init.obj libc.obj os2ahci.obj pci.obj ahci.obj ata.obj atapi.obj \
-           ctxhook.obj
+           ctxhook.obj trace.obj ioctl.obj apm.obj
 
 INCS     = os2ahci.h ahci.h version.h
@@ -85 +106 @@
 
 clean:
-        rm -f $(OBJS) $(TARGET)
+        rm -f $(OBJS) $(TARGET) *.lst *.cod
 
 ###############################################################################
 # Object/source dependencies
 
-init.obj:     init.asm   wmakefile
+init.obj:     init.asm   Makefile
 
-libc.obj:     libc.c     wmakefile $(INCS)
+libc.obj:     libc.c     Makefile $(INCS)
 
-os2ahci.obj:  os2ahci.c  wmakefile $(INCS) bldday.h
+os2ahci.obj:  os2ahci.c  Makefile $(INCS) bldday.h ioctl.h
 
-pci.obj:      pci.c      wmakefile $(INCS)
+pci.obj:      pci.c      Makefile $(INCS)
 
-ahci.obj:     ahci.c     wmakefile $(INCS) ata.h atapi.h
+ahci.obj:     ahci.c     Makefile $(INCS) ata.h atapi.h
 
-ata.obj:      ata.c      wmakefile $(INCS) ata.h
+ata.obj:      ata.c      Makefile $(INCS) ata.h
 
-atapi.obj:    atapi.c    wmakefile $(INCS) ata.h atapi.h
+atapi.obj:    atapi.c    Makefile $(INCS) ata.h atapi.h
 
-ctxhook.obj:  ctxhook.c  wmakefile $(INCS) ata.h atapi.h
+ctxhook.obj:  ctxhook.c  Makefile $(INCS) ata.h atapi.h
+
+apm.obj:      apm.c      Makefile $(INCS)
+
+ioctl.obj:    ioctl.c    Makefile $(INCS) atapi.h ioctl.h
+
+trace.obj:    trace.c    Makefile $(INCS)
+
+os2ahci.def:  version.h  os2ahci.def.template
 
 ###############################################################################
@@ -124 +153 @@
         wdis -l $*.obj
 
+os2ahci.def:
+        $(BLDLEVEL) os2ahci.def.template os2ahci.def version.h
+
 $(TARGET): $(OBJS) os2ahci.def wmakefile
-        $(BLDLEVEL) os2ahci.def version.h
         $(LD) $(LFLAGS) $(OBJS),$(TARGET),$*.map,$(LIB_DIRS) $(LIBS),$*.def
         mapsym os2ahci