Skip to content

Commit f83cd2f

Browse files
committed
[sam] prelimanary work on USB Device stack
1 parent 29e2e30 commit f83cd2f

File tree

17 files changed

+394
-420
lines changed

17 files changed

+394
-420
lines changed

hardware/arduino/avr/cores/arduino/USBCore.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ int USB_Recv(u8 ep, void* d, int len)
230230
n = len;
231231
u8* dst = (u8*)d;
232232
while (n--)
233-
*dst++ = Recv8();
233+
*dst++ = USBD_Recv8();
234234
if (len && !FifoByteCount()) // release empty buffer
235235
ReleaseRX();
236236

hardware/arduino/sam/cores/sam/USBAPI.h

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ extern Serial_ Serial;
4343
//================================================================================
4444
// Mouse
4545

46-
#define MOUSE_LEFT 1
47-
#define MOUSE_RIGHT 2
48-
#define MOUSE_MIDDLE 4
49-
#define MOUSE_ALL (MOUSE_LEFT | MOUSE_RIGHT | MOUSE_MIDDLE)
46+
#define MOUSE_LEFT (1u)
47+
#define MOUSE_RIGHT (2u)
48+
#define MOUSE_MIDDLE (4u)
49+
#define MOUSE_ALL (MOUSE_LEFT | MOUSE_RIGHT | MOUSE_MIDDLE)
5050

5151
class Mouse_
5252
{
@@ -67,14 +67,14 @@ extern Mouse_ Mouse;
6767
//================================================================================
6868
// Keyboard
6969

70-
#define KEY_MODIFIER_LEFT_CTRL 0x01
71-
#define KEY_MODIFIER_LEFT_SHIFT 0x02
72-
#define KEY_MODIFIER_LEFT_ALT 0x04
73-
#define KEY_MODIFIER_LEFT_GUI 0x08
74-
#define KEY_MODIFIER_RIGHT_CTRL 0x010
75-
#define KEY_MODIFIER_RIGHT_SHIFT 0x020
76-
#define KEY_MODIFIER_RIGHT_ALT 0x040
77-
#define KEY_MODIFIER_RIGHT_GUI 0x080
70+
#define KEY_MODIFIER_LEFT_CTRL (0x01u)
71+
#define KEY_MODIFIER_LEFT_SHIFT (0x02u)
72+
#define KEY_MODIFIER_LEFT_ALT (0x04u)
73+
#define KEY_MODIFIER_LEFT_GUI (0x08u)
74+
#define KEY_MODIFIER_RIGHT_CTRL (0x010u)
75+
#define KEY_MODIFIER_RIGHT_SHIFT (0x020u)
76+
#define KEY_MODIFIER_RIGHT_ALT (0x040u)
77+
#define KEY_MODIFIER_RIGHT_GUI (0x080u)
7878

7979
// Low level key report: up to 6 keys and shift, ctrl etc at once
8080
typedef struct
@@ -148,10 +148,6 @@ bool CDC_Setup(Setup& setup);
148148
//================================================================================
149149
//================================================================================
150150

151-
#define TRANSFER_PGM 0x80
152-
#define TRANSFER_RELEASE 0x40
153-
#define TRANSFER_ZERO 0x20
154-
155151
int USB_SendControl(uint8_t flags, const void* d, int len);
156152
int USB_RecvControl(void* d, int len);
157153

0 commit comments

Comments
 (0)