Changeset 7482 for trunk/src

Timestamp:

Nov 29, 2001, 11:53:28 AM (24 years ago)

Author:

phaller

Message:

Added support for DosDevConfig, query number of available parallel ports

Location:

trunk/src/kernel32

Files:

• hmparport.cpp (modified) (3 diffs)
• oslibdos.cpp (modified) (3 diffs)
• oslibdos.h (modified) (2 diffs)

trunk/src/kernel32/hmparport.cpp

@@ -1 @@
-/* $Id: hmparport.cpp,v 1.11 2001-11-29 00:20:48 phaller Exp $ */
+/* $Id: hmparport.cpp,v 1.12 2001-11-29 10:53:27 phaller Exp $ */
 
 /*
@@ -144 +144 @@
            lpDeviceName));
   
+#ifndef DEVINFO_PRINTER
+#define DEVINFO_PRINTER         0
+#endif
+  
+  // first, we determine the number of parallel port devices available
+  BYTE  bParallelPorts;
+  DWORD rc = OSLibDosDevConfig(&bParallelPorts,
+                               DEVINFO_PRINTER);
+  dprintf(("HMDeviceParPortClass: Parallel ports reported: %d\n",
+          bParallelPorts));
+  if (0 == bParallelPorts)
+    return;
+  
+  // @@@PH
+  // query configuration data from Resource Manager
+  // (base i/o ports, etc. for the IOCTL_INTERNAL_GET_xxx)
+  
+  
   VOID *pData;
-  dprintf(("HMDeviceParPortClass: Register LPT1 to LPT3 with Handle Manager\n"));
+  dprintf(("HMDeviceParPortClass: Registering LPTs with Handle Manager\n"));
   
   pData = CreateDevData();
@@ -156 +174 @@
     PSZ pszLPT  = strdup("\\\\.\\LPTx");
     PSZ pszLPT2 = strdup("\\Device\\ParallelPort1");
-    for (char ch = '1'; ch <= '3'; ch++)
+    for (char ch = '1'; ch <= '1' + (bParallelPorts - 1); ch++)
     {
       pszLPT[7] = ch;

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.86 2001-11-28 23:33:37 phaller Exp $ */
+/* $Id: oslibdos.cpp,v 1.87 2001-11-29 10:53:28 phaller Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -19 +19 @@
 #define INCL_DOSERRORS
 #define INCL_DOSDEVIOCTL
+#define INCL_DOSDEVICES
 #define INCL_NPIPES
 #include <os2wrap.h>                     //Odin32 OS/2 api wrappers
@@ -2897 +2898 @@
 //******************************************************************************
 //******************************************************************************
+DWORD OSLibDosDevConfig(PVOID pdevinfo,
+                         ULONG item)
+{
+  return (DWORD)DosDevConfig(pdevinfo, item);
+}

trunk/src/kernel32/oslibdos.h

@@ -1 @@
-/* $Id: oslibdos.h,v 1.39 2001-11-11 13:46:19 bird Exp $ */
+/* $Id: oslibdos.h,v 1.40 2001-11-29 10:53:28 phaller Exp $ */
 
 /*
@@ -358 +358 @@
 BOOL  OSLibDosQueryAffinity(DWORD fMaskType, DWORD *pdwThreadAffinityMask);
 
+DWORD OSLibDosDevConfig(PVOID pdevinfo, ULONG item);
+
 #endif //__OSLIBDOS_H__