Changeset 9533 for trunk/src


Ignore:
Timestamp:
Dec 20, 2002, 11:38:58 AM (23 years ago)
Author:
sandervl
Message:

Removed obsolete code for Glide drivers and IOPL

Location:
trunk/src/kernel32
Files:
2 deleted
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/kernel32/hmdevio.cpp

    r8840 r9533  
    1 /* $Id: hmdevio.cpp,v 1.28 2002-07-05 17:59:30 sandervl Exp $ */
     1/* $Id: hmdevio.cpp,v 1.29 2002-12-20 10:38:56 sandervl Exp $ */
    22
    33/*
    … …  
    2727#include <win\winioctl.h>
    2828#include "hmdevio.h"
    29 #include "cio.h"
    3029#include "map.h"
    3130#include "exceptutil.h"
    … …  
    3534#include "dbglocal.h"
    3635
    37 static BOOL fX86Init  = FALSE;
    38 //SvL: Used in iccio.asm (how can you put these in the .asm data segment without messing things up?)
    39 ULONG  ioentry   = 0;
    40 USHORT gdt       = 0;
    41 char   devname[] = "/dev/fastio$";
    42 
    43 static BOOL GpdDevIOCtl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped);
    44 static BOOL MAPMEMIOCtl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped);
    45 static BOOL FXMEMMAPIOCtl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped);
    46 static BOOL VPCIOCtl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped);
    47 
    4836static WIN32DRV knownDriver[] =
    49     {{"\\\\.\\GpdDev", "",      TRUE,  666,   GpdDevIOCtl},
    50     { "\\\\.\\MAPMEM", "PMAP$", FALSE, 0,     MAPMEMIOCtl},
    51     { "FXMEMMAP.VXD",  "PMAP$", FALSE, 0,     FXMEMMAPIOCtl},
     37    { {0}
    5238    };
    5339
    54 static int nrKnownDrivers = sizeof(knownDriver)/sizeof(WIN32DRV);
    55 BOOL fVirtualPC = FALSE;
     40static int nrKnownDrivers = 0;
     41// = sizeof(knownDriver)/sizeof(WIN32DRV);
    5642
    5743//******************************************************************************
    … …  
    262248//******************************************************************************
    263249//******************************************************************************
    264 static BOOL GpdDevIOCtl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped)
    265 {
    266  ULONG port, val = 0;
    267 
    268   if(fX86Init == FALSE) {
    269         if(io_init() == 0)
    270                 fX86Init = TRUE;
    271         else    return(FALSE);
    272   }
    273 
    274   *lpBytesReturned = 0;
    275 
    276   port = ((GENPORT_WRITE_INPUT *)lpInBuffer)->PortNumber;
    277 
    278   switch((dwIoControlCode >> 2) & 0xFFF) {
    279     case IOCTL_GPD_READ_PORT_UCHAR:
    280         if(nOutBufferSize < sizeof(char))
    281             return(FALSE);
    282 
    283         val = c_inb(port);
    284         *(char *)lpOutBuffer = val;
    285         *lpBytesReturned = sizeof(char);
    286         break;
    287     case IOCTL_GPD_READ_PORT_USHORT:
    288         if(nOutBufferSize < sizeof(USHORT))
    289             return(FALSE);
    290 
    291         val = c_inw(port);
    292         *(USHORT *)lpOutBuffer = val;
    293         *lpBytesReturned = sizeof(USHORT);
    294         break;
    295     case IOCTL_GPD_READ_PORT_ULONG:
    296         if(nOutBufferSize < sizeof(ULONG))
    297             return(FALSE);
    298 
    299         val = c_inl(port);
    300         *(ULONG *)lpOutBuffer = val;
    301         *lpBytesReturned = sizeof(ULONG);
    302         break;
    303     case IOCTL_GPD_WRITE_PORT_UCHAR:
    304         val   = ((GENPORT_WRITE_INPUT *)lpInBuffer)->CharData;
    305         c_outb(port, val);
    306         break;
    307     case IOCTL_GPD_WRITE_PORT_USHORT:
    308         val   = ((GENPORT_WRITE_INPUT *)lpInBuffer)->ShortData;
    309         c_outw(port, val);
    310         break;
    311     case IOCTL_GPD_WRITE_PORT_ULONG:
    312         val   = ((GENPORT_WRITE_INPUT *)lpInBuffer)->LongData;
    313         c_outl(port, val);
    314         break;
    315     default:
    316         dprintf(("GpdDevIOCtl unknown func %X\n", (dwIoControlCode >> 2) & 0xFFF));
    317         return(FALSE);
    318   }
    319 
    320   return(TRUE);
    321 }
    322 //******************************************************************************
    323 //******************************************************************************
    324 static BOOL MAPMEMIOCtl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped)
    325 {
    326  PHYSICAL_MEMORY_INFO *meminfo = (PHYSICAL_MEMORY_INFO *)lpInBuffer;
    327  struct map_ioctl memmap;
    328 
    329   *lpBytesReturned = 0;
    330 
    331   switch((dwIoControlCode >> 2) & 0xFFF) {
    332     case IOCTL_MAPMEM_MAP_USER_PHYSICAL_MEMORY:
    333         if(nInBufferSize != sizeof(PHYSICAL_MEMORY_INFO))
    334             return(FALSE);
    335 
    336         memmap.a.phys = meminfo->BusAddress.u.LowPart;
    337         memmap.size = meminfo->Length;
    338         dprintf(("DeviceIoControl map phys address %X length %X\n", memmap.a.phys, memmap.size));
    339         if(mpioctl((HFILE)hDevice, IOCTL_MAP, &memmap) == -1) {
    340             dprintf(("mpioctl failed!\n"));
    341             return(FALSE);
    342         }
    343 
    344         dprintf(("DeviceIoControl map virt address = %X\n", memmap.a.user));
    345         *(ULONG *)lpOutBuffer = (ULONG)memmap.a.user;
    346         break;
    347     case IOCTL_MAPMEM_UNMAP_USER_PHYSICAL_MEMORY:
    348         dprintf(("Unmap mapping %X\n", *(ULONG *)lpInBuffer));
    349         memmap.a.phys = *(ULONG *)lpInBuffer;
    350         memmap.size = 0;
    351         if(mpioctl((HFILE)hDevice, IOCTL_MAP, &memmap) == -1)
    352             return(FALSE);
    353         break;
    354     default:
    355         dprintf(("MAPMEMIOCtl unknown func %X\n", (dwIoControlCode >> 2) & 0xFFF));
    356         return(FALSE);
    357   }
    358 
    359   return(TRUE);
    360 }
    361 //******************************************************************************
    362 //******************************************************************************
    363 static BOOL FXMEMMAPIOCtl(HANDLE hDevice, DWORD dwIoControlCode, LPVOID lpInBuffer, DWORD nInBufferSize, LPVOID lpOutBuffer, DWORD nOutBufferSize, LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped)
    364 {
    365  struct map_ioctl memmap;
    366  MAPDEVREQUEST *vxdmem = (MAPDEVREQUEST *)lpInBuffer;
    367 
    368   switch(dwIoControlCode) {
    369     case 1:
    370         break;
    371     case 2:
    372         memmap.a.phys = (DWORD)vxdmem->mdr_PhysicalAddress;
    373         memmap.size = vxdmem->mdr_SizeInBytes;
    374         dprintf(("DeviceIoControl map phys address %X length %X\n", memmap.a.phys, memmap.size));
    375         if(mpioctl((HFILE)hDevice, IOCTL_MAP, &memmap) == -1) {
    376             dprintf(("mpioctl failed!\n"));
    377             return(FALSE);
    378         }
    379 
    380         dprintf(("DeviceIoControl map virt address = %X\n", memmap.a.user));
    381         vxdmem->mdr_LinearAddress = (PVOID)memmap.a.user;
    382         break;
    383     default:
    384         dprintf(("FXMEMMAPIOCtl unknown func %X\n", (dwIoControlCode >> 2) & 0xFFF));
    385         return(FALSE);
    386   }
    387 
    388   return(TRUE);
    389 }
    390 //******************************************************************************
    391 //******************************************************************************
    392250HMCustomDriver::HMCustomDriver(HINSTANCE hInstance, LPCSTR lpDeviceName, LPVOID lpDriverData)
    393251                : HMDeviceDriver(lpDeviceName), hDrvDll(0), lpDriverData(NULL)

  • trunk/src/kernel32/kernel32.mak

    r9320 r9533  
    1 # $Id: kernel32.mak,v 1.36 2002-10-03 12:49:50 sandervl Exp $
     1# $Id: kernel32.mak,v 1.37 2002-12-20 10:38:57 sandervl Exp $
    22
    33#
    … …  
    6767$(OBJDIR)\asmutil.obj \
    6868$(OBJDIR)\lang.obj \
    69 $(OBJDIR)\iccio.obj \
    7069$(OBJDIR)\map.obj \
    7170$(OBJDIR)\win32util.obj \
    … …  
    7473$(OBJDIR)\os2heap.obj \
    7574$(OBJDIR)\vmutex.obj \
    76 ####$(OBJDIR)\vsemaphore.obj \
    7775$(OBJDIR)\initterm.obj \
    7876$(OBJDIR)\initkernel32.obj \

  • trunk/src/kernel32/windllbase.cpp

    r8923 r9533  
    1 /* $Id: windllbase.cpp,v 1.30 2002-07-26 10:48:40 sandervl Exp $ */
     1/* $Id: windllbase.cpp,v 1.31 2002-12-20 10:38:57 sandervl Exp $ */
    22
    33/*
    … …  
    3939#include "exceptions.h"
    4040#include "exceptutil.h"
    41 #include "cio.h"
    4241#include "vmutex.h"
    4342#include "oslibmisc.h"

  • trunk/src/kernel32/windllpe2lx.cpp

    r6301 r9533  
    1 /* $Id: windllpe2lx.cpp,v 1.11 2001-07-10 20:18:12 bird Exp $ */
     1/* $Id: windllpe2lx.cpp,v 1.12 2002-12-20 10:38:57 sandervl Exp $ */
    22
    33/*
    … …  
    3131#include <wprocess.h>
    3232
    33 #include "cio.h"            // I/O
    3433#include "oslibmisc.h"      // OSLibGetDllName
    3534#include "conwin.h"         // Windows Header for console only
    … …  
    8483    {   /* Process attach */
    8584
    86         /* Init I/O */
    87         if (getenv("WIN32_IOPL2"))
    88             io_init1();
    89 
    9085        /* Get Lib name and match Pe2Lx version with kernel32 version. */
    9186        pszName = OSLibGetDllName(hinstance);

  • trunk/src/kernel32/winexebase.cpp

    r8457 r9533  
    1 /* $Id: winexebase.cpp,v 1.20 2002-05-20 13:48:51 sandervl Exp $ */
     1/* $Id: winexebase.cpp,v 1.21 2002-12-20 10:38:57 sandervl Exp $ */
    22
    33/*
    … …  
    3030#include "exceptions.h"
    3131#include "exceptutil.h"
    32 #include "cio.h"
    3332
    3433#include "conwin.h"          // Windows Header for console only
    … …  
    9897 ULONG rc;
    9998
    100   if(getenv("WIN32_IOPL2")) {
    101         io_init1();
    102   }
    10399#ifdef DEBUG
    104100  TEB *teb = GetThreadTEB();

  • trunk/src/kernel32/winexelx.cpp

    r7567 r9533  
    1 /* $Id: winexelx.cpp,v 1.10 2001-12-07 14:13:39 sandervl Exp $ */
     1/* $Id: winexelx.cpp,v 1.11 2002-12-20 10:38:58 sandervl Exp $ */
    22
    33/*
    … …  
    3131#include "exceptions.h"
    3232#include "exceptutil.h"
    33 #include "cio.h"
    3433
    3534#define DBG_LOCALLOG    DBG_winexelx
    … …  
    5251  if(WinExe != NULL) //should never happen
    5352        delete(WinExe);
    54 
    55   if(getenv("WIN32_IOPL2")) {
    56     io_init1();
    57   }
    5853
    5954  rc = DosGetInfoBlocks(&ptib, &ppib);
    … …  
    10297 ULONG rc;
    10398
    104   if(getenv("WIN32_IOPL2")) {
    105         io_init1();
    106   }
    10799  dprintf(("Start executable %X\n", WinExe));
    108100

  • trunk/src/kernel32/winexepe2lx.cpp

    r8436 r9533  
    1 /* $Id: winexepe2lx.cpp,v 1.11 2002-05-16 13:45:32 sandervl Exp $ */
     1/* $Id: winexepe2lx.cpp,v 1.12 2002-12-20 10:38:58 sandervl Exp $ */
    22
    33/*
    … …  
    3232#include <win32api.h>
    3333
    34 #include "cio.h"            // I/O
    3534#include "oslibmisc.h"      // OSLibGetDllName
    3635#include "conwin.h"         // Windows Header for console only
    … …  
    7069    Win32Pe2LxExe *pWinPe2LxExe;
    7170
    72     /* I/O init. */
    73     if (getenv("WIN32_IOPL2"))
    74         io_init1();
    75 
    7671    /* Check that pe2lx version matches the version of kernel32.dll. */
    7772    CheckVersion(ulPe2LxVersion & ~0x80000000UL, OSLibGetDllName(hinstance));

  • trunk/src/kernel32/winexepeldr.cpp

    r8913 r9533  
    1 /* $Id: winexepeldr.cpp,v 1.19 2002-07-23 13:51:48 sandervl Exp $ */
     1/* $Id: winexepeldr.cpp,v 1.20 2002-12-20 10:38:58 sandervl Exp $ */
    22
    33/*
    … …  
    3434#include "exceptutil.h"
    3535
    36 #include "cio.h"
    3736#include "oslibmisc.h"
    3837
    … …  
    120119  free(szFullCmdLine);
    121120
    122   if(getenv("WIN32_IOPL2")) {
    123         io_init1();
    124   }
    125121  //Init console before loading executable as dlls might want to print
    126122  //something on the console while being loaded

  • trunk/src/kernel32/wprocess.cpp

    r9517 r9533  
    1 /* $Id: wprocess.cpp,v 1.166 2002-12-17 13:48:24 sandervl Exp $ */
     1/* $Id: wprocess.cpp,v 1.167 2002-12-20 10:38:58 sandervl Exp $ */
    22
    33/*
    … …  
    4242#include "console.h"
    4343#include "wincon.h"
    44 #include "cio.h"
    4544#include "versionos2.h"    /*PLF Wed  98-03-18 02:36:51*/
    4645#include <wprocess.h>
Note: See TracChangeset for help on using the changeset viewer.