diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:22 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-07-02 10:59:22 +0200 |
| commit | dd3c898d06a55a4c6fe94dae3f732a541e983432 (patch) | |
| tree | 9f8ea0b057a6a1b52c948214d27ccde9378326a9 /include | |
| parent | 649f558483f9959c0ac4123da8c7b647d9808be5 (diff) | |
| parent | 40faf584cd60c1e0e083ac75eb9ef5f9e7c071d0 (diff) | |
| download | barebox-dd3c898d06a55a4c6fe94dae3f732a541e983432.tar.gz barebox-dd3c898d06a55a4c6fe94dae3f732a541e983432.tar.xz | |
Merge branch 'for-next/dma-cache-align'
Diffstat (limited to 'include')
| -rw-r--r-- | include/dma.h | 30 | ||||
| -rw-r--r-- | include/usb/usb.h | 3 |
2 files changed, 32 insertions, 1 deletions
diff --git a/include/dma.h b/include/dma.h new file mode 100644 index 0000000000..899f831faa --- /dev/null +++ b/include/dma.h @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2012 by Marc Kleine-Budde <mkl@pengutronix.de> + * + * This file is released under the GPLv2 + * + */ + +#ifndef __DMA_H +#define __DMA_H + +#include <malloc.h> +#include <xfuncs.h> + +#include <asm/dma.h> + +#ifndef dma_alloc +static inline void *dma_alloc(size_t size) +{ + return xmalloc(size); +} +#endif + +#ifndef dma_free +static inline void dma_free(void *mem) +{ + free(mem); +} +#endif + +#endif /* __DMA_H */ diff --git a/include/usb/usb.h b/include/usb/usb.h index 8691400014..19b092ea65 100644 --- a/include/usb/usb.h +++ b/include/usb/usb.h @@ -159,8 +159,9 @@ struct usb_device { int epmaxpacketout[16]; /* OUTput endpoint specific maximums */ int configno; /* selected config number */ - struct usb_device_descriptor descriptor; /* Device Descriptor */ + struct usb_device_descriptor *descriptor; /* Device Descriptor */ struct usb_config_descriptor config; /* config descriptor */ + struct devrequest *setup_packet; int have_langid; /* whether string_langid is valid yet */ int string_langid; /* language ID for strings */ |