From cc143cccf414f67bf2fc04751b12ee18c447997b Mon Sep 17 00:00:00 2001 From: hathach Date: Tue, 31 Jul 2018 14:27:48 +0700 Subject: [PATCH] move default option --- src/class/hid/hid_device.h | 8 -------- src/tusb_option.h | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/class/hid/hid_device.h b/src/class/hid/hid_device.h index 6edd9f934..5163a8ca8 100644 --- a/src/class/hid/hid_device.h +++ b/src/class/hid/hid_device.h @@ -50,14 +50,6 @@ //--------------------------------------------------------------------+ // Class Driver Default Configure & Validation //--------------------------------------------------------------------+ -#ifndef CFG_TUD_HID_KEYBOARD_BOOT -#define CFG_TUD_HID_KEYBOARD_BOOT 0 -#endif - -#ifndef CFG_TUD_HID_MOUSE_BOOT -#define CFG_TUD_HID_MOUSE_BOOT 0 -#endif - #if !CFG_TUD_HID_KEYBOARD && CFG_TUD_HID_KEYBOARD_BOOT #error CFG_TUD_HID_KEYBOARD must be enabled #endif diff --git a/src/tusb_option.h b/src/tusb_option.h index f4f1389da..291800c56 100644 --- a/src/tusb_option.h +++ b/src/tusb_option.h @@ -171,6 +171,14 @@ #define CFG_TUD_MSC 0 #endif + #ifndef CFG_TUD_HID_KEYBOARD_BOOT + #define CFG_TUD_HID_KEYBOARD_BOOT 0 + #endif + + #ifndef CFG_TUD_HID_MOUSE_BOOT + #define CFG_TUD_HID_MOUSE_BOOT 0 + #endif + // IF HID Generic is required, it is multiple Report : Keyboard + Mouse + Gamepad + Joystick #define TUD_OPT_HID_GENERIC ( (CFG_TUD_HID_KEYBOARD && !CFG_TUD_HID_KEYBOARD_BOOT) || \ (CFG_TUD_HID_MOUSE && !CFG_TUD_HID_MOUSE_BOOT) )