Changeset 656

Timestamp:

Jan 24, 2021, 4:45:41 PM (5 years ago)

Author:

David Azarewicz

Message:

Fix RM stuff.

Location:

GPL/branches/uniaud32-next

Files:

• drv32/rmhelp.c (modified) (1 diff)
• lib32/pci.c (modified) (2 diffs)
• tools/mkversion.cmd (modified) (3 diffs)

GPL/branches/uniaud32-next/drv32/rmhelp.c

@@ -58 +58 @@
     strcpy(DriverDesc, RM_DRIVER_DESCRIPTION);
 
-    DriverStruct.DrvrName     = FlatToSel((ULONG)DriverName);        /* ### IHV */
-    DriverStruct.DrvrDescript = FlatToSel((ULONG)DriverDesc);        /* ### IHV */
-    DriverStruct.VendorName   = FlatToSel((ULONG)VendorName);        /* ### IHV */
-    DriverStruct.MajorVer     = CMVERSION_MAJOR;          //rmbase.h /* ### IHV */
-    DriverStruct.MinorVer     = CMVERSION_MINOR;          //rmbase.h /* ### IHV */
-    DriverStruct.Date.Year    = RM_DRIVER_BUILDYEAR;                 /* ### IHV */
-    DriverStruct.Date.Month   = RM_DRIVER_BUILDMONTH;                /* ### IHV */
-    DriverStruct.Date.Day     = RM_DRIVER_BUILDDAY;                  /* ### IHV */
+    DriverStruct.DrvrName     = FlatToSel((ULONG)DriverName);
+    DriverStruct.DrvrDescript = FlatToSel((ULONG)DriverDesc);
+    DriverStruct.VendorName   = FlatToSel((ULONG)VendorName);
+    DriverStruct.MajorVer     = RM_VMAJOR;
+    DriverStruct.MinorVer     = RM_VMINOR;
+    DriverStruct.Date.Year    = RM_DRIVER_BUILDYEAR;
+    DriverStruct.Date.Month   = RM_DRIVER_BUILDMONTH;
+    DriverStruct.Date.Day     = RM_DRIVER_BUILDDAY;
     DriverStruct.DrvrFlags    = 0;
     DriverStruct.DrvrType     = DRT_AUDIO;

GPL/branches/uniaud32-next/lib32/pci.c

@@ -302 +302 @@
   if(a->flags & IORESOURCE_MEM) {
     if(RMRequestMem(/*hResMgr,*/ start, n) == FALSE) {
-      printk("RMRequestIO failed for io %x, length %x\n", start, n);
+      printk("RMRequestIO failed for mem %x length %x\n", start, n);
       return NULL;
     }
@@ -308 +308 @@
   else if(a->flags & IORESOURCE_IO) {
     if(RMRequestIO(/*hResMgr,*/ start, n) == FALSE) {
-      printk("RMRequestIO failed for io %x, length %x\n", start, n);
+      printk("RMRequestIO failed for io %x length %x\n", start, n);
       return NULL;
     }

GPL/branches/uniaud32-next/tools/mkversion.cmd

@@ -8 +8 @@
 
 /* I don't this will ever change from Netlabs */
-projVendor    = EnvVar_Get_If('VENDOR', 'Netlabs');
+projVendor    = EnvVar_Get_If('VENDOR', 'Netlabs <www.netlabs.org>');
 projProduct   = "OS/2 Universal Audio 32 Driver";
-projVendorNam = "Netlabs <www.netlabs.org>";
 projAdapter   = "OS/2 Universal Audio";
 
@@ -103 +102 @@
     call lineout versMak, '#       Generated by mkversion.cmd, do NOT edit !'
     call lineout versMak, '#'
-    call lineout versMak, 'BLDLVL_VENDOR = '||projVendor;
+    call lineout versMak, 'BLDLVL_VENDOR = '||Translate(projVendor,,'><');
     call lineout versMak, 'BLDLVL_VERSION = '||versionIn;
     call lineout versMak, 'BLDLVL_FIXPACK = '||Fixpack;
@@ -139 +138 @@
     call lineout versHdr, ' '
     call lineout versHdr, '#define RM_VERSION              '||projVers2;
+    call lineout versHdr, '#define RM_VMAJOR               '||format(major);
+    call lineout versHdr, '#define RM_VMINOR               '||format(minor);
     call lineout versHdr, '#define RM_DRIVER_NAME          "UNIAUD32.SYS"';
     call lineout versHdr, '#define RM_DRIVER_DESCRIPTION   "'||projProduct||'"';
-    call lineout versHdr, '#define RM_DRIVER_VENDORNAME    "'||projVendorNam||'"';
+    call lineout versHdr, '#define RM_DRIVER_VENDORNAME    "'||projVendor||'"';
     call lineout versHdr, '#define RM_DRIVER_BUILDYEAR     (PRODUCT_TIMESTAMP / 10000)';
     call lineout versHdr, '#define RM_DRIVER_BUILDMONTH    ((PRODUCT_TIMESTAMP / 100) % 100)';