@@ -27,33 +27,33 @@ HID_ HID;
27
27
// ================================================================================
28
28
// HID Interface
29
29
30
- HIDDescriptor _hidInterface ;
30
+ HIDDescriptor HID_::hidInterface ;
31
31
32
- static HIDDescriptorListNode* rootNode = NULL ;
33
- static uint16_t sizeof_hidReportDescriptor = 0 ;
34
- static uint8_t modules_count = 0 ;
35
- static uint8_t epType[] = { EP_TYPE_INTERRUPT_IN };
32
+ HIDDescriptorListNode* HID_:: rootNode = NULL ;
33
+ uint16_t HID_:: sizeof_hidReportDescriptor = 0 ;
34
+ uint8_t HID_:: modules_count = 0 ;
35
+ uint8_t HID_:: epType[] = { EP_TYPE_INTERRUPT_IN };
36
36
37
37
// ================================================================================
38
38
// ================================================================================
39
39
// Driver
40
40
41
- uint8_t _hid_protocol = 1 ;
42
- uint8_t _hid_idle = 1 ;
41
+ uint8_t HID_::protocol = 1 ;
42
+ uint8_t HID_::idle = 1 ;
43
43
44
- int HID_GetInterface (uint8_t * interfaceNum)
44
+ int HID_::GetInterface (uint8_t * interfaceNum)
45
45
{
46
46
interfaceNum[0 ] += 1 ; // uses 1
47
- _hidInterface =
47
+ hidInterface =
48
48
{
49
49
D_INTERFACE (HID.interface (), 1 , 3 , 0 , 0 ),
50
50
D_HIDREPORT (sizeof_hidReportDescriptor),
51
51
D_ENDPOINT (USB_ENDPOINT_IN (HID.endpoint ()), USB_ENDPOINT_TYPE_INTERRUPT, USB_EP_SIZE, 0x01 )
52
52
};
53
- return USB_SendControl (0 ,&_hidInterface, sizeof (_hidInterface ));
53
+ return USB_SendControl (0 , &hidInterface, sizeof (hidInterface ));
54
54
}
55
55
56
- int HID_GetDescriptor (int8_t t)
56
+ int HID_::GetDescriptor (int8_t t)
57
57
{
58
58
if (HID_REPORT_DESCRIPTOR_TYPE == t) {
59
59
HIDDescriptorListNode* current = rootNode;
@@ -89,7 +89,7 @@ void HID_::SendReport(uint8_t id, const void* data, int len)
89
89
USB_Send (HID.endpoint () | TRANSFER_RELEASE,data,len);
90
90
}
91
91
92
- bool HID_Setup (USBSetup& setup, uint8_t i)
92
+ bool HID_::Setup (USBSetup& setup, uint8_t i)
93
93
{
94
94
if (HID.interface () != i) {
95
95
return false ;
@@ -100,12 +100,12 @@ bool HID_Setup(USBSetup& setup, uint8_t i)
100
100
{
101
101
if (HID_GET_REPORT == r)
102
102
{
103
- // HID_GetReport();
103
+ // HID_GetReport();
104
104
return true ;
105
105
}
106
106
if (HID_GET_PROTOCOL == r)
107
107
{
108
- // Send8(_hid_protocol ); // TODO
108
+ // Send8(protocol ); // TODO
109
109
return true ;
110
110
}
111
111
}
@@ -114,13 +114,13 @@ bool HID_Setup(USBSetup& setup, uint8_t i)
114
114
{
115
115
if (HID_SET_PROTOCOL == r)
116
116
{
117
- _hid_protocol = setup.wValueL ;
117
+ protocol = setup.wValueL ;
118
118
return true ;
119
119
}
120
120
121
121
if (HID_SET_IDLE == r)
122
122
{
123
- _hid_idle = setup.wValueL ;
123
+ idle = setup.wValueL ;
124
124
return true ;
125
125
}
126
126
}
@@ -130,9 +130,9 @@ bool HID_Setup(USBSetup& setup, uint8_t i)
130
130
131
131
HID_::HID_ (void )
132
132
{
133
- setup = &HID_Setup ;
134
- getInterface = &HID_GetInterface ;
135
- getDescriptor = &HID_GetDescriptor ;
133
+ setup = HID_::Setup ;
134
+ getInterface = HID_::GetInterface ;
135
+ getDescriptor = HID_::GetDescriptor ;
136
136
numEndpoints = 1 ;
137
137
numInterfaces = 1 ;
138
138
endpointType = epType;
0 commit comments