summaryrefslogtreecommitdiff
path: root/tinyusb
diff options
context:
space:
mode:
Diffstat (limited to 'tinyusb')
-rw-r--r--tinyusb/class/hid.c17
-rw-r--r--tinyusb/class/hid.h19
-rw-r--r--tinyusb/common/arch/arch.h15
-rw-r--r--tinyusb/common/arch/arch_lpc134x.h5
-rw-r--r--tinyusb/common/arch/arm_mx.h2
-rw-r--r--tinyusb/device/dcd.c4
-rw-r--r--tinyusb/host/hcd.c4
-rw-r--r--tinyusb/tusb_cfg.h5
8 files changed, 44 insertions, 27 deletions
diff --git a/tinyusb/class/hid.c b/tinyusb/class/hid.c
index 84a5799e0..7175fb55f 100644
--- a/tinyusb/class/hid.c
+++ b/tinyusb/class/hid.c
@@ -36,7 +36,6 @@
*/
#include "hid.h"
-//#include "../systick/systick.h"
#ifdef CLASS_HID
@@ -45,7 +44,7 @@ USB_HID_KeyboardReport_t hid_keyboard_report;
volatile static bool bKeyChanged = false;
#endif
-#ifdef CFG_USB_HID_MOUSE
+#ifdef CFG_CLASS_HID_MOUSE
USB_HID_MouseReport_t hid_mouse_report;
volatile static bool bMouseChanged = false;
#endif
@@ -78,7 +77,7 @@ ErrorCode_t HID_GetReport( USBD_HANDLE_T hHid, USB_SETUP_PACKET* pSetup, uint8_t
break;
#endif
- #ifdef CFG_USB_HID_MOUSE
+ #ifdef CFG_CLASS_HID_MOUSE
case HID_PROTOCOL_MOUSE:
*pBuffer = (uint8_t*) &hid_mouse_report;
*plength = sizeof(USB_HID_MouseReport_t);
@@ -139,7 +138,7 @@ ErrorCode_t HID_EpIn_Hdlr (USBD_HANDLE_T hUsb, void* data, uint32_t event)
break;
#endif
- #ifdef CFG_USB_HID_MOUSE
+ #ifdef CFG_CLASS_HID_MOUSE
case HID_PROTOCOL_MOUSE:
if (!bMouseChanged)
{
@@ -213,7 +212,7 @@ TUSB_Error_t usb_hid_init(USBD_HANDLE_T hUsb, USB_INTERFACE_DESCRIPTOR const *co
*mem_base += (*mem_size - hid_param.mem_size);
*mem_size = hid_param.mem_size;
- return LPC_OK;
+ return tERROR_NONE;
}
/**************************************************************************/
@@ -227,7 +226,7 @@ TUSB_Error_t usb_hid_configured(USBD_HANDLE_T hUsb)
USBD_API->hw->WriteEP(hUsb , HID_KEYBOARD_EP_IN , (uint8_t* ) &hid_keyboard_report , sizeof(USB_HID_KeyboardReport_t) ); // initial packet for IN endpoint , will not work if omitted
#endif
- #ifdef CFG_USB_HID_MOUSE
+ #ifdef CFG_CLASS_HID_MOUSE
USBD_API->hw->WriteEP(hUsb , HID_MOUSE_EP_IN , (uint8_t* ) &hid_mouse_report , sizeof(USB_HID_MouseReport_t) ); // initial packet for IN endpoint, will not work if omitted
#endif
@@ -292,11 +291,11 @@ TUSB_Error_t usb_hid_keyboard_sendKeys(uint8_t modifier, uint8_t keycodes[], uin
bKeyChanged = true;
- return LPC_OK;
+ return tERROR_NONE;
}
#endif
-#ifdef CFG_USB_HID_MOUSE
+#ifdef CFG_CLASS_HID_MOUSE
/**************************************************************************/
/*!
@brief Send the supplied mouse event out via HID USB mouse emulation
@@ -341,7 +340,7 @@ TUSB_Error_t usb_hid_mouse_send(uint8_t buttons, int8_t x, int8_t y)
bMouseChanged = true;
- return LPC_OK;
+ return tERROR_NONE;
}
#endif
diff --git a/tinyusb/class/hid.h b/tinyusb/class/hid.h
index aabf5df8a..74ce21278 100644
--- a/tinyusb/class/hid.h
+++ b/tinyusb/class/hid.h
@@ -38,19 +38,10 @@
#ifndef _TUSB_HID_H_
#define _TUSB_HID_H_
-#ifdef __cplusplus
- extern "C" {
-#endif
-
// TODO refractor
#include "common/common.h"
#include "device/dcd.h"
-TUSB_Error_t usb_hid_init(USBD_HANDLE_T hUsb, USB_INTERFACE_DESCRIPTOR const *const pIntfDesc, uint8_t const * const pHIDReportDesc, uint32_t ReportDescLength, uint32_t* mem_base, uint32_t* mem_size) ATTR_NON_NULL;
-TUSB_Error_t usb_hid_configured(USBD_HANDLE_T hUsb);
-
-TUSB_Error_t usb_hid_keyboard_sendKeys(uint8_t modifier, uint8_t keycodes[], uint8_t numkey) ATTR_NON_NULL;
-TUSB_Error_t usb_hid_mouse_send(uint8_t buttons, int8_t x, int8_t y);
/** \brief Standard HID Boot Protocol Mouse Report.
*
@@ -136,6 +127,16 @@ enum USB_HID_LOCAL_CODE
};
#ifdef __cplusplus
+ extern "C" {
+#endif
+
+TUSB_Error_t usb_hid_init(USBD_HANDLE_T hUsb, USB_INTERFACE_DESCRIPTOR const *const pIntfDesc, uint8_t const * const pHIDReportDesc, uint32_t ReportDescLength, uint32_t* mem_base, uint32_t* mem_size) ATTR_NON_NULL;
+TUSB_Error_t usb_hid_configured(USBD_HANDLE_T hUsb);
+
+TUSB_Error_t usb_hid_keyboard_sendKeys(uint8_t modifier, uint8_t keycodes[], uint8_t numkey) ATTR_NON_NULL;
+TUSB_Error_t usb_hid_mouse_send(uint8_t buttons, int8_t x, int8_t y);
+
+#ifdef __cplusplus
}
#endif
diff --git a/tinyusb/common/arch/arch.h b/tinyusb/common/arch/arch.h
index f83213b7e..dba662416 100644
--- a/tinyusb/common/arch/arch.h
+++ b/tinyusb/common/arch/arch.h
@@ -51,17 +51,20 @@
#ifndef _TUSB_ARCH_H_
#define _TUSB_ARCH_H_
-#define ARCH_LPC134X 1
-#define ARCH_LPC43XX 2
-#define ARCH ARCH_LPC134X
+#define ARCH_LPC134X
+//#define ARCH_LPC11XX
#define ENDIAN_LITTLE ///< MCU Endian
#define ALIGNMENT (4) ///< MCU Alignment
-#if ARCH == ARCH_LPC134X
+#if defined ARCH_LPC134X
#include "arch_lpc134x.h"
-#elif ARCH == ARCH_LPC43XX
-
+#elif defined ARCH_LPC43XX
+ #include "arch_lpc43xx.h"
+#elif defined ARCH_LPC11XX
+ #include "arch_lpc11xx.h"
+#else
+ #error Arch is not found
#endif
#endif /* _TUSB_ARCH_H_ */
diff --git a/tinyusb/common/arch/arch_lpc134x.h b/tinyusb/common/arch/arch_lpc134x.h
index dc2818f21..a9b9cb7c2 100644
--- a/tinyusb/common/arch/arch_lpc134x.h
+++ b/tinyusb/common/arch/arch_lpc134x.h
@@ -49,12 +49,13 @@
#ifndef _TUSB_ARCH_LPC134_X_H_
#define _TUSB_ARCH_LPC134_X_H_
+#define ARM_M3
+#define DEVICE_ROMDRIVER
+
#include "arm_mx.h"
#include "LPC13Uxx.h"
-#define ARM_M3
-#define DEVICE_ROMDRIVER
#endif /* _TUSB_ARCH_LPC134_X_H_ */
diff --git a/tinyusb/common/arch/arm_mx.h b/tinyusb/common/arch/arm_mx.h
index 180f0fa91..ff77bff89 100644
--- a/tinyusb/common/arch/arm_mx.h
+++ b/tinyusb/common/arch/arm_mx.h
@@ -49,6 +49,8 @@
#ifndef _TUSB_ARM_MX_H_
#define _TUSB_ARM_MX_H_
+// #ifdef ARM_M3 ARM_M4 ARM_M0
+
#define ENDIAN_LITTLE
#define ALIGNMENT (4)
diff --git a/tinyusb/device/dcd.c b/tinyusb/device/dcd.c
index f33f7fe98..a2cab2385 100644
--- a/tinyusb/device/dcd.c
+++ b/tinyusb/device/dcd.c
@@ -37,6 +37,8 @@
#include "dcd.h"
+#ifdef CFG_TUSB_DEVICE
+
// TODO refractor later
#include "descriptors.h"
#include <cr_section_macros.h>
@@ -160,3 +162,5 @@ void USB_IRQHandler(void)
{
USBD_API->hw->ISR(g_hUsb);
}
+
+#endif
diff --git a/tinyusb/host/hcd.c b/tinyusb/host/hcd.c
index 77175d573..481dc91ae 100644
--- a/tinyusb/host/hcd.c
+++ b/tinyusb/host/hcd.c
@@ -37,9 +37,13 @@
#include "hcd.h"
+#ifdef CFG_TUSB_HOST
+
TUSB_Error_t hcd_init()
{
return tERROR_NONE;
}
+
+#endif
diff --git a/tinyusb/tusb_cfg.h b/tinyusb/tusb_cfg.h
index bc55b580a..2a727147e 100644
--- a/tinyusb/tusb_cfg.h
+++ b/tinyusb/tusb_cfg.h
@@ -61,7 +61,10 @@
/// Enable HID Keyboard support
#define CFG_CLASS_HID_KEYBOARD
-#define CLASS_HID (defined CFG_CLASS_HID_KEYBOARD)
+/// Enable HID Mouse support
+#define CFG_CLASS_HID_MOUSE
+
+#define CLASS_HID ( (defined CFG_CLASS_HID_KEYBOARD) || (defined CFG_CLASS_HID_MOUSE) )
// TODO APP
#define USB_MAX_IF_NUM 8
generated by cgit v1.3.1 (git 2.54.0) at 2026-08-17 21:04:19 +0000