diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-12-16 00:49:02 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-12-16 00:49:02 +0000 |
| commit | 86a38f248f430276682e5e8d357f74f8b8bcb99c (patch) | |
| tree | b8e2d2308503e72fc0b8994e38eb28d8aaf3090d /nuttx/drivers/usbhost | |
| parent | 5d449ef3904b7130000b729f6e97f66d8ff99fe0 (diff) | |
| download | nuttx-86a38f248f430276682e5e8d357f74f8b8bcb99c.tar.gz nuttx-86a38f248f430276682e5e8d357f74f8b8bcb99c.tar.bz2 nuttx-86a38f248f430276682e5e8d357f74f8b8bcb99c.zip | |
Changes to get USB host driver compile
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3185 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/drivers/usbhost')
| -rw-r--r-- | nuttx/drivers/usbhost/usbhost_findclass.c | 6 | ||||
| -rw-r--r-- | nuttx/drivers/usbhost/usbhost_registerclass.c | 3 | ||||
| -rw-r--r-- | nuttx/drivers/usbhost/usbhost_storage.c | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/nuttx/drivers/usbhost/usbhost_findclass.c b/nuttx/drivers/usbhost/usbhost_findclass.c index 8d829defe..1b2a7edae 100644 --- a/nuttx/drivers/usbhost/usbhost_findclass.c +++ b/nuttx/drivers/usbhost/usbhost_findclass.c @@ -38,6 +38,8 @@ ****************************************************************************/ #include <nuttx/config.h> + +#include <sys/types.h> #include <stdbool.h> #include <nuttx/usb/usb.h> @@ -81,14 +83,14 @@ * ****************************************************************************/ -static bool usbhost_ismatch(const struct usbhost_id_s *classid, +static bool usbhost_idmatch(const struct usbhost_id_s *classid, const struct usbhost_id_s *devid) { /* The base class ID, subclass and protocol have to match up in any event */ if (devid->base == classid->base && devid->subclass == classid->subclass && - devid->proto == clsssid->proto) + devid->proto == classid->proto) { /* If this is a vendor-specific class ID, then the VID and PID have to * match as well. diff --git a/nuttx/drivers/usbhost/usbhost_registerclass.c b/nuttx/drivers/usbhost/usbhost_registerclass.c index d924de932..0c8d3b20d 100644 --- a/nuttx/drivers/usbhost/usbhost_registerclass.c +++ b/nuttx/drivers/usbhost/usbhost_registerclass.c @@ -39,10 +39,11 @@ #include <nuttx/config.h> +#include <sys/types.h> #include <errno.h> -#include <nuttx/usb/usbhost.h> #include <arch/irq.h> +#include <nuttx/usb/usbhost.h> #include "usbhost_registry.h" diff --git a/nuttx/drivers/usbhost/usbhost_storage.c b/nuttx/drivers/usbhost/usbhost_storage.c index 618333b2f..5142871eb 100644 --- a/nuttx/drivers/usbhost/usbhost_storage.c +++ b/nuttx/drivers/usbhost/usbhost_storage.c @@ -49,6 +49,8 @@ #include <nuttx/usb/usb.h> #include <nuttx/usb/usbhost.h> +#if defined(CONFIG_USBHOST) && !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 + /**************************************************************************** * Pre-processor Definitions ****************************************************************************/ @@ -1034,3 +1036,4 @@ int usbhost_storageinit(void) return usbhost_registerclass(&g_storage); } +#endif /* CONFIG_USBHOST && !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 */ |