@ -56,13 +56,13 @@ void USB::setUsbTaskState(uint8_t state) {
EpInfo * USB : : getEpInfoEntry ( uint8_t addr , uint8_t ep ) {
UsbDevice * p = addrPool . GetUsbDevicePtr ( addr ) ;
if ( ! p | | ! p - > epinfo )
if ( ! p | | ! p - > epinfo )
return NULL ;
EpInfo * pep = p - > epinfo ;
for ( uint8_t i = 0 ; i < p - > epcount ; i + + ) {
if ( ( pep ) - > epAddr = = ep )
for ( uint8_t i = 0 ; i < p - > epcount ; i + + ) {
if ( ( pep ) - > epAddr = = ep )
return pep ;
pep + + ;
@ -74,12 +74,12 @@ EpInfo* USB::getEpInfoEntry(uint8_t addr, uint8_t ep) {
/* each device is different and has different number of endpoints. This function plugs endpoint record structure, defined in application, to devtable */
uint8_t USB : : setEpInfoEntry ( uint8_t addr , uint8_t epcount , EpInfo * eprecord_ptr ) {
if ( ! eprecord_ptr )
if ( ! eprecord_ptr )
return USB_ERROR_INVALID_ARGUMENT ;
UsbDevice * p = addrPool . GetUsbDevicePtr ( addr ) ;
if ( ! p )
if ( ! p )
return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL ;
p - > address . devAddress = addr ;
@ -92,15 +92,15 @@ uint8_t USB::setEpInfoEntry(uint8_t addr, uint8_t epcount, EpInfo* eprecord_ptr)
uint8_t USB : : SetAddress ( uint8_t addr , uint8_t ep , EpInfo * * ppep , uint16_t * nak_limit ) {
UsbDevice * p = addrPool . GetUsbDevicePtr ( addr ) ;
if ( ! p )
if ( ! p )
return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL ;
if ( ! p - > epinfo )
if ( ! p - > epinfo )
return USB_ERROR_EPINFO_IS_NULL ;
* ppep = getEpInfoEntry ( addr , ep ) ;
if ( ! * ppep )
if ( ! * ppep )
return USB_ERROR_EP_NOT_FOUND_IN_TBL ;
* nak_limit = ( 0x0001UL < < ( ( ( * ppep ) - > bmNakPower > USB_NAK_MAX_POWER ) ? USB_NAK_MAX_POWER : ( * ppep ) - > bmNakPower ) ) ;
@ -145,9 +145,7 @@ uint8_t USB::ctrlReq(uint8_t addr, uint8_t ep, uint8_t bmReqType, uint8_t bReque
uint16_t nak_limit = 0 ;
rcode = SetAddress ( addr , ep , & pep , & nak_limit ) ;
if ( rcode )
return rcode ;
if ( rcode ) return rcode ;
direction = ( ( bmReqType & 0x80 ) > 0 ) ;
@ -162,49 +160,40 @@ uint8_t USB::ctrlReq(uint8_t addr, uint8_t ep, uint8_t bmReqType, uint8_t bReque
bytesWr ( rSUDFIFO , 8 , ( uint8_t * ) & setup_pkt ) ; //transfer to setup packet FIFO
rcode = dispatchPkt ( tokSETUP , ep , nak_limit ) ; //dispatch packet
if ( rcode ) return rcode ; // Return HRSLT if not zero
if ( rcode ) //return HRSLT if not zero
return ( rcode ) ;
if ( dataptr ! = NULL ) //data stage, if present
{
if ( direction ) //IN transfer
{
if ( dataptr ! = NULL ) { //data stage, if present
if ( direction ) { //IN transfer
uint16_t left = total ;
pep - > bmRcvToggle = 1 ; //bmRCVTOG1;
while ( left ) {
while ( left ) {
// Bytes read into buffer
uint16_t read = nbytes ;
//uint16_t read = (left<nbytes) ? left : nbytes;
rcode = InTransfer ( pep , nak_limit , & read , dataptr ) ;
if ( rcode = = hrTOGERR ) {
if ( rcode = = hrTOGERR ) {
// yes, we flip it wrong here so that next time it is actually correct!
pep - > bmRcvToggle = ( regRd ( rHRSL ) & bmSNDTOGRD ) ? 0 : 1 ;
continue ;
}
if ( rcode )
return rcode ;
if ( rcode ) return rcode ;
// Invoke callback function if inTransfer completed successfully and callback function pointer is specified
if ( ! rcode & & p )
( ( USBReadParser * ) p ) - > Parse ( read , dataptr , total - left ) ;
if ( ! rcode & & p ) ( ( USBReadParser * ) p ) - > Parse ( read , dataptr , total - left ) ;
left - = read ;
if ( read < nbytes )
break ;
if ( read < nbytes ) break ;
}
}
} else //OUT transfer
{
else { //OUT transfer
pep - > bmSndToggle = 1 ; //bmSNDTOG1;
rcode = OutTransfer ( pep , nak_limit , nbytes , dataptr ) ;
}
if ( rcode ) //return error
return ( rcode ) ;
if ( rcode ) return rcode ; // return error
}
// Status stage
return dispatchPkt ( ( direction ) ? tokOUTHS : tokINHS , ep , nak_limit ) ; //GET if direction
@ -220,8 +209,7 @@ uint8_t USB::inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t*
uint16_t nak_limit = 0 ;
uint8_t rcode = SetAddress ( addr , ep , & pep , & nak_limit ) ;
if ( rcode ) {
if ( rcode ) {
USBTRACE3 ( " (USB::InTransfer) SetAddress Failed " , rcode , 0x81 ) ;
USBTRACE3 ( " (USB::InTransfer) addr requested " , addr , 0x81 ) ;
USBTRACE3 ( " (USB::InTransfer) ep requested " , ep , 0x81 ) ;
@ -242,30 +230,30 @@ uint8_t USB::InTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t *nbytesptr, ui
regWr ( rHCTL , ( pep - > bmRcvToggle ) ? bmRCVTOG1 : bmRCVTOG0 ) ; //set toggle value
// use a 'break' to exit this loop
while ( 1 ) {
for ( ; ; ) {
rcode = dispatchPkt ( tokIN , pep - > epAddr , nak_limit ) ; //IN packet to EP-'endpoint'. Function takes care of NAKS.
if ( rcode = = hrTOGERR ) {
if ( rcode = = hrTOGERR ) {
// yes, we flip it wrong here so that next time it is actually correct!
pep - > bmRcvToggle = ( regRd ( rHRSL ) & bmRCVTOGRD ) ? 0 : 1 ;
regWr ( rHCTL , ( pep - > bmRcvToggle ) ? bmRCVTOG1 : bmRCVTOG0 ) ; //set toggle value
continue ;
}
if ( rcode ) {
if ( rcode ) {
//printf(">>>>>>>> Problem! dispatchPkt %2.2x\r\n", rcode);
break ; //should be 0, indicating ACK. Else return error code.
}
/* check for RCVDAVIRQ and generate error if not present */
/* the only case when absence of RCVDAVIRQ makes sense is when toggle error occurred. Need to add handling for that */
if ( ( regRd ( rHIRQ ) & bmRCVDAVIRQ ) = = 0 ) {
if ( ( regRd ( rHIRQ ) & bmRCVDAVIRQ ) = = 0 ) {
//printf(">>>>>>>> Problem! NO RCVDAVIRQ!\r\n");
rcode = 0xf 0; //receive error
rcode = 0xF ; //receive error
break ;
}
pktsize = regRd ( rRCVBC ) ; //number of received bytes
//printf("Got %i bytes \r\n", pktsize);
// This would be OK, but...
//assert(pktsize <= nbytes);
if ( pktsize > nbytes ) {
if ( pktsize > nbytes ) {
// This can happen. Use of assert on Arduino locks up the Arduino.
// So I will trim the value, and hope for the best.
//printf(">>>>>>>> Problem! Wanted %i bytes but got %i.\r\n", nbytes, pktsize);
@ -273,9 +261,7 @@ uint8_t USB::InTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t *nbytesptr, ui
}
int16_t mem_left = ( int16_t ) nbytes - * ( ( int16_t * ) nbytesptr ) ;
if ( mem_left < 0 )
mem_left = 0 ;
if ( mem_left < 0 ) mem_left = 0 ;
data = bytesRd ( rRCVFIFO , ( ( pktsize > mem_left ) ? mem_left : pktsize ) , data ) ;
@ -285,17 +271,17 @@ uint8_t USB::InTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t *nbytesptr, ui
/* The transfer is complete under two conditions: */
/* 1. The device sent a short packet (L.T. maxPacketSize) */
/* 2. 'nbytes' have been transferred. */
if ( ( pktsize < maxpktsize ) | | ( * nbytesptr > = nbytes ) ) // have we transferred 'nbytes' bytes?
{
if ( pktsize < maxpktsize | | * nbytesptr > = nbytes ) { // Transferred 'nbytes' bytes?
// Save toggle value
pep - > bmRcvToggle = ( ( regRd ( rHRSL ) & bmRCVTOGRD ) ) ? 1 : 0 ;
//printf("\r\n");
rcode = 0 ;
break ;
} else if ( bInterval > 0 )
}
else if ( bInterval > 0 )
delay ( bInterval ) ; // Delay according to polling interval
} //while( 1 )
return ( rcode ) ;
}
return rcode ;
}
/* OUT transfer to arbitrary endpoint. Handles multiple packets if necessary. Transfers 'nbytes' bytes. */
@ -307,9 +293,7 @@ uint8_t USB::outTransfer(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t* dat
uint16_t nak_limit = 0 ;
uint8_t rcode = SetAddress ( addr , ep , & pep , & nak_limit ) ;
if ( rcode )
return rcode ;
if ( rcode ) return rcode ;
return OutTransfer ( pep , nak_limit , nbytes , data ) ;
}
@ -322,35 +306,35 @@ uint8_t USB::OutTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t nbytes, uint8
uint8_t maxpktsize = pep - > maxPktSize ;
if ( maxpktsize < 1 | | maxpktsize > 64 )
if ( maxpktsize < 1 | | maxpktsize > 64 )
return USB_ERROR_INVALID_MAX_PKT_SIZE ;
uint32_t timeout = ( uint32_t ) millis ( ) + USB_XFER_TIMEOUT ;
regWr ( rHCTL , ( pep - > bmSndToggle ) ? bmSNDTOG1 : bmSNDTOG0 ) ; //set toggle value
while ( bytes_left ) {
while ( bytes_left ) {
retry_count = 0 ;
nak_count = 0 ;
bytes_tosend = ( bytes_left > = maxpktsize ) ? maxpktsize : bytes_left ;
bytesWr ( rSNDFIFO , bytes_tosend , data_p ) ; //filling output FIFO
regWr ( rSNDBC , bytes_tosend ) ; //set number of bytes
regWr ( rHXFR , ( tokOUT | pep - > epAddr ) ) ; //dispatch packet
while ( ! ( regRd ( rHIRQ ) & bmHXFRDNIRQ ) ) ; //wait for the completion IRQ
while ( ! ( regRd ( rHIRQ ) & bmHXFRDNIRQ ) ) ; //wait for the completion IRQ
regWr ( rHIRQ , bmHXFRDNIRQ ) ; //clear IRQ
rcode = ( regRd ( rHRSL ) & 0x0 f ) ;
rcode = ( regRd ( rHRSL ) & 0x0 F ) ;
while ( rcode & & ( ( int32_t ) ( ( uint32_t ) millis ( ) - timeout ) < 0L ) ) {
switch ( rcode ) {
while ( rcode & & ( ( int32_t ) ( ( uint32_t ) millis ( ) - timeout ) < 0L ) ) {
switch ( rcode ) {
case hrNAK :
nak_count + + ;
if ( nak_limit & & ( nak_count = = nak_limit ) )
if ( nak_limit & & ( nak_count = = nak_limit ) )
goto breakout ;
//return ( rcode);
break ;
case hrTIMEOUT :
retry_count + + ;
if ( retry_count = = USB_RETRY_LIMIT )
if ( retry_count = = USB_RETRY_LIMIT )
goto breakout ;
//return ( rcode);
break ;
@ -361,31 +345,32 @@ uint8_t USB::OutTransfer(EpInfo *pep, uint16_t nak_limit, uint16_t nbytes, uint8
break ;
default :
goto breakout ;
} //switch( rcode
}
/* process NAK according to Host out NAK bug */
regWr ( rSNDBC , 0 ) ;
regWr ( rSNDFIFO , * data_p ) ;
regWr ( rSNDBC , bytes_tosend ) ;
regWr ( rHXFR , ( tokOUT | pep - > epAddr ) ) ; //dispatch packet
while ( ! ( regRd ( rHIRQ ) & bmHXFRDNIRQ ) ) ; //wait for the completion IRQ
while ( ! ( regRd ( rHIRQ ) & bmHXFRDNIRQ ) ) ; //wait for the completion IRQ
regWr ( rHIRQ , bmHXFRDNIRQ ) ; //clear IRQ
rcode = ( regRd ( rHRSL ) & 0x0 f ) ;
} // while( rcode && ....
rcode = ( regRd ( rHRSL ) & 0x0 F ) ;
} // while rcode && ....
bytes_left - = bytes_tosend ;
data_p + = bytes_tosend ;
} // while( bytes_left...
} // while bytes_left...
breakout :
pep - > bmSndToggle = ( regRd ( rHRSL ) & bmSNDTOGRD ) ? 1 : 0 ; //bmSNDTOG1 : bmSNDTOG0; //update toggle
return ( rcode ) ; //should be 0 in all cases
}
/* dispatch USB packet. Assumes peripheral address is set and relevant buffer is loaded/empty */
/* If NAK, tries to re-send up to nak_limit times */
/* If nak_limit == 0, do not count NAKs, exit after timeout */
/* If bus timeout, re-sends up to USB_RETRY_LIMIT times */
/* return codes 0x00-0x0 f are HRSLT( 0x00 being success ), 0xff means timeout */
/* return codes 0x00-0x0 F are HRSLT( 0x00 being success ), 0xFF means timeout */
uint8_t USB : : dispatchPkt ( uint8_t token , uint8_t ep , uint16_t nak_limit ) {
uint32_t timeout = ( uint32_t ) millis ( ) + USB_XFER_TIMEOUT ;
uint8_t tmpdata ;
@ -393,55 +378,53 @@ uint8_t USB::dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit) {
uint8_t retry_count = 0 ;
uint16_t nak_count = 0 ;
while ( ( int32_t ) ( ( uint32_t ) millis ( ) - timeout ) < 0L ) {
# if defined(ESP8266) || defined(ESP32)
while ( ( int32_t ) ( ( uint32_t ) millis ( ) - timeout ) < 0L ) {
# if defined(ESP8266) || defined(ESP32)
yield ( ) ; // needed in order to reset the watchdog timer on the ESP8266
# endif
# endif
regWr ( rHXFR , ( token | ep ) ) ; //launch the transfer
rcode = USB_ERROR_TRANSFER_TIMEOUT ;
while ( ( int32_t ) ( ( uint32_t ) millis ( ) - timeout ) < 0L ) //wait for transfer completion
{
# if defined(ESP8266) || defined(ESP32)
yield ( ) ; // needed in order to reset the watchdog timer on the ESP8266
# endif
while ( ( int32_t ) ( ( uint32_t ) millis ( ) - timeout ) < 0L ) { //wait for transfer completion
# if defined(ESP8266) || defined(ESP32)
yield ( ) ; // needed to reset the watchdog timer on the ESP8266
# endif
tmpdata = regRd ( rHIRQ ) ;
if ( tmpdata & bmHXFRDNIRQ ) {
if ( tmpdata & bmHXFRDNIRQ ) {
regWr ( rHIRQ , bmHXFRDNIRQ ) ; //clear the interrupt
rcode = 0x00 ;
break ;
} //if( tmpdata & bmHXFRDNIRQ
}
} // while ( millis() < timeout
} // while millis() < timeout
//if (rcode != 0x00) //exit if timeout
// return ( rcode);
rcode = ( regRd ( rHRSL ) & 0x0 f ) ; //analyze transfer result
rcode = ( regRd ( rHRSL ) & 0x0 F ) ; //analyze transfer result
switch ( rcode ) {
switch ( rcode ) {
case hrNAK :
nak_count + + ;
if ( nak_limit & & ( nak_count = = nak_limit ) )
if ( nak_limit & & ( nak_count = = nak_limit ) )
return ( rcode ) ;
break ;
case hrTIMEOUT :
retry_count + + ;
if ( retry_count = = USB_RETRY_LIMIT )
if ( retry_count = = USB_RETRY_LIMIT )
return ( rcode ) ;
break ;
default :
return ( rcode ) ;
} //switch( rcode
}
} // while( timeout > millis()
return ( rcode ) ;
} // while timeout > millis()
return rcode ;
}
/* USB main task. Performs enumeration/cleanup */
void USB : : Task ( void ) //USB state machine
{
void USB : : Task ( void ) { //USB state machine
uint8_t rcode ;
uint8_t tmpdata ;
static uint32_t delay = 0 ;
@ -453,38 +436,36 @@ void USB::Task(void) //USB state machine
tmpdata = getVbusState ( ) ;
/* modify USB task state if Vbus changed */
switch ( tmpdata ) {
switch ( tmpdata ) {
case SE1 : //illegal state
usb_task_state = USB_DETACHED_SUBSTATE_ILLEGAL ;
lowspeed = false ;
break ;
case SE0 : //disconnected
if ( ( usb_task_state & USB_STATE_MASK ) ! = USB_STATE_DETACHED )
if ( ( usb_task_state & USB_STATE_MASK ) ! = USB_STATE_DETACHED )
usb_task_state = USB_DETACHED_SUBSTATE_INITIALIZE ;
lowspeed = false ;
break ;
case LSHOST :
lowspeed = true ;
//intentional fallthrough
case FSHOST : //attached
if ( ( usb_task_state & USB_STATE_MASK ) = = USB_STATE_DETACHED ) {
if ( ( usb_task_state & USB_STATE_MASK ) = = USB_STATE_DETACHED ) {
delay = ( uint32_t ) millis ( ) + USB_SETTLE_DELAY ;
usb_task_state = USB_ATTACHED_SUBSTATE_SETTLE ;
}
break ;
} // switch( tmpdata
}
for ( uint8_t i = 0 ; i < USB_NUMDEVICES ; i + + )
if ( devConfig [ i ] )
rcode = devConfig [ i ] - > Poll ( ) ;
for ( uint8_t i = 0 ; i < USB_NUMDEVICES ; i + + )
if ( devConfig [ i ] ) rcode = devConfig [ i ] - > Poll ( ) ;
switch ( usb_task_state ) {
switch ( usb_task_state ) {
case USB_DETACHED_SUBSTATE_INITIALIZE :
init ( ) ;
for ( uint8_t i = 0 ; i < USB_NUMDEVICES ; i + + )
if ( devConfig [ i ] )
for ( uint8_t i = 0 ; i < USB_NUMDEVICES ; i + + )
if ( devConfig [ i ] )
rcode = devConfig [ i ] - > Release ( ) ;
usb_task_state = USB_DETACHED_SUBSTATE_WAIT_FOR_DEVICE ;
@ -494,7 +475,7 @@ void USB::Task(void) //USB state machine
case USB_DETACHED_SUBSTATE_ILLEGAL : //just sit here
break ;
case USB_ATTACHED_SUBSTATE_SETTLE : //settle time for just attached device
if ( ( int32_t ) ( ( uint32_t ) millis ( ) - delay ) > = 0L )
if ( ( int32_t ) ( ( uint32_t ) millis ( ) - delay ) > = 0L )
usb_task_state = USB_ATTACHED_SUBSTATE_RESET_DEVICE ;
else break ; // don't fall through
case USB_ATTACHED_SUBSTATE_RESET_DEVICE :
@ -502,7 +483,7 @@ void USB::Task(void) //USB state machine
usb_task_state = USB_ATTACHED_SUBSTATE_WAIT_RESET_COMPLETE ;
break ;
case USB_ATTACHED_SUBSTATE_WAIT_RESET_COMPLETE :
if ( ( regRd ( rHCTL ) & bmBUSRST ) = = 0 ) {
if ( ( regRd ( rHCTL ) & bmBUSRST ) = = 0 ) {
tmpdata = regRd ( rMODE ) | bmSOFKAENAB ; //start SOF generation
regWr ( rMODE , tmpdata ) ;
usb_task_state = USB_ATTACHED_SUBSTATE_WAIT_SOF ;
@ -510,7 +491,7 @@ void USB::Task(void) //USB state machine
}
break ;
case USB_ATTACHED_SUBSTATE_WAIT_SOF : //todo: change check order
if ( regRd ( rHIRQ ) & bmFRAMEIRQ ) {
if ( regRd ( rHIRQ ) & bmFRAMEIRQ ) {
//when first SOF received _and_ 20ms has passed we can continue
/*
if ( delay < ( uint32_t ) millis ( ) ) //20ms passed
@ -521,7 +502,7 @@ void USB::Task(void) //USB state machine
}
break ;
case USB_ATTACHED_SUBSTATE_WAIT_RESET :
if ( ( int32_t ) ( ( uint32_t ) millis ( ) - delay ) > = 0L ) usb_task_state = USB_STATE_CONFIGURING ;
if ( ( int32_t ) ( ( uint32_t ) millis ( ) - delay ) > = 0L ) usb_task_state = USB_STATE_CONFIGURING ;
else break ; // don't fall through
case USB_STATE_CONFIGURING :
@ -530,20 +511,19 @@ void USB::Task(void) //USB state machine
rcode = Configuring ( 0 , 0 , lowspeed ) ;
if ( rcode ) {
if ( rcode ! = USB_DEV_CONFIG_ERROR_DEVICE_INIT_INCOMPLETE ) {
if ( ! rcode )
usb_task_state = USB_STATE_RUNNING ;
else if ( rcode ! = USB_DEV_CONFIG_ERROR_DEVICE_INIT_INCOMPLETE ) {
usb_error = rcode ;
usb_task_state = USB_STATE_ERROR ;
}
} else
usb_task_state = USB_STATE_RUNNING ;
break ;
case USB_STATE_RUNNING :
break ;
case USB_STATE_ERROR :
//MAX3421E::Init();
break ;
} // switch( usb_task_state )
}
}
uint8_t USB : : DefaultAddressing ( uint8_t parent , uint8_t port , bool lowspeed ) {
@ -553,38 +533,28 @@ uint8_t USB::DefaultAddressing(uint8_t parent, uint8_t port, bool lowspeed) {
// Get pointer to pseudo device with address 0 assigned
p0 = addrPool . GetUsbDevicePtr ( 0 ) ;
if ( ! p0 ) return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL ;
if ( ! p0 - > epinfo ) return USB_ERROR_EPINFO_IS_NULL ;
if ( ! p0 )
return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL ;
if ( ! p0 - > epinfo )
return USB_ERROR_EPINFO_IS_NULL ;
p0 - > lowspeed = ( lowspeed ) ? true : false ;
p0 - > lowspeed = lowspeed ;
// Allocate new address according to device class
uint8_t bAddress = addrPool . AllocAddress ( parent , false , port ) ;
if ( ! bAddress )
return USB_ERROR_OUT_OF_ADDRESS_SPACE_IN_POOL ;
if ( ! bAddress ) return USB_ERROR_OUT_OF_ADDRESS_SPACE_IN_POOL ;
p = addrPool . GetUsbDevicePtr ( bAddress ) ;
if ( ! p )
return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL ;
if ( ! p ) return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL ;
p - > lowspeed = lowspeed ;
// Assign new address to the device
rcode = setAddr ( 0 , 0 , bAddress ) ;
if ( rcode ) {
if ( rcode ) {
addrPool . FreeAddress ( bAddress ) ;
bAddress = 0 ;
return rcode ;
}
return 0 ;
} ;
return rcode ;
}
uint8_t USB : : AttemptConfig ( uint8_t driver , uint8_t parent , uint8_t port , bool lowspeed ) {
//printf("AttemptConfig: parent = %i, port = %i\r\n", parent, port);
@ -592,35 +562,40 @@ uint8_t USB::AttemptConfig(uint8_t driver, uint8_t parent, uint8_t port, bool lo
again :
uint8_t rcode = devConfig [ driver ] - > ConfigureDevice ( parent , port , lowspeed ) ;
if ( rcode = = USB_ERROR_CONFIG_REQUIRES_ADDITIONAL_RESET ) {
if ( parent = = 0 ) {
if ( rcode = = USB_ERROR_CONFIG_REQUIRES_ADDITIONAL_RESET ) {
if ( parent = = 0 ) {
// Send a bus reset on the root interface.
regWr ( rHCTL , bmBUSRST ) ; //issue bus reset
delay ( 102 ) ; // delay 102ms, compensate for clock inaccuracy.
} else {
}
else {
// reset parent port
devConfig [ parent ] - > ResetHubPort ( port ) ;
}
} else if ( rcode = = hrJERR & & retries < 3 ) { // Some devices returns this when plugged in - trying to initialize the device again usually works
}
else if ( rcode = = hrJERR & & retries < 3 ) { // Some devices returns this when plugged in - trying to initialize the device again usually works
delay ( 100 ) ;
retries + + ;
goto again ;
} else if ( rcode )
}
else if ( rcode )
return rcode ;
rcode = devConfig [ driver ] - > Init ( parent , port , lowspeed ) ;
if ( rcode = = hrJERR & & retries < 3 ) { // Some devices returns this when plugged in - trying to initialize the device again usually works
if ( rcode = = hrJERR & & retries < 3 ) { // Some devices returns this when plugged in - trying to initialize the device again usually works
delay ( 100 ) ;
retries + + ;
goto again ;
}
if ( rcode ) {
if ( rcode ) {
// Issue a bus reset, because the device may be in a limbo state
if ( parent = = 0 ) {
if ( parent = = 0 ) {
// Send a bus reset on the root interface.
regWr ( rHCTL , bmBUSRST ) ; //issue bus reset
delay ( 102 ) ; // delay 102ms, compensate for clock inaccuracy.
} else {
}
else {
// reset parent port
devConfig [ parent ] - > ResetHubPort ( port ) ;
}
@ -628,11 +603,10 @@ again:
return rcode ;
}
/*
* This is broken . We need to enumerate differently .
/* *
* This is broken . It needs to enumerate differently .
* It causes major problems with several devices if detected in an unexpected order .
*
*
* Oleg - I wouldn ' t do anything before the newly connected device is considered sane .
* i . e . ( delays are not indicated for brevity ) :
* 1. reset
@ -649,7 +623,7 @@ again:
* 4 : set address
* 5 : pUsb - > setEpInfoEntry ( bAddress , 1 , epInfo ) , exit on fail
* 6 : while ( configurations ) {
* for ( each configuration ) {
* for ( each configuration ) {
* for ( each driver ) {
* 6 a : Ask device if it likes configuration . Returns 0 on OK .
* If successful , the driver configured device .
@ -663,7 +637,7 @@ again:
* }
* }
* }
* 7 : for ( each driver ) {
* 7 : for ( each driver ) {
* 7 a : Ask device if it knows this VID / PID . Acts exactly like 6 a , but using VID / PID
* 8 : if we get here , no driver likes the device plugged in , so exit failure .
*
@ -689,7 +663,7 @@ uint8_t USB::Configuring(uint8_t parent, uint8_t port, bool lowspeed) {
AddressPool & addrPool = GetAddressPool ( ) ;
// Get pointer to pseudo device with address 0 assigned
p = addrPool . GetUsbDevicePtr ( 0 ) ;
if ( ! p ) {
if ( ! p ) {
//printf("Configuring error: USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL\r\n");
return USB_ERROR_ADDRESS_NOT_FOUND_IN_POOL ;
}
@ -709,7 +683,7 @@ uint8_t USB::Configuring(uint8_t parent, uint8_t port, bool lowspeed) {
// Restore p->epinfo
p - > epinfo = oldep_ptr ;
if ( rcode ) {
if ( rcode ) {
//printf("Configuring error: Can't get USB_DEVICE_DESCRIPTOR\r\n");
return rcode ;
}
@ -718,40 +692,36 @@ uint8_t USB::Configuring(uint8_t parent, uint8_t port, bool lowspeed) {
// Allocate new address according to device class
//bAddress = addrPool.AllocAddress(parent, false, port);
uint16_t vid = udd - > idVendor ;
uint16_t pid = udd - > idProduct ;
uint8_t klass = udd - > bDeviceClass ;
uint8_t subklass = udd - > bDeviceSubClass ;
uint16_t vid = udd - > idVendor , pid = udd - > idProduct ;
uint8_t klass = udd - > bDeviceClass , subklass = udd - > bDeviceSubClass ;
// Attempt to configure if VID/PID or device class matches with a driver
// Qualify with subclass too.
//
// VID/PID & class tests default to false for drivers not yet ported
// subclass defaults to true, so you don't have to define it if you don't have to.
//
for ( devConfigIndex = 0 ; devConfigIndex < USB_NUMDEVICES ; devConfigIndex + + ) {
if ( ! devConfig [ devConfigIndex ] ) continue ; // no driver
if ( devConfig [ devConfigIndex ] - > GetAddress ( ) ) continue ; // consumed
if ( devConfig [ devConfigIndex ] - > DEVSUBCLASSOK ( subklass ) & & ( devConfig [ devConfigIndex ] - > VIDPIDOK ( vid , pid ) | | devConfig [ devConfigIndex ] - > DEVCLASSOK ( klass ) ) ) {
for ( devConfigIndex = 0 ; devConfigIndex < USB_NUMDEVICES ; devConfigIndex + + ) {
if ( ! devConfig [ devConfigIndex ] ) continue ; // no driver
if ( devConfig [ devConfigIndex ] - > GetAddress ( ) ) continue ; // consumed
if ( devConfig [ devConfigIndex ] - > DEVSUBCLASSOK ( subklass ) & & ( devConfig [ devConfigIndex ] - > VIDPIDOK ( vid , pid ) | | devConfig [ devConfigIndex ] - > DEVCLASSOK ( klass ) ) ) {
rcode = AttemptConfig ( devConfigIndex , parent , port , lowspeed ) ;
if ( rcode ! = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED )
if ( rcode ! = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED )
break ;
}
}
if ( devConfigIndex < USB_NUMDEVICES ) {
return rcode ;
}
if ( devConfigIndex < USB_NUMDEVICES ) return rcode ;
// blindly attempt to configure
for ( devConfigIndex = 0 ; devConfigIndex < USB_NUMDEVICES ; devConfigIndex + + ) {
if ( ! devConfig [ devConfigIndex ] ) continue ;
if ( devConfig [ devConfigIndex ] - > GetAddress ( ) ) continue ; // consumed
if ( devConfig [ devConfigIndex ] - > DEVSUBCLASSOK ( subklass ) & & ( devConfig [ devConfigIndex ] - > VIDPIDOK ( vid , pid ) | | devConfig [ devConfigIndex ] - > DEVCLASSOK ( klass ) ) ) continue ; // If this is true it means it must have returned USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED above
for ( devConfigIndex = 0 ; devConfigIndex < USB_NUMDEVICES ; devConfigIndex + + ) {
if ( ! devConfig [ devConfigIndex ] ) continue ;
if ( devConfig [ devConfigIndex ] - > GetAddress ( ) ) continue ; // consumed
if ( devConfig [ devConfigIndex ] - > DEVSUBCLASSOK ( subklass ) & & ( devConfig [ devConfigIndex ] - > VIDPIDOK ( vid , pid ) | | devConfig [ devConfigIndex ] - > DEVCLASSOK ( klass ) ) ) continue ; // If this is true it means it must have returned USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED above
rcode = AttemptConfig ( devConfigIndex , parent , port , lowspeed ) ;
//printf("ERROR ENUMERATING %2.2x\r\n", rcode);
if ( ! ( rcode = = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED | | rcode = = USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE ) ) {
if ( ! ( rcode = = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED | | rcode = = USB_ERROR_CLASS_INSTANCE_ALREADY_IN_USE ) ) {
// in case of an error dev_index should be reset to 0
// in order to start from the very beginning the
// next time the program gets here
@ -760,21 +730,18 @@ uint8_t USB::Configuring(uint8_t parent, uint8_t port, bool lowspeed) {
return rcode ;
}
}
// if we get here that means that the device class is not supported by any of registered classes
rcode = DefaultAddressing ( parent , port , lowspeed ) ;
return rcode ;
// Arriving here means the device class is unsupported by registered classes
return DefaultAddressing ( parent , port , lowspeed ) ;
}
uint8_t USB : : ReleaseDevice ( uint8_t addr ) {
if ( ! addr )
return 0 ;
for ( uint8_t i = 0 ; i < USB_NUMDEVICES ; i + + ) {
if ( ! devConfig [ i ] ) continue ;
if ( devConfig [ i ] - > GetAddress ( ) = = addr )
if ( addr ) {
for ( uint8_t i = 0 ; i < USB_NUMDEVICES ; i + + ) {
if ( ! devConfig [ i ] ) continue ;
if ( devConfig [ i ] - > GetAddress ( ) = = addr )
return devConfig [ i ] - > Release ( ) ;
}
}
return 0 ;
}
@ -782,12 +749,12 @@ uint8_t USB::ReleaseDevice(uint8_t addr) {
//get device descriptor
uint8_t USB : : getDevDescr ( uint8_t addr , uint8_t ep , uint16_t nbytes , uint8_t * dataptr ) {
return ( ctrlReq( addr , ep , bmREQ_GET_DESCR , USB_REQUEST_GET_DESCRIPTOR , 0x00 , USB_DESCRIPTOR_DEVICE , 0x0000 , nbytes , nbytes , dataptr , NULL ) ) ;
return ( addr , ep , bmREQ_GET_DESCR , USB_REQUEST_GET_DESCRIPTOR , 0x00 , USB_DESCRIPTOR_DEVICE , 0x0000 , nbytes , nbytes , dataptr , NULL ) ;
}
//get configuration descriptor
uint8_t USB : : getConfDescr ( uint8_t addr , uint8_t ep , uint16_t nbytes , uint8_t conf , uint8_t * dataptr ) {
return ( ctrlReq( addr , ep , bmREQ_GET_DESCR , USB_REQUEST_GET_DESCRIPTOR , conf , USB_DESCRIPTOR_CONFIGURATION , 0x0000 , nbytes , nbytes , dataptr , NULL ) ) ;
return ( addr , ep , bmREQ_GET_DESCR , USB_REQUEST_GET_DESCRIPTOR , conf , USB_DESCRIPTOR_CONFIGURATION , 0x0000 , nbytes , nbytes , dataptr , NULL ) ;
}
/* Requests Configuration Descriptor. Sends two Get Conf Descr requests. The first one gets the total length of all descriptors, then the second one requests this
@ -798,21 +765,19 @@ uint8_t USB::getConfDescr(uint8_t addr, uint8_t ep, uint8_t conf, USBReadParser
USB_CONFIGURATION_DESCRIPTOR * ucd = reinterpret_cast < USB_CONFIGURATION_DESCRIPTOR * > ( buf ) ;
uint8_t ret = getConfDescr ( addr , ep , 9 , conf , buf ) ;
if ( ret )
return ret ;
if ( ret ) return ret ;
uint16_t total = ucd - > wTotalLength ;
//USBTRACE2("\r\ntotal conf.size:", total);
return ( ctrlReq( addr , ep , bmREQ_GET_DESCR , USB_REQUEST_GET_DESCRIPTOR , conf , USB_DESCRIPTOR_CONFIGURATION , 0x0000 , total , bufSize , buf , p ) ) ;
return ( addr , ep , bmREQ_GET_DESCR , USB_REQUEST_GET_DESCRIPTOR , conf , USB_DESCRIPTOR_CONFIGURATION , 0x0000 , total , bufSize , buf , p ) ;
}
//get string descriptor
uint8_t USB : : getStrDescr ( uint8_t addr , uint8_t ep , uint16_t ns , uint8_t index , uint16_t langid , uint8_t * dataptr ) {
return ( ctrlReq( addr , ep , bmREQ_GET_DESCR , USB_REQUEST_GET_DESCRIPTOR , index , USB_DESCRIPTOR_STRING , langid , ns , ns , dataptr , NULL ) ) ;
return ( addr , ep , bmREQ_GET_DESCR , USB_REQUEST_GET_DESCRIPTOR , index , USB_DESCRIPTOR_STRING , langid , ns , ns , dataptr , NULL ) ;
}
//set address
@ -821,12 +786,12 @@ uint8_t USB::setAddr(uint8_t oldaddr, uint8_t ep, uint8_t newaddr) {
//delay(2); //per USB 2.0 sect.9.2.6.3
delay ( 300 ) ; // Older spec says you should wait at least 200ms
return rcode ;
//return ( ctrlReq(oldaddr, ep, bmREQ_SET, USB_REQUEST_SET_ADDRESS, newaddr, 0x00, 0x0000, 0x0000, 0x0000, NULL, NULL) );
//return ctrlReq(oldaddr, ep, bmREQ_SET, USB_REQUEST_SET_ADDRESS, newaddr, 0x00, 0x0000, 0x0000, 0x0000, NULL, NULL);
}
//set configuration
uint8_t USB : : setConf ( uint8_t addr , uint8_t ep , uint8_t conf_value ) {
return ( ctrlReq( addr , ep , bmREQ_SET , USB_REQUEST_SET_CONFIGURATION , conf_value , 0x00 , 0x0000 , 0x0000 , 0x0000 , NULL , NULL ) ) ;
return ( addr , ep , bmREQ_SET , USB_REQUEST_SET_CONFIGURATION , conf_value , 0x00 , 0x0000 , 0x0000 , 0x0000 , NULL , NULL ) ;
}
# endif // defined(USB_METHODS_INLINE)
Scott Lahteine
6 years ago