ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed some compiler warnings, removed dead code

This commit is contained in:
schneider 2011-12-11 18:37:53 +01:00
parent 6c824d91a1
commit bebae321e2
3 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/usbcdc/cdcuser.c
View File

@ -342,7 +342,7 @@ void CDC_BulkIn(void)
{ {
int numBytesRead, numBytesAvail; int numBytesRead, numBytesAvail;
CDC_InBufAvailChar(&numBytesAvail); CDC_InBufAvailChar(&numBytesAvail);
numBytesRead = CDC_RdInBuf(&BulkBufIn[0], &numBytesAvail); numBytesRead = CDC_RdInBuf((char*)&BulkBufIn[0], &numBytesAvail);
// send over USB // send over USB
if (numBytesRead > 0) { if (numBytesRead > 0) {
//gpioSetValue (RB_LED0, 1); //gpioSetValue (RB_LED0, 1);

1
firmware/usbcdc/cdcuser.h
View File

@ -24,6 +24,7 @@ extern int CDC_RdOutBuf (char *buffer, const int *length);
extern int CDC_WrOutBuf (const char *buffer, int *length); extern int CDC_WrOutBuf (const char *buffer, int *length);
extern int CDC_OutBufAvailChar (int *availChar); extern int CDC_OutBufAvailChar (int *availChar);
extern int CDC_WrInBuf (const char *buffer, int *length);
/* CDC Data In/Out Endpoint Address */ /* CDC Data In/Out Endpoint Address */
#define CDC_DEP_IN 0x83 #define CDC_DEP_IN 0x83

16
firmware/usbcdc/util.c
View File

@ -1,4 +1,5 @@
#include <sysinit.h> #include <sysinit.h>
#include <string.h>
#include "usbcdc/usb.h" #include "usbcdc/usb.h"
#include "usbcdc/usbcore.h" #include "usbcdc/usbcore.h"
@ -6,13 +7,6 @@
#include "usbcdc/usbhw.h" #include "usbcdc/usbhw.h"
#include "usbcdc/cdcuser.h" #include "usbcdc/cdcuser.h"
#include "basic/basic.h"
volatile unsigned int lastTick;
// There must be at least 1ms between USB frames (of up to 64 bytes)
// This buffers all data and writes it out from the buffer one frame
// and one millisecond at a time
int puts(const char * str){ int puts(const char * str){
if(!USB_Configuration) if(!USB_Configuration)
return -1; return -1;
@ -23,16 +17,10 @@ int puts(const char * str){
} }
int puts_plus(const char * str){ int puts_plus(const char * str){
if(!USB_Configuration) return puts(str);
return -1;
int len = strlen(str);
CDC_WrInBuf(str, &len);
return 0;
} }
void usbCDCInit(){ void usbCDCInit(){
lastTick = systickGetTicks(); // Used to control output/printf timing
CDC_Init(); // Initialise VCOM CDC_Init(); // Initialise VCOM
USB_Init(); // USB Initialization USB_Init(); // USB Initialization
USB_Connect(TRUE); // USB Connect USB_Connect(TRUE); // USB Connect