Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb_hid: Rename cookie flag define to be more descriptive.

Browse Source
This commit is contained in:
Michael Lotz 2015-04-23 22:09:26 +02:00
parent 25f723de85
commit 127092c594
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/add-ons/kernel/drivers/input/usb_hid/KeyboardProtocolHandler.cpp
View File

@ -28,8 +28,8 @@
#define RIGHT_ALT_KEY 0x40 #define RIGHT_ALT_KEY 0x40
#define ALT_KEYS (LEFT_ALT_KEY | RIGHT_ALT_KEY) #define ALT_KEYS (LEFT_ALT_KEY | RIGHT_ALT_KEY)
#define KEYBOARD_FLAG_READER 0x01 #define KEYBOARD_HANDLER_COOKIE_FLAG_READER 0x01
#define KEYBOARD_FLAG_DEBUGGER 0x02 #define KEYBOARD_HANDLER_COOKIE_FLAG_DEBUGGER 0x02
static bool sDebugKeyboardFound = false; static bool sDebugKeyboardFound = false;
@ -311,9 +311,9 @@ KeyboardProtocolHandler::Open(uint32 flags, uint32 *cookie)
status_t status_t
KeyboardProtocolHandler::Close(uint32 *cookie) KeyboardProtocolHandler::Close(uint32 *cookie)
{ {
if ((*cookie & KEYBOARD_FLAG_DEBUGGER) != 0) if ((*cookie & KEYBOARD_HANDLER_COOKIE_FLAG_DEBUGGER) != 0)
fHasDebugReader = false; fHasDebugReader = false;
if ((*cookie & KEYBOARD_FLAG_READER) != 0) if ((*cookie & KEYBOARD_HANDLER_COOKIE_FLAG_READER) != 0)
atomic_and(&fHasReader, 0); atomic_and(&fHasReader, 0);
return ProtocolHandler::Close(cookie); return ProtocolHandler::Close(cookie);
@ -332,7 +332,7 @@ KeyboardProtocolHandler::Control(uint32 *cookie, uint32 op, void *buffer,
return B_BUSY; return B_BUSY;
// We're the first, so we become the only reader // We're the first, so we become the only reader
*cookie = KEYBOARD_FLAG_READER; *cookie = KEYBOARD_HANDLER_COOKIE_FLAG_READER;
} }
while (true) { while (true) {
@ -360,7 +360,8 @@ KeyboardProtocolHandler::Control(uint32 *cookie, uint32 op, void *buffer,
} }
} }
if (fHasDebugReader && (*cookie & KEYBOARD_FLAG_DEBUGGER) if (fHasDebugReader
&& (*cookie & KEYBOARD_HANDLER_COOKIE_FLAG_DEBUGGER)
== 0) { == 0) {
// Handover buffer to the debugger instead // Handover buffer to the debugger instead
locker.Unlock(); locker.Unlock();
@ -420,7 +421,7 @@ KeyboardProtocolHandler::Control(uint32 *cookie, uint32 op, void *buffer,
if (fHasDebugReader) if (fHasDebugReader)
return B_BUSY; return B_BUSY;
*cookie |= KEYBOARD_FLAG_DEBUGGER; *cookie |= KEYBOARD_HANDLER_COOKIE_FLAG_DEBUGGER;
fHasDebugReader = true; fHasDebugReader = true;
return B_OK; return B_OK;
} }