eddy/stm32samples
1
0
Fork 0
mirror of https://github.com/eddyem/stm32samples.git synced 2026-02-28 03:44:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

some USB fixes

Browse Source
This commit is contained in:
Edward Emelianov
2026-02-13 20:55:37 +03:00
parent 2fa218f695
commit 522e1e2ee3
13 changed files with 66 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
F3:F303/InterfaceBoard/flash.c
View File

@@ -23,7 +23,8 @@
#include "usb_descr.h" // descriptors
#include <string.h> // memcpy
extern const uint32_t __varsstart, _BLOCKSIZE;
extern const uint32_t _BLOCKSIZE;
extern const user_conf __varsstart;
static const uint32_t FLASH_blocksize = (uint32_t)&_BLOCKSIZE;
static uint32_t maxCnum = 2048 / sizeof(user_conf); // can't use blocksize here

20
F3:F303/InterfaceBoard/usb_dev.c
View File

@@ -59,13 +59,20 @@ static volatile ringbuffer rbin[InterfacesAmount] = {IBUF(0), IBUF(1), IBUF(2),
static volatile int lastdsz[InterfacesAmount] = {-1, -1, -1, -1, -1, -1, -1};
static void chkin(uint8_t ifno){
static int ovrflctr = 0; // "antistall" counter
if(bufovrfl[ifno]) return; // allow user to know that previous buffer was overflowed and cleared
if(!rcvbuflen[ifno]) return;
int w = RB_write((ringbuffer*)&rbin[ifno], (uint8_t*)rcvbuf[ifno], rcvbuflen[ifno]);
if(w < 0){
if(w < 0){ // buffer busy
return;
}else if(w == 0){ // no enough space or (WTF) incoming string larger than buffer size
if(rcvbuflen[ifno] > rbin[ifno].length || ++ovrflctr > 9999){
bufovrfl[ifno] = 1; // real overflow in case if ringbuffer's size less than USB buffer
ovrflctr = 0;
}else{
return; // not enough space
}
}
if(w != rcvbuflen[ifno]) bufovrfl[ifno] = 1;
rcvbuflen[ifno] = 0;
uint16_t status = KEEP_DTOG(USB->EPnR[1+ifno]); // don't change DTOG
USB->EPnR[1+ifno] = (status & ~(USB_EPnR_STAT_TX|USB_EPnR_CTR_RX)) ^ USB_EPnR_STAT_RX; // prepare to get next data portion
@@ -96,7 +103,7 @@ static void send_next(uint8_t ifno){
// data IN/OUT handler
static void rxtx_handler(){
uint8_t epno = (USB->ISTR & USB_ISTR_EPID), ifno = epno - 1;
if(ifno > InterfacesAmount-1){
if(epno > InterfacesAmount){
return;
}
uint16_t epstatus = KEEP_DTOG(USB->EPnR[epno]);
@@ -130,6 +137,7 @@ static void clearbufs(uint8_t ifno){
while(Tms - T0 < 10){
if(1 == RB_clearbuf((ringbuffer*)&rbout[ifno])) break;
}
rcvbuflen[ifno] = 0;
}
// SET_CONTROL_LINE_STATE
@@ -200,7 +208,7 @@ int USB_sendall(uint8_t ifno){
uint32_t T0 = Tms;
while(lastdsz[ifno] > 0){
if(Tms - T0 > DISCONN_TMOUT){
//break_handler(ifno);
break_handler(ifno);
return FALSE;
}
if(!CDCready[ifno]) return FALSE;
@@ -215,7 +223,7 @@ int USB_send(uint8_t ifno, const uint8_t *buf, int len){
uint32_t T0 = Tms;
while(len){
if(Tms - T0 > DISCONN_TMOUT){
//break_handler(ifno);
break_handler(ifno);
return FALSE;
}
if(!CDCready[ifno]) return FALSE;
@@ -246,7 +254,7 @@ int USB_putbyte(uint8_t ifno, uint8_t byte){
uint32_t T0 = Tms;
while((l = RB_write((ringbuffer*)&rbout[ifno], &byte, 1)) != 1){
if(Tms - T0 > DISCONN_TMOUT){
//break_handler(ifno);
break_handler(ifno);
return FALSE;
}
if(!CDCready[ifno]) return FALSE;