diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-01-18 19:58:49 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-01-18 19:58:49 +0000 |
commit | 0d199a1296adae52e01c1404657e55c34df34283 (patch) | |
tree | 2788a7cfa621171e2d1177f35610697a258eb547 | |
parent | 793fdbf756af7084e86fcaeeabc3c22f100673db (diff) | |
download | nuttx-0d199a1296adae52e01c1404657e55c34df34283.tar.gz nuttx-0d199a1296adae52e01c1404657e55c34df34283.tar.bz2 nuttx-0d199a1296adae52e01c1404657e55c34df34283.zip |
Warnings not errors would be more polite
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3258 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r-- | nuttx/drivers/usbhost/usbhost_hidkbd.c | 36 | ||||
-rw-r--r-- | nuttx/drivers/usbhost/usbhost_skeleton.c | 2 | ||||
-rw-r--r-- | nuttx/drivers/usbhost/usbhost_storage.c | 2 |
3 files changed, 28 insertions, 12 deletions
diff --git a/nuttx/drivers/usbhost/usbhost_hidkbd.c b/nuttx/drivers/usbhost/usbhost_hidkbd.c index 1dbbaade6..bf1dd6386 100644 --- a/nuttx/drivers/usbhost/usbhost_hidkbd.c +++ b/nuttx/drivers/usbhost/usbhost_hidkbd.c @@ -81,10 +81,16 @@ */ #ifndef CONFIG_SCHED_WORKQUEUE -# error "Worker thread support is required (CONFIG_SCHED_WORKQUEUE)" +# warning "Worker thread support is required (CONFIG_SCHED_WORKQUEUE)" #endif -/* Signals must not be disabled as they are needed by usleep */ +/* Signals must not be disabled as they are needed by usleep. Need to have + * CONFIG_DISABLE_SIGNALS=n + */ + +#ifdef CONFIG_DISABLE_SIGNALS +# warning "Signal support is required (CONFIG_DISABLE_SIGNALS)" +#endif /* Provide some default values for other configuration settings */ @@ -100,14 +106,18 @@ # define CONFIG_USBHID_BUFSIZE 64 #endif -/* The default is to support 104 key keyboard. CONFIG_USBHID_ALLSCANCODES - * will enable all scancodes. +/* The default is to support scancode mapping for the standard 104 key + * keyboard. Setting CONFIG_USBHID_RAWSCANCODES will disable all scancode + * mapping; Setting CONFIG_USBHID_ALLSCANCODES will enable mapping of all + * scancodes; */ -#ifdef CONFIG_USBHID_ALLSCANCODES -# define USBHID_NUMSCANCODES (USBHID_KBDUSE_MAX+1) -#else -# define USBHID_NUMSCANCODES 104 +#ifndef CONFIG_USBHID_RAWSCANCODES +# ifdef CONFIG_USBHID_ALLSCANCODES +# define USBHID_NUMSCANCODES (USBHID_KBDUSE_MAX+1) +# else +# define USBHID_NUMSCANCODES 104 +# endif #endif /* Driver support ***********************************************************/ @@ -205,7 +215,7 @@ static inline void usbhost_mkdevname(FAR struct usbhost_state_s *priv, char *dev /* Keyboard polling thread */ static void usbhost_destroy(FAR void *arg); -static uint8_t usbhost_mapscancode(uint8_t scancode, uint8_t modifier); +static inline uint8_t usbhost_mapscancode(uint8_t scancode, uint8_t modifier); static int usbhost_kbdpoll(int argc, char *argv[]); /* Helpers for usbhost_connect() */ @@ -308,6 +318,7 @@ static struct usbhost_state_s *g_priv; /* Data passed to thread */ * controls. */ +#ifndef CONFIG_USBHID_RAWSCANCODES static const uint8_t ucmap[USBHID_NUMSCANCODES] = { 0, 0, 0, 0, 'A', 'B', 'C', 'D', /* 0x00-0x07: Reserved, errors, A-D */ @@ -377,6 +388,7 @@ static const uint8_t lcmap[USBHID_NUMSCANCODES] = 0, 0, 0, 0, 0, 0, 0, 0, /* 0xe0-0xe7: Left Ctrl,Shift,Alt,GUI, Right Ctrl,Shift,Alt,GUI */ #endif }; +#endif /* CONFIG_USBHID_RAWSCANCODES */ /**************************************************************************** * Private Functions @@ -591,8 +603,9 @@ static void usbhost_destroy(FAR void *arg) * ****************************************************************************/ -static uint8_t usbhost_mapscancode(uint8_t scancode, uint8_t modifier) +static inline uint8_t usbhost_mapscancode(uint8_t scancode, uint8_t modifier) { +#ifndef CONFIG_USBHID_RAWSCANCODES /* Range check */ if (scancode >= USBHID_NUMSCANCODES) @@ -610,6 +623,9 @@ static uint8_t usbhost_mapscancode(uint8_t scancode, uint8_t modifier) { return lcmap[scancode]; } +#else + return scancode; +#endif } /**************************************************************************** diff --git a/nuttx/drivers/usbhost/usbhost_skeleton.c b/nuttx/drivers/usbhost/usbhost_skeleton.c index c4ee741bc..81fbf5e7a 100644 --- a/nuttx/drivers/usbhost/usbhost_skeleton.c +++ b/nuttx/drivers/usbhost/usbhost_skeleton.c @@ -61,7 +61,7 @@ /* Configuration ************************************************************/ #ifndef CONFIG_SCHED_WORKQUEUE -# error "Worker thread support is required (CONFIG_SCHED_WORKQUEUE)" +# warning "Worker thread support is required (CONFIG_SCHED_WORKQUEUE)" #endif /* Driver support ***********************************************************/ diff --git a/nuttx/drivers/usbhost/usbhost_storage.c b/nuttx/drivers/usbhost/usbhost_storage.c index 8a19f43ad..31f6c2aea 100644 --- a/nuttx/drivers/usbhost/usbhost_storage.c +++ b/nuttx/drivers/usbhost/usbhost_storage.c @@ -68,7 +68,7 @@ /* Configuration ************************************************************/ #ifndef CONFIG_SCHED_WORKQUEUE -# error "Worker thread support is required (CONFIG_SCHED_WORKQUEUE)" +# warning "Worker thread support is required (CONFIG_SCHED_WORKQUEUE)" #endif /* If the create() method is called by the USB host device driver from an |