aboutsummaryrefslogtreecommitdiff
path: root/lib/usb
diff options
context:
space:
mode:
authorUwe Hermann2010-12-29 17:02:36 +0100
committerUwe Hermann2010-12-29 17:02:36 +0100
commit34fd228bf9158b0df47b4ec04b20db682963d5b0 (patch)
tree16d127ad47b30f9f743a9bb736c6b3a7e9f44e21 /lib/usb
parentf06277793007a3ba32f73c188c8c807ed3651e02 (diff)
Move generic USB stuff to a subdir, dedupe .h files.
Adapt examples and the lib code accordingly.
Diffstat (limited to 'lib/usb')
-rw-r--r--lib/usb/usb.c3
-rw-r--r--lib/usb/usb_control.c3
-rw-r--r--lib/usb/usb_f103.c5
-rw-r--r--lib/usb/usb_private.h2
-rw-r--r--lib/usb/usb_standard.c4
5 files changed, 4 insertions, 13 deletions
diff --git a/lib/usb/usb.c b/lib/usb/usb.c
index dd9d00c..c201b3e 100644
--- a/lib/usb/usb.c
+++ b/lib/usb/usb.c
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <usbd.h>
#include <string.h>
+#include <usb/usbd.h>
#include "usb_private.h"
struct _usbd_device _usbd_device;
@@ -92,4 +92,3 @@ void _usbd_reset(void)
if(_usbd_device.user_callback_reset)
_usbd_device.user_callback_reset();
}
-
diff --git a/lib/usb/usb_control.c b/lib/usb/usb_control.c
index 73e8372..d1796d9 100644
--- a/lib/usb/usb_control.c
+++ b/lib/usb/usb_control.c
@@ -17,8 +17,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <usbd.h>
#include <stdlib.h>
+#include <usb/usbd.h>
#include "usb_private.h"
static struct usb_control_state {
@@ -251,4 +251,3 @@ void _usbd_control_in(uint8_t ea)
usbd_ep_stall_set(0, 1);
}
}
-
diff --git a/lib/usb/usb_f103.c b/lib/usb/usb_f103.c
index 381ee79..a23a8e3 100644
--- a/lib/usb/usb_f103.c
+++ b/lib/usb/usb_f103.c
@@ -20,9 +20,7 @@
#include <libopenstm32/common.h>
#include <libopenstm32/tools.h>
#include <libopenstm32/usb.h>
-
-#include <usbd.h>
-
+#include <usb/usbd.h>
#include "usb_private.h"
/** Initialize USB Device Controller.
@@ -250,4 +248,3 @@ void usbd_poll(void)
if(istr & USB_ISTR_SOF)
USB_CLR_ISTR_SOF();
}
-
diff --git a/lib/usb/usb_private.h b/lib/usb/usb_private.h
index 894771a..453ed77 100644
--- a/lib/usb/usb_private.h
+++ b/lib/usb/usb_private.h
@@ -17,7 +17,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#ifndef __USB_PRIVATE_H
#define __USB_PRIVATE_H
@@ -77,4 +76,3 @@ void _usbd_hw_set_address(uint8_t addr);
void _usbd_hw_endpoints_reset(void);
#endif
-
diff --git a/lib/usb/usb_standard.c b/lib/usb/usb_standard.c
index e6d0727..3e1ff99 100644
--- a/lib/usb/usb_standard.c
+++ b/lib/usb/usb_standard.c
@@ -18,8 +18,7 @@
*/
#include <string.h>
-
-#include <usbd.h>
+#include <usb/usbd.h>
#include "usb_private.h"
void usbd_register_set_config_callback(void (*callback)(uint16_t wValue))
@@ -370,4 +369,3 @@ int _usbd_standard_request(struct usb_setup_data *req, uint8_t **buf,
return 0;
}
}
-