noisymime
/
ArduinoCore-avr
mirror of https://github.com/noisymime/ArduinoCore-avr.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[HID] Changed 'u8' to 'uint8_t' in definitions

This commit is contained in:
Cristian Maglie 2015-09-28 15:44:32 +02:00
parent b53611a0d1
commit 691d9fb7f0
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/HID/HID.cpp
View File

@ -23,13 +23,13 @@
HID_ HID; HID_ HID;
static u8 HID_ENDPOINT_INT; static uint8_t HID_ENDPOINT_INT;
//================================================================================ //================================================================================
//================================================================================ //================================================================================
// HID Interface // HID Interface
static u8 HID_INTERFACE; static uint8_t HID_INTERFACE;
HIDDescriptor _hidInterface; HIDDescriptor _hidInterface;
@ -40,10 +40,10 @@ static uint8_t modules_count = 0;
//================================================================================ //================================================================================
// Driver // Driver
u8 _hid_protocol = 1; uint8_t _hid_protocol = 1;
u8 _hid_idle = 1; uint8_t _hid_idle = 1;
int HID_GetInterface(u8* interfaceNum) int HID_GetInterface(uint8_t* interfaceNum)
{ {
interfaceNum[0] += 1; // uses 1 interfaceNum[0] += 1; // uses 1
_hidInterface = _hidInterface =
@ -91,13 +91,13 @@ void HID_::SendReport(u8 id, const void* data, int len)
USB_Send(HID_TX | TRANSFER_RELEASE,data,len); USB_Send(HID_TX | TRANSFER_RELEASE,data,len);
} }
bool HID_Setup(USBSetup& setup, u8 i) bool HID_Setup(USBSetup& setup, uint8_t i)
{ {
if (HID_INTERFACE != i) { if (HID_INTERFACE != i) {
return false; return false;
} else { } else {
u8 r = setup.bRequest; uint8_t r = setup.bRequest;
u8 requestType = setup.bmRequestType; uint8_t requestType = setup.bmRequestType;
if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType) if (REQUEST_DEVICETOHOST_CLASS_INTERFACE == requestType)
{ {
if (HID_GET_REPORT == r) if (HID_GET_REPORT == r)

24
libraries/HID/HID.h
View File

@ -64,22 +64,22 @@ public:
typedef struct typedef struct
{ {
u8 len; // 9 uint8_t len; // 9
u8 dtype; // 0x21 uint8_t dtype; // 0x21
u8 addr; uint8_t addr;
u8 versionL; // 0x101 uint8_t versionL; // 0x101
u8 versionH; // 0x101 uint8_t versionH; // 0x101
u8 country; uint8_t country;
u8 desctype; // 0x22 report uint8_t desctype; // 0x22 report
u8 descLenL; uint8_t descLenL;
u8 descLenH; uint8_t descLenH;
} HIDDescDescriptor; } HIDDescDescriptor;
typedef struct typedef struct
{ {
InterfaceDescriptor hid; InterfaceDescriptor hid;
HIDDescDescriptor desc; HIDDescDescriptor desc;
EndpointDescriptor in; EndpointDescriptor in;
} HIDDescriptor; } HIDDescriptor;
#define HID_TX HID_ENDPOINT_INT #define HID_TX HID_ENDPOINT_INT