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

usbcdc: i don't trust these ring buffers...

This commit is contained in:
schneider 2011-12-11 00:20:38 +01:00
parent 29efa4cae9
commit ba930408f6
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/usbcdc/cdcuser.c
View File

@ -25,6 +25,8 @@
#include "usbcore.h" #include "usbcore.h"
#include "cdc.h" #include "cdc.h"
#include "cdcuser.h" #include "cdcuser.h"
#include "usbreg.h"
unsigned char BulkBufIn [64]; // Buffer to store USB IN packet unsigned char BulkBufIn [64]; // Buffer to store USB IN packet
unsigned char BulkBufOut [64]; // Buffer to store USB OUT packet unsigned char BulkBufOut [64]; // Buffer to store USB OUT packet
@ -150,18 +152,22 @@ int CDC_WrInBuf (const char *buffer, int *length)
bytesWritten = bytesToWrite; bytesWritten = bytesToWrite;
// Just block if we can't write all at once // Just block if we can't write all at once
while( CDC_BUF_SIZE - CDC_BUF_COUNT(CDC_InBuf) < bytesToWrite ); // These ringbuffers smell buggy, so +1
while( CDC_BUF_SIZE - CDC_BUF_COUNT(CDC_InBuf) < bytesToWrite+1 );
//uint8_t flush = CDC_DepInEmpty; //uint8_t flush = CDC_DepInEmpty;
USB_DEVINTEN = 0;
while (bytesToWrite--) { while (bytesToWrite--) {
CDC_BUF_WR(CDC_InBuf, *buffer++); // Copy Data to buffer CDC_BUF_WR(CDC_InBuf, *buffer++); // Copy Data to buffer
} }
//if( flush == 1 ){ //if( flush == 1 ){
if( CDC_DepInEmpty && CDC_BUF_COUNT(CDC_InBuf) ){ //if( CDC_DepInEmpty && CDC_BUF_COUNT(CDC_InBuf) ){
if( CDC_DepInEmpty ){
CDC_DepInEmpty = 0; CDC_DepInEmpty = 0;
gpioSetValue (RB_LED2, 0);
CDC_BulkIn(); CDC_BulkIn();
} }
USB_DEVINTEN = DEV_STAT_INT | (0xFF<<1) | (USB_SOF_EVENT ? FRAME_INT : 0);
return (bytesWritten); return (bytesWritten);
} }
@ -327,7 +333,6 @@ uint32_t CDC_SendBreak (unsigned short wDurationOfBreak) {
return (TRUE); return (TRUE);
} }
/*---------------------------------------------------------------------------- /*----------------------------------------------------------------------------
CDC_BulkIn call on DataIn Request CDC_BulkIn call on DataIn Request
Parameters: none Parameters: none