specchioriflesso/USB_Host_Shield_2.0
1
Fork 0
mirror of https://github.com/felis/USB_Host_Shield_2.0.git synced 2024-03-22 11:31:26 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix indentation, whitespace and convert tabs to spaces in MIDI driver

Browse source
This commit is contained in:
Kristian Sloth Lauszus 2016-04-14 23:13:35 +02:00
parent 0039719970
commit 8ac2035681
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
usbh_midi.cpp
View file

@ -26,7 +26,7 @@
#include "usbh_midi.h" #include "usbh_midi.h"
////////////////////////// //////////////////////////
// MIDI MESAGES // MIDI MESAGES
// midi.org/techspecs/ // midi.org/techspecs/
////////////////////////// //////////////////////////
// STATUS BYTES // STATUS BYTES
@ -148,7 +148,7 @@ uint8_t USBH_MIDI::Init(uint8_t parent, uint8_t port, bool lowspeed)
// Restore p->epinfo // Restore p->epinfo
p->epinfo = oldep_ptr; p->epinfo = oldep_ptr;
if( rcode ){ if( rcode ){
goto FailGetDevDescr; goto FailGetDevDescr;
} }
@ -159,7 +159,7 @@ uint8_t USBH_MIDI::Init(uint8_t parent, uint8_t port, bool lowspeed)
} }
// Extract Max Packet Size from device descriptor // Extract Max Packet Size from device descriptor
epInfo[0].maxPktSize = udd->bMaxPacketSize0; epInfo[0].maxPktSize = udd->bMaxPacketSize0;
// Assign new address to the device // Assign new address to the device
rcode = pUsb->setAddr( 0, 0, bAddress ); rcode = pUsb->setAddr( 0, 0, bAddress );
@ -171,7 +171,7 @@ uint8_t USBH_MIDI::Init(uint8_t parent, uint8_t port, bool lowspeed)
}//if (rcode... }//if (rcode...
#ifdef DEBUG_USB_HOST #ifdef DEBUG_USB_HOST
USBTRACE2("Addr:", bAddress); USBTRACE2("Addr:", bAddress);
#endif #endif
p->lowspeed = false; p->lowspeed = false;
//get pointer to assigned address record //get pointer to assigned address record
@ -252,7 +252,7 @@ void USBH_MIDI::parseConfigDescr( byte addr, byte conf )
rcode = pUsb->getConfDescr( addr, 0, 4, conf, buf ); rcode = pUsb->getConfDescr( addr, 0, 4, conf, buf );
if( rcode ){ if( rcode ){
return; return;
} }
total_length = buf[2] | ((int)buf[3] << 8); total_length = buf[2] | ((int)buf[3] << 8);
if( total_length > DESC_BUFF_SIZE ) { //check if total length is larger than buffer if( total_length > DESC_BUFF_SIZE ) { //check if total length is larger than buffer
total_length = DESC_BUFF_SIZE; total_length = DESC_BUFF_SIZE;
@ -265,7 +265,7 @@ void USBH_MIDI::parseConfigDescr( byte addr, byte conf )
} }
//parsing descriptors //parsing descriptors
while( buf_ptr < buf + total_length ) { while( buf_ptr < buf + total_length ) {
descr_length = *( buf_ptr ); descr_length = *( buf_ptr );
descr_type = *( buf_ptr + 1 ); descr_type = *( buf_ptr + 1 );
switch( descr_type ) { switch( descr_type ) {
@ -301,7 +301,7 @@ void USBH_MIDI::parseConfigDescr( byte addr, byte conf )
break; break;
default: default:
break; break;
}//switch( descr_type }//switch( descr_type
buf_ptr += descr_length; //advance buffer pointer buf_ptr += descr_length; //advance buffer pointer
}//while( buf_ptr <=... }//while( buf_ptr <=...
} }
@ -310,7 +310,7 @@ void USBH_MIDI::parseConfigDescr( byte addr, byte conf )
uint8_t USBH_MIDI::Release() uint8_t USBH_MIDI::Release()
{ {
pUsb->GetAddressPool().FreeAddress(bAddress); pUsb->GetAddressPool().FreeAddress(bAddress);
bNumEP = 1; //must have to be reset to 1 bNumEP = 1; //must have to be reset to 1
bAddress = 0; bAddress = 0;
bPollEnable = false; bPollEnable = false;
readPtr = 0; readPtr = 0;
@ -322,7 +322,7 @@ uint8_t USBH_MIDI::RecvData(uint16_t *bytes_rcvd, uint8_t *dataptr)
{ {
*bytes_rcvd = (uint16_t)epInfo[epDataInIndex].maxPktSize; *bytes_rcvd = (uint16_t)epInfo[epDataInIndex].maxPktSize;
uint8_t r = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, bytes_rcvd, dataptr); uint8_t r = pUsb->inTransfer(bAddress, epInfo[epDataInIndex].epAddr, bytes_rcvd, dataptr);
if( *bytes_rcvd < (MIDI_EVENT_PACKET_SIZE-4)){ if( *bytes_rcvd < (MIDI_EVENT_PACKET_SIZE-4)){
dataptr[*bytes_rcvd] = '\0'; dataptr[*bytes_rcvd] = '\0';
dataptr[(*bytes_rcvd)+1] = '\0'; dataptr[(*bytes_rcvd)+1] = '\0';
@ -384,7 +384,7 @@ uint8_t USBH_MIDI::SendData(uint8_t *dataptr, byte nCable)
buf[0] = (nCable << 4) | (msg >> 4); buf[0] = (nCable << 4) | (msg >> 4);
if( msg < 0xf0 ) msg = msg & 0xf0; if( msg < 0xf0 ) msg = msg & 0xf0;
//Building USB-MIDI Event Packets //Building USB-MIDI Event Packets
buf[1] = dataptr[0]; buf[1] = dataptr[0];
@ -497,7 +497,7 @@ unsigned int USBH_MIDI::countSysExDataSize(uint8_t *dataptr)
{ {
dataptr++; dataptr++;
c++; c++;
//Limiter (upto 256 bytes) //Limiter (upto 256 bytes)
if(c > 256){ if(c > 256){
c = 0; c = 0;

8
usbh_midi.h
View file

@ -40,10 +40,10 @@ private:
uint8_t lookupMsgSize(uint8_t midiMsg); uint8_t lookupMsgSize(uint8_t midiMsg);
protected: protected:
static const uint8_t epDataInIndex; // DataIn endpoint index(MIDI) static const uint8_t epDataInIndex; // DataIn endpoint index(MIDI)
static const uint8_t epDataOutIndex; // DataOUT endpoint index(MIDI) static const uint8_t epDataOutIndex; // DataOUT endpoint index(MIDI)
static const uint8_t epDataInIndexVSP; // DataIn endpoint index(Vendor Specific Protocl) static const uint8_t epDataInIndexVSP; // DataIn endpoint index(Vendor Specific Protocl)
static const uint8_t epDataOutIndexVSP; // DataOUT endpoint index(Vendor Specific Protocl) static const uint8_t epDataOutIndexVSP; // DataOUT endpoint index(Vendor Specific Protocl)
boolean isMidiFound; boolean isMidiFound;