andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4595 35acf78f-673a-0410-8e92-d51de3d6d3f4

This commit is contained in:
gdisirio 2012-08-20 17:09:16 +00:00
parent 34310e401f
commit 44603763e1
2 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
demos/ARMCM4-STM32F407-LWIP-FATFS-USB/main.c
View File

@ -353,17 +353,22 @@ static const USBDescriptor *get_descriptor(USBDriver *usbp,
static USBInEndpointState ep1instate;
/**
* @brief EP1 initialization structure (IN only).
* @brief OUT EP1 state.
*/
static USBOutEndpointState ep1outstate;
/**
* @brief EP1 initialization structure (both IN and OUT).
*/
static const USBEndpointConfig ep1config = {
USB_EP_MODE_TYPE_BULK,
NULL,
sduDataTransmitted,
NULL,
sduDataReceived,
0x0040,
0x0040,
0x0000,
&ep1instate,
NULL,
&ep1outstate,
2,
NULL
};
@ -371,7 +376,7 @@ static const USBEndpointConfig ep1config = {
/**
* @brief IN EP2 state.
*/
USBInEndpointState ep2instate;
static USBInEndpointState ep2instate;
/**
* @brief EP2 initialization structure (IN only).
@ -389,27 +394,6 @@ static const USBEndpointConfig ep2config = {
NULL
};
/**
* @brief OUT EP2 state.
*/
USBOutEndpointState ep3outstate;
/**
* @brief EP3 initialization structure (OUT only).
*/
static const USBEndpointConfig ep3config = {
USB_EP_MODE_TYPE_BULK,
NULL,
NULL,
sduDataReceived,
0x0000,
0x0040,
NULL,
&ep3outstate,
0,
NULL
};
/*
* Handles the USB driver global events.
*/
@ -428,7 +412,6 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
must be used.*/
usbInitEndpointI(usbp, USB_CDC_DATA_REQUEST_EP, &ep1config);
usbInitEndpointI(usbp, USB_CDC_INTERRUPT_REQUEST_EP, &ep2config);
usbInitEndpointI(usbp, USB_CDC_DATA_AVAILABLE_EP, &ep3config);
/* Resetting the state of the CDC subsystem.*/
sduConfigureHookI(usbp);
@ -446,16 +429,20 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
}
/*
* Serial over USB driver configuration.
* USB driver configuration.
*/
static const SerialUSBConfig serusbcfg = {
&USBD1,
{
static const USBConfig usbcfg = {
usb_event,
get_descriptor,
sduRequestsHook,
NULL
}
};
/*
* Serial over USB driver configuration.
*/
static const SerialUSBConfig serusbcfg = {
&USBD1
};
/*===========================================================================*/
@ -627,12 +614,19 @@ int main(void) {
chSysInit();
/*
* Activates the shell on the USB-CDC.
* Initializes a serial-over-USB CDC driver.
*/
sduObjectInit(&SDU1);
sduStart(&SDU1, &serusbcfg);
/*
* Activates the USB driver and then the USB bus pull-up on D+.
* Note, a delay is inserted in order to not have to disconnect the cable
* after a reset.
*/
usbDisconnectBus(serusbcfg.usbp);
chThdSleepMilliseconds(1000);
sduObjectInit(&SDU1);
sduStart(&SDU1, &serusbcfg);
usbStart(serusbcfg.usbp, &usbcfg);
usbConnectBus(serusbcfg.usbp);
/*

2
testhal/STM32F4xx/USB_CDC/main.c
View File

@ -408,9 +408,7 @@ static void cmd_write(BaseSequentialStream *chp, int argc, char *argv[]) {
while (chnGetTimeout((BaseChannel *)chp, TIME_IMMEDIATE) == Q_TIMEOUT) {
chSequentialStreamWrite(&SDU1, buf, sizeof buf - 1);
// palTogglePad(GPIOD, GPIOD_LED4);
}
// palClearPad(GPIOD, GPIOD_LED4);
chprintf(chp, "\r\n\nstopped\r\n");
}