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

Clear all LUN status data, remove unused variable

Browse source
This commit is contained in:
Andrew J. Kroll 2013-08-19 06:52:38 -04:00
parent 8935de332e
commit ebcc5ff7cb
2 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
masstorage.cpp
View file

@ -54,7 +54,6 @@ boolean BulkOnly::WriteProtected(uint8_t lun) {
return WriteOk[lun]; return WriteOk[lun];
} }
/** /**
* Lock or Unlock the tray or door on device. * Lock or Unlock the tray or door on device.
* Caution: Some devices with buggy firmware will lock up. * Caution: Some devices with buggy firmware will lock up.
@ -237,7 +236,6 @@ again:
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
BulkOnly::BulkOnly(USB *p) : BulkOnly::BulkOnly(USB *p) :
pUsb(p), pUsb(p),
bAddress(0), bAddress(0),
@ -614,7 +612,6 @@ boolean BulkOnly::CheckLUN(uint8_t lun) {
return false; return false;
} }
/** /**
* For driver use only. * For driver use only.
* *
@ -647,7 +644,7 @@ void BulkOnly::CheckMedia() {
* @return * @return
*/ */
uint8_t BulkOnly::Poll() { uint8_t BulkOnly::Poll() {
uint8_t rcode = 0; //uint8_t rcode = 0;
if (!bPollEnable) if (!bPollEnable)
return 0; return 0;
@ -655,9 +652,9 @@ uint8_t BulkOnly::Poll() {
if (qNextPollTime <= millis()) { if (qNextPollTime <= millis()) {
CheckMedia(); CheckMedia();
} }
rcode = 0; //rcode = 0;
return rcode; return 0;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -683,7 +680,6 @@ uint8_t BulkOnly::GetMaxLUN(uint8_t *plun) {
return 0; return 0;
} }
/** /**
* For driver use only. Used during Driver Init * For driver use only. Used during Driver Init
* *
@ -888,8 +884,6 @@ uint8_t BulkOnly::Page3F(uint8_t lun) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/** /**
* For driver use only. * For driver use only.
* *
@ -958,7 +952,12 @@ void BulkOnly::ClearAllEP() {
epInfo[i].bmNakPower = USB_NAK_DEFAULT; epInfo[i].bmNakPower = USB_NAK_DEFAULT;
} }
for (uint8_t i = 0; i < MASS_MAX_SUPPORTED_LUN; i++) LUNOk[i] = false; for (uint8_t i = 0; i < MASS_MAX_SUPPORTED_LUN; i++) {
LUNOk[i] = false;
WriteOk[i] = false;
CurrentCapacity[i] = 0lu;
CurrentSectorSize[i] = 0;
}
bIface = 0; bIface = 0;
bNumEP = 1; bNumEP = 1;
@ -970,7 +969,6 @@ void BulkOnly::ClearAllEP() {
bTheLUN = 0; bTheLUN = 0;
} }
/** /**
* For driver use only. * For driver use only.
* *
@ -1290,7 +1288,6 @@ uint8_t BulkOnly::HandleSCSIError(uint8_t status) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/** /**
* *
* @param ep_ptr * @param ep_ptr
@ -1321,7 +1318,6 @@ void BulkOnly::PrintEndpointDescriptor(const USB_ENDPOINT_DESCRIPTOR * ep_ptr) {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/* We won't be needing this... */ /* We won't be needing this... */
uint8_t BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, USBReadParser * prs) { uint8_t BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, USBReadParser * prs) {
if (!LUNOk[lun]) return MASS_ERR_NO_MEDIA; if (!LUNOk[lun]) return MASS_ERR_NO_MEDIA;

2
masstorage.h
View file

@ -220,7 +220,7 @@ protected:
EpInfo epInfo[MASS_MAX_ENDPOINTS]; EpInfo epInfo[MASS_MAX_ENDPOINTS];
uint32_t dCBWTag; // Tag uint32_t dCBWTag; // Tag
uint32_t dCBWDataTransferLength; // Data Transfer Length //uint32_t dCBWDataTransferLength; // Data Transfer Length
uint8_t bLastUsbError; // Last USB error uint8_t bLastUsbError; // Last USB error
uint8_t bMaxLUN; // Max LUN uint8_t bMaxLUN; // Max LUN
uint8_t bTheLUN; // Active LUN uint8_t bTheLUN; // Active LUN