Changeset 176 for sbliveos2/trunk

Timestamp:

Apr 14, 2001, 7:03:36 PM (24 years ago)

Author:

sandervl

Message:

updates

Location:

sbliveos2/trunk

Files:

• ChangeLog (modified) (1 diff)
• drv16/init.cpp (modified) (1 diff)
• drv16/makefile.os2 (modified) (2 diffs)
• drv32/init.c (modified) (1 diff)
• drv32/makefile.os2 (modified) (1 diff)
• sblive/cardmi.h (modified) (1 diff)
• sblive/emu_wrapper.h (modified) (2 diffs)

sbliveos2/trunk/ChangeLog

@@ -4 +4 @@
         - *: makefile updates
              You must run Configure.cmd before building the driver
+        - sblive: compile fixes
 
  2001-03-23: Sander van Leeuwen <sandervl@xs4all.nl>

sbliveos2/trunk/drv16/init.cpp

@@ -71 +71 @@
 
 static char szSBLive[]    = "SoundBlaster Live! MMPM/2 Audio Driver v"SBLIVE_VERSION;
-static char szCopyRight[] = "Copyright 2000 Sander van Leeuwen (sandervl@xs4all.nl)";
+static char szCopyRight[] = "Copyright 2000-2001 Sander van Leeuwen (sandervl@xs4all.nl)";
 static char NEWLINE[]     = "\r\n";
 static char szSBLiveNotFound[] = "SB Live! hardware not detected!";

sbliveos2/trunk/drv16/makefile.os2

@@ -69 +69 @@
 $(OBJDIR)\$(NAME).sys: $(OBJS) $(OBJDIR)\$(NAME).lrf makefile.os2 $(%DDK)\BASE\lib\os2286.lib $(SBLIVE_LIB)\runtime.lib $(%DDK)\BASE\src\dev\resource\rmcalls\rmcalls.lib
    $(LINK) @$(OBJDIR)\$(NAME).lrf
-   copy $(OBJDIR)\$(NAME).sys ..\bin
+   copy $(OBJDIR)\$(NAME).sys $(SBLIVE_BIN)
 
 $(OBJDIR)\$(NAME).sym: $(OBJDIR)\$(WMAPNAME)
@@ -76 +76 @@
    mapsym $(NAME).MAP
    cd ..\..
-   copy $(OBJDIR)\$(NAME).sym ..\bin
+   copy $(OBJDIR)\$(NAME).sym $(SBLIVE_BIN)
 
 clean:

sbliveos2/trunk/drv32/init.c

@@ -48 +48 @@
 #endif
 const char szCopyRight1[]= "Copyright 1999, 2000 Creative Labs, Inc.\r\n";
-const char szCopyRight2[]= "Copyright 2000 Sander van Leeuwen (OS/2 Port)\r\n\r\n";
+const char szCopyRight2[]= "Copyright 2000-2001 Sander van Leeuwen (OS/2 Port)\r\n\r\n";
 const char szCodeStartEnd[] = "Code 0x%0x - 0x%0x\r\n\r\n";
  

sbliveos2/trunk/drv32/makefile.os2

@@ -92 +92 @@
 !ifdef KEE
      copy $(OBJDIR)\$(TARGET).sys $(SBLIVE_BIN)\$(TARGET)kee.sys
+     copy $(OBJDIR)\$(TARGET).sys $(SBLIVE_BIN_)\$(TARGET)kee.sys
 !else
      copy $(OBJDIR)\$(TARGET).sys $(SBLIVE_BIN)\$(TARGET)w4.sys
+     copy $(OBJDIR)\$(TARGET).sys $(SBLIVE_BIN_)\$(TARGET)w4.sys
 !endif
-     copy $(OBJDIR)\$(TARGET).sys $(SBLIVE_BIN)
 
 $(OBJDIR)\$(TARGET).sym:

sbliveos2/trunk/sblive/cardmi.h

@@ -82 +82 @@
 
         /* For MIDI state machine */
-        u8              status;        /* For MIDI running status */
-        u8              fstatus;       /* For 0xFn status only */
+        u32             status;        /* For MIDI running status */
+        u32             fstatus;       /* For 0xFn status only */
         midi_in_state   curstate;
         midi_in_state   laststate;

sbliveos2/trunk/sblive/emu_wrapper.h

@@ -35 +35 @@
 #define GET_INODE_STRUCT()      struct inode *inode = file->f_dentry->d_inode
 
+#define tasklet_struct          tq_struct 
+
 #ifdef TARGET_OS2
 void tasklet_hi_schedule(struct tasklet_struct *t);
@@ -47 +49 @@
                                 (t)->data = (void *)(d)
 
-#define tasklet_struct          tq_struct 
 
 #ifdef TARGET_OS2