jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

lisa-m/usbhid: Coding-style fixes.

Browse Source
This commit is contained in:
Uwe Hermann 2011-11-12 10:27:34 +01:00
parent b1819507b7
commit bc1f581991
3 changed files with 46 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/stm32/f1/lisa-m/usb_dfu/usbdfu.c
View File

@ -111,7 +111,7 @@ static const char *usb_strings[] = {
"DFU Demo", "DFU Demo",
"DEMO", "DEMO",
/* This string is used by ST Microelectronics' DfuSe utility. */ /* This string is used by ST Microelectronics' DfuSe utility. */
"@Internal Flash /0x08000000/8*001Ka,56*001Kg" "@Internal Flash /0x08000000/8*001Ka,56*001Kg",
}; };
static u8 usbdfu_getstatus(u32 *bwPollTimeout) static u8 usbdfu_getstatus(u32 *bwPollTimeout)

2
examples/stm32/f1/lisa-m/usb_hid/README
View File

@ -2,6 +2,6 @@
README README
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
This example implements a USB Human Interface Device (HID) This example implements a USB Human Interface Device (HID)
to demonstrate the use of the USB device stack. to demonstrate the use of the USB device stack.

85
examples/stm32/f1/lisa-m/usb_hid/usbhid.c
View File

@ -26,7 +26,6 @@
#include <libopencm3/stm32/otg_fs.h> #include <libopencm3/stm32/otg_fs.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/hid.h> #include <libopencm3/usb/hid.h>
#include "adxl345.h" #include "adxl345.h"
/* Define this to include the DFU APP interface. */ /* Define this to include the DFU APP interface. */
@ -54,7 +53,7 @@ const struct usb_device_descriptor dev = {
.bNumConfigurations = 1, .bNumConfigurations = 1,
}; };
/* I have no idea what this means. I haven't read the HID spec. */ /* I have no idea what this means. I haven't read the HID spec. */
static const u8 hid_report_descriptor[] = { static const u8 hid_report_descriptor[] = {
0x05, 0x01, 0x09, 0x02, 0xA1, 0x01, 0x09, 0x01, 0x05, 0x01, 0x09, 0x02, 0xA1, 0x01, 0x09, 0x01,
0xA1, 0x00, 0x05, 0x09, 0x19, 0x01, 0x29, 0x03, 0xA1, 0x00, 0x05, 0x09, 0x19, 0x01, 0x29, 0x03,
@ -65,7 +64,7 @@ static const u8 hid_report_descriptor[] = {
0x81, 0x06, 0xC0, 0x09, 0x3c, 0x05, 0xff, 0x09, 0x81, 0x06, 0xC0, 0x09, 0x3c, 0x05, 0xff, 0x09,
0x01, 0x15, 0x00, 0x25, 0x01, 0x75, 0x01, 0x95, 0x01, 0x15, 0x00, 0x25, 0x01, 0x75, 0x01, 0x95,
0x02, 0xb1, 0x22, 0x75, 0x06, 0x95, 0x01, 0xb1, 0x02, 0xb1, 0x22, 0x75, 0x06, 0x95, 0x01, 0xb1,
0x01, 0xc0 0x01, 0xc0,
}; };
static const struct { static const struct {
@ -184,8 +183,8 @@ static int hid_control_request(struct usb_setup_data *req, u8 **buf, u16 *len,
(req->wValue != 0x2200)) (req->wValue != 0x2200))
return 0; return 0;
/* Handle the HID report descriptor */ /* Handle the HID report descriptor. */
*buf = (u8*)hid_report_descriptor; *buf = (u8 *)hid_report_descriptor;
*len = sizeof(hid_report_descriptor); *len = sizeof(hid_report_descriptor);
return 1; return 1;
@ -209,8 +208,8 @@ static int dfu_control_request(struct usb_setup_data *req, u8 **buf, u16 *len,
(void)buf; (void)buf;
(void)len; (void)len;
if((req->bmRequestType != 0x21) || (req->bRequest != DFU_DETACH)) if ((req->bmRequestType != 0x21) || (req->bRequest != DFU_DETACH))
return 0; /* Only accept class request */ return 0; /* Only accept class request. */
*complete = dfu_detach_complete; *complete = dfu_detach_complete;
@ -243,9 +242,11 @@ static void hid_set_config(u16 wValue)
static uint8_t spi_readwrite(uint32_t spi, uint8_t data) static uint8_t spi_readwrite(uint32_t spi, uint8_t data)
{ {
while(SPI_SR(spi) & SPI_SR_BSY); while (SPI_SR(spi) & SPI_SR_BSY)
;
SPI_DR(spi) = data; SPI_DR(spi) = data;
while(!(SPI_SR(spi) & SPI_SR_RXNE)); while (!(SPI_SR(spi) & SPI_SR_RXNE))
;
return SPI_DR(spi); return SPI_DR(spi);
} }
@ -269,19 +270,21 @@ static void accel_write(uint8_t addr, uint8_t data)
static void accel_get(int16_t *x, int16_t *y, int16_t *z) static void accel_get(int16_t *x, int16_t *y, int16_t *z)
{ {
if(x) if (x)
*x = accel_read(ADXL345_DATAX0) | *x = accel_read(ADXL345_DATAX0) |
(accel_read(ADXL345_DATAX1) << 8); (accel_read(ADXL345_DATAX1) << 8);
if(y) if (y)
*y = accel_read(ADXL345_DATAY0) | *y = accel_read(ADXL345_DATAY0) |
(accel_read(ADXL345_DATAY1) << 8); (accel_read(ADXL345_DATAY1) << 8);
if(z) if (z)
*z = accel_read(ADXL345_DATAZ0) | *z = accel_read(ADXL345_DATAZ0) |
(accel_read(ADXL345_DATAZ1) << 8); (accel_read(ADXL345_DATAZ1) << 8);
} }
int main(void) int main(void)
{ {
int i;
rcc_clock_setup_in_hse_12mhz_out_72mhz(); rcc_clock_setup_in_hse_12mhz_out_72mhz();
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN); rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPAEN);
@ -289,26 +292,26 @@ int main(void)
rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN); rcc_peripheral_enable_clock(&RCC_APB2ENR, RCC_APB2ENR_IOPCEN);
rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_SPI2EN); rcc_peripheral_enable_clock(&RCC_APB1ENR, RCC_APB1ENR_SPI2EN);
/* Configure SPI2: PB13(SCK), PB14(MISO), PB15(MOSI) */ /* Configure SPI2: PB13(SCK), PB14(MISO), PB15(MOSI). */
gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_10_MHZ, gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_10_MHZ,
GPIO_CNF_OUTPUT_ALTFN_PUSHPULL, GPIO_CNF_OUTPUT_ALTFN_PUSHPULL,
GPIO_SPI2_SCK | GPIO_SPI2_MOSI); GPIO_SPI2_SCK | GPIO_SPI2_MOSI);
gpio_set_mode(GPIOB, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, gpio_set_mode(GPIOB, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT,
GPIO_SPI2_MISO); GPIO_SPI2_MISO);
/* Enable CS pin on PB12 */ /* Enable CS pin on PB12. */
gpio_set(GPIOB, GPIO12); gpio_set(GPIOB, GPIO12);
gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_10_MHZ, gpio_set_mode(GPIOB, GPIO_MODE_OUTPUT_10_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO12); GPIO_CNF_OUTPUT_PUSHPULL, GPIO12);
/* Force to SPI mode. This should be default after reset! */ /* Force to SPI mode. This should be default after reset! */
SPI2_I2SCFGR = 0; SPI2_I2SCFGR = 0;
spi_init_master(SPI2, spi_init_master(SPI2,
SPI_CR1_BAUDRATE_FPCLK_DIV_256, SPI_CR1_BAUDRATE_FPCLK_DIV_256,
SPI_CR1_CPOL_CLK_TO_1_WHEN_IDLE, SPI_CR1_CPOL_CLK_TO_1_WHEN_IDLE,
SPI_CR1_CPHA_CLK_TRANSITION_2, SPI_CR1_CPHA_CLK_TRANSITION_2,
SPI_CR1_DFF_8BIT, SPI_CR1_DFF_8BIT,
SPI_CR1_MSBFIRST); SPI_CR1_MSBFIRST);
/* Ignore the stupid NSS pin */ /* Ignore the stupid NSS pin. */
spi_enable_software_slave_management(SPI2); spi_enable_software_slave_management(SPI2);
spi_set_nss_high(SPI2); spi_set_nss_high(SPI2);
spi_enable(SPI2); spi_enable(SPI2);
@ -317,28 +320,28 @@ int main(void)
accel_write(ADXL345_POWER_CTL, ADXL345_POWER_CTL_MEASURE); accel_write(ADXL345_POWER_CTL, ADXL345_POWER_CTL_MEASURE);
accel_write(ADXL345_DATA_FORMAT, ADXL345_DATA_FORMAT_LALIGN); accel_write(ADXL345_DATA_FORMAT, ADXL345_DATA_FORMAT_LALIGN);
/* USB_DETECT as input */ /* USB_DETECT as input. */
gpio_set_mode(GPIOA, GPIO_MODE_INPUT, gpio_set_mode(GPIOA, GPIO_MODE_INPUT, GPIO_CNF_INPUT_FLOAT, GPIO8);
GPIO_CNF_INPUT_FLOAT, GPIO8);
/* green LED off, as output */ /* Green LED off, as output. */
gpio_set(GPIOC, GPIO2); gpio_set(GPIOC, GPIO2);
gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ, gpio_set_mode(GPIOC, GPIO_MODE_OUTPUT_2_MHZ,
GPIO_CNF_OUTPUT_PUSHPULL, GPIO2); GPIO_CNF_OUTPUT_PUSHPULL, GPIO2);
usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings); usbd_init(&stm32f107_usb_driver, &dev, &config, usb_strings);
usbd_register_set_config_callback(hid_set_config); usbd_register_set_config_callback(hid_set_config);
/* delay some seconds to show that pull-up switch works */ /* Delay some seconds to show that pull-up switch works. */
{int i; for (i=0;i<0x800000;i++) asm("nop");} for (i = 0; i < 0x800000; i++)
__asm__("nop");
/* wait for USB Vbus */ /* Wait for USB Vbus. */
while(gpio_get(GPIOA, GPIO8) == 0) asm("nop"); while (gpio_get(GPIOA, GPIO8) == 0)
__asm__("nop");
/* green LED on, connect USB */ /* Green LED on, connect USB. */
gpio_clear(GPIOC, GPIO2); gpio_clear(GPIOC, GPIO2);
//OTG_FS_GCCFG &= ~OTG_FS_GCCFG_VBUSBSEN; // OTG_FS_GCCFG &= ~OTG_FS_GCCFG_VBUSBSEN;
while (1) while (1)
usbd_poll(); usbd_poll();