EMTime/libopencm3-examples
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use libopencm3 coding style

Browse Source
This commit is contained in:
Frantisek Burian
2014-07-14 13:39:02 +02:00
parent bc5d0816e5
commit 7f215cb6fa
2 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
examples/stm32/f4/stm32f4-discovery/usb_msc/msc.c
View File

@@ -20,8 +20,8 @@
#include <stdlib.h> #include <stdlib.h>
#include <libopencm3/stm32/f4/rcc.h> #include <libopencm3/stm32/rcc.h>
#include <libopencm3/stm32/f4/gpio.h> #include <libopencm3/stm32/gpio.h>
#include <libopencm3/usb/usbd.h> #include <libopencm3/usb/usbd.h>
#include <libopencm3/usb/msc.h> #include <libopencm3/usb/msc.h>
@@ -104,18 +104,22 @@ static uint8_t usbd_control_buffer[128];
int main(void) int main(void)
{ {
rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]); rcc_clock_setup_hse_3v3(&hse_8mhz_3v3[CLOCK_3V3_120MHZ]);
rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPAEN); rcc_peripheral_enable_clock(&RCC_AHB1ENR, RCC_AHB1ENR_IOPAEN);
rcc_peripheral_enable_clock(&RCC_AHB2ENR, RCC_AHB2ENR_OTGFSEN); rcc_peripheral_enable_clock(&RCC_AHB2ENR, RCC_AHB2ENR_OTGFSEN);
gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE, GPIO9 | GPIO11 | GPIO12); gpio_mode_setup(GPIOA, GPIO_MODE_AF, GPIO_PUPD_NONE,
GPIO9 | GPIO11 | GPIO12);
gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12); gpio_set_af(GPIOA, GPIO_AF10, GPIO9 | GPIO11 | GPIO12);
msc_dev = usbd_init(&otgfs_usb_driver, &dev_descr, &config_descr, usb_strings, 3, usbd_control_buffer, sizeof(usbd_control_buffer)); msc_dev = usbd_init(&otgfs_usb_driver, &dev_descr, &config_descr,
usb_strings, 3,
usbd_control_buffer, sizeof(usbd_control_buffer));
ramdisk_init(); ramdisk_init();
usb_msc_init(msc_dev, 0x82, 64, 0x01, 64, "VendorID", "ProductID", "0.00", ramdisk_blocks(), ramdisk_read, ramdisk_write); usb_msc_init(msc_dev, 0x82, 64, 0x01, 64, "VendorID", "ProductID",
"0.00", ramdisk_blocks(), ramdisk_read, ramdisk_write);
for (;;) { for (;;) {
usbd_poll(msc_dev); usbd_poll(msc_dev);

10
examples/stm32/f4/stm32f4-discovery/usb_msc/ramdisk.c
View File

@@ -22,7 +22,8 @@
#include "ramdisk.h" #include "ramdisk.h"
#define WBVAL(x) ((x) & 0xFF), (((x) >> 8) & 0xFF) #define WBVAL(x) ((x) & 0xFF), (((x) >> 8) & 0xFF)
#define QBVAL(x) ((x) & 0xFF), (((x) >> 8) & 0xFF), (((x) >> 16) & 0xFF), (((x) >> 24) & 0xFF) #define QBVAL(x) ((x) & 0xFF), (((x) >> 8) & 0xFF),\
(((x) >> 16) & 0xFF), (((x) >> 24) & 0xFF)
// filesystem size is 512kB (1024 * SECTOR_SIZE) // filesystem size is 512kB (1024 * SECTOR_SIZE)
#define SECTOR_COUNT 1024 #define SECTOR_COUNT 1024
@@ -34,8 +35,11 @@
#define ROOT_ENTRIES 512 #define ROOT_ENTRIES 512
#define ROOT_ENTRY_LENGTH 32 #define ROOT_ENTRY_LENGTH 32
#define FILEDATA_START_CLUSTER 3 #define FILEDATA_START_CLUSTER 3
#define DATA_REGION_SECTOR (RESERVED_SECTORS + FAT_COPIES + (ROOT_ENTRIES * ROOT_ENTRY_LENGTH) / BYTES_PER_SECTOR) #define DATA_REGION_SECTOR (RESERVED_SECTORS + FAT_COPIES + \
#define FILEDATA_START_SECTOR (DATA_REGION_SECTOR + (FILEDATA_START_CLUSTER - 2) * SECTORS_PER_CLUSTER) (ROOT_ENTRIES * ROOT_ENTRY_LENGTH) / BYTES_PER_SECTOR)
#define FILEDATA_START_SECTOR (DATA_REGION_SECTOR + \
(FILEDATA_START_CLUSTER - 2) * SECTORS_PER_CLUSTER)
// filesize is 64kB (128 * SECTOR_SIZE) // filesize is 64kB (128 * SECTOR_SIZE)
#define FILEDATA_SECTOR_COUNT 128 #define FILEDATA_SECTOR_COUNT 128