diff options
| author | Ha Thach <[email protected]> | 2024-06-14 20:34:32 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-06-14 20:34:32 +0700 |
| commit | 0ac0c37078d5cc9bbfb76d4091ffb07343cfd7f9 (patch) | |
| tree | b30205e5f498825af09dd7244313dc6f56e7ea00 /src/class | |
| parent | ba2f2299c34491aa8c354e00fa3f9d222e30db89 (diff) | |
| parent | 2be72a97b8fd4d08ca20a9b8815f2042c4ef7520 (diff) | |
Merge pull request #2674 from hathach/add-ch32v103
Add ch32v103 (not working yet)
Diffstat (limited to 'src/class')
| -rw-r--r-- | src/class/hid/hid.h | 4 | ||||
| -rw-r--r-- | src/class/net/ncm_device.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/class/hid/hid.h b/src/class/hid/hid.h index 2fe922136..c2b5a8a48 100644 --- a/src/class/hid/hid.h +++ b/src/class/hid/hid.h @@ -762,7 +762,7 @@ enum { HID_USAGE_PAGE_ALPHA_DISPLAY = 0x14, HID_USAGE_PAGE_MEDICAL = 0x40, HID_USAGE_PAGE_LIGHTING_AND_ILLUMINATION = 0x59, - HID_USAGE_PAGE_MONITOR = 0x80, //0x80 - 0x83 + HID_USAGE_PAGE_MONITOR = 0x80, // 0x80 - 0x83 HID_USAGE_PAGE_POWER = 0x84, // 0x084 - 0x87 HID_USAGE_PAGE_BARCODE_SCANNER = 0x8c, HID_USAGE_PAGE_SCALE = 0x8d, @@ -770,7 +770,7 @@ enum { HID_USAGE_PAGE_CAMERA = 0x90, HID_USAGE_PAGE_ARCADE = 0x91, HID_USAGE_PAGE_FIDO = 0xF1D0, // FIDO alliance HID usage page - HID_USAGE_PAGE_VENDOR = 0xFF00 // 0xFF00 - 0xFFFF + HID_USAGE_PAGE_VENDOR = 0xFF00 // 0xFF00 - 0xFFFF }; /// HID Usage Table - Table 6: Generic Desktop Page diff --git a/src/class/net/ncm_device.c b/src/class/net/ncm_device.c index 64aba011a..90d747185 100644 --- a/src/class/net/ncm_device.c +++ b/src/class/net/ncm_device.c @@ -3,6 +3,8 @@ * * Copyright (c) 2019 Ha Thach (tinyusb.org) * Copyright (c) 2024 Hardy Griech + * Copyright (c) 2020 Jacob Berg Potter + * Copyright (c) 2020 Peter Lawrence * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal |