deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

usb minor change

Browse Source
This commit is contained in:
NIIBE Yutaka
2013-11-12 13:05:57 +09:00
parent c7052ac6d2
commit 4b964d5f0c
4 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,5 +1,13 @@
2013-11-12 Niibe Yutaka <gniibe@fsij.org>
* src/usb_desc.c (usb_initial_feature): Remove.
(USB_SELF_POWERED): Move to ...
* src/usb_conf.h (USB_SELF_POWERED): ... here.
* src/usb_ctrl.c (usb_cb_device_reset, usb_intr): Follow the
change.
2013-11-11 Niibe Yutaka <gniibe@fsij.org>
* src/adc_stm32f103.c (adc_wait_completion): Update from NeuG 1.0.
2013-11-03 Niibe Yutaka <gniibe@fsij.org>

6
src/usb_conf.h
View File

@@ -5,6 +5,12 @@
#define NUM_STRING_DESC 7
#if defined(USB_SELF_POWERED)
#define USB_INITIAL_FEATURE 0xC0 /* bmAttributes: self powered */
#else
#define USB_INITIAL_FEATURE 0x80 /* bmAttributes: bus powered */
#endif
/* Control pipe */
/* EP0: 64-byte, 64-byte */
#define ENDP0_RXADDR (0x40)

4
src/usb_ctrl.c
View File

@@ -182,7 +182,7 @@ usb_cb_device_reset (void)
usb_lld_set_configuration (0);
/* Current Feature initialization */
usb_lld_set_feature (usb_initial_feature);
usb_lld_set_feature (USB_INITIAL_FEATURE);
usb_lld_reset ();
@@ -434,7 +434,7 @@ usb_intr (void *arg)
chopstx_intr_t interrupt;
(void)arg;
usb_lld_init (usb_initial_feature);
usb_lld_init (USB_INITIAL_FEATURE);
chopstx_claim_irq (&interrupt, INTR_REQ_USB);
usb_interrupt_handler ();

8
src/usb_desc.c
View File

@@ -57,14 +57,6 @@ static const uint8_t gnukDeviceDescriptor[] = {
#if defined(USB_SELF_POWERED)
#define USB_INITIAL_FEATURE 0xC0 /* bmAttributes: self powered */
#else
#define USB_INITIAL_FEATURE 0x80 /* bmAttributes: bus powered */
#endif
const uint8_t usb_initial_feature = USB_INITIAL_FEATURE;
/* Configuation Descriptor */
static const uint8_t gnukConfigDescriptor[] = {
9, /* bLength: Configuation Descriptor size */