remove now-unnecessary share hack from Pump code

This commit is contained in:
Glenn Maynard
2002-11-29 22:06:51 +00:00
parent 264027fea3
commit e0e0c8623e
2 changed files with 6 additions and 8 deletions
+4 -6
View File
@@ -544,7 +544,7 @@ err:
return ret;
}
HANDLE USB::OpenUSB (int VID, int PID, int num, bool share)
HANDLE USB::OpenUSB (int VID, int PID, int num)
{
DWORD index = 0;
@@ -556,10 +556,8 @@ HANDLE USB::OpenUSB (int VID, int PID, int num, bool share)
if(h != INVALID_HANDLE_VALUE)
CloseHandle (h);
int ShareMode = 0;
if(share) ShareMode |= FILE_SHARE_READ | FILE_SHARE_WRITE;
h = CreateFile (path, GENERIC_READ,
ShareMode, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, NULL);
free(path);
@@ -597,10 +595,10 @@ RageInput::pump_t::~pump_t()
CloseHandle(h);
}
bool RageInput::pump_t::init(int devno, bool share)
bool RageInput::pump_t::init(int devno)
{
const int pump_usb_vid = 0x0d2f, pump_usb_pid = 0x0001;
h = USB::OpenUSB (pump_usb_vid, pump_usb_pid, devno, share);
h = USB::OpenUSB (pump_usb_vid, pump_usb_pid, devno);
return h != INVALID_HANDLE_VALUE;
}
+2 -2
View File
@@ -105,7 +105,7 @@ class RageInput
pump_t();
~pump_t();
bool init(int devno, bool share=true);
bool init(int devno);
int GetPadEvent();
} *m_Pumps;
@@ -121,7 +121,7 @@ public:
namespace USB {
char *GetUSBDevicePath (int num);
HANDLE OpenUSB (int VID, int PID, int num, bool share=true);
HANDLE OpenUSB (int VID, int PID, int num);
};
extern RageInput* INPUTMAN; // global and accessable from anywhere in our program