mirror of
https://github.com/felis/USB_Host_Shield_2.0.git
synced 2024-03-22 11:31:26 +01:00
Unify a bunch of debug fail messages to a single point. More needed.
This commit is contained in:
parent
904f2ff25a
commit
5ec8889fa3
15 changed files with 148 additions and 153 deletions
38
BTD.cpp
38
BTD.cpp
|
@ -143,7 +143,7 @@ uint8_t BTD::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
/* We only need the Control endpoint, so we don't have to initialize the other endpoints of device */
|
/* We only need the Control endpoint, so we don't have to initialize the other endpoints of device */
|
||||||
rcode = pUsb->setConf(bAddress, epInfo[ BTD_CONTROL_PIPE ].epAddr, 1);
|
rcode = pUsb->setConf(bAddress, epInfo[ BTD_CONTROL_PIPE ].epAddr, 1);
|
||||||
if (rcode)
|
if (rcode)
|
||||||
goto FailSetConf;
|
goto FailSetConfDescr;
|
||||||
|
|
||||||
if (PID == PS3_PID || PID == PS3NAVIGATION_PID) {
|
if (PID == PS3_PID || PID == PS3NAVIGATION_PID) {
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
@ -193,7 +193,7 @@ uint8_t BTD::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
// Set Configuration Value
|
// Set Configuration Value
|
||||||
rcode = pUsb->setConf(bAddress, epInfo[ BTD_CONTROL_PIPE ].epAddr, bConfNum);
|
rcode = pUsb->setConf(bAddress, epInfo[ BTD_CONTROL_PIPE ].epAddr, bConfNum);
|
||||||
if (rcode)
|
if (rcode)
|
||||||
goto FailSetConf;
|
goto FailSetConfDescr;
|
||||||
|
|
||||||
hci_num_reset_loops = 100; // only loop 100 times before trying to send the hci reset command
|
hci_num_reset_loops = 100; // only loop 100 times before trying to send the hci reset command
|
||||||
hci_counter = 0;
|
hci_counter = 0;
|
||||||
|
@ -209,40 +209,30 @@ uint8_t BTD::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
|
|
||||||
/* diagnostic messages */
|
/* diagnostic messages */
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
#ifdef DEBUG
|
NotifyFailGetDevDescr();
|
||||||
Notify(PSTR("\r\ngetDevDescr"), 0x80);
|
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetDevTblEntry:
|
FailSetDevTblEntry:
|
||||||
#ifdef DEBUG
|
NotifyFailSetDevTblEntry();
|
||||||
Notify(PSTR("\r\nsetDevTblEn"), 0x80);
|
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailGetConfDescr:
|
FailGetConfDescr:
|
||||||
#ifdef DEBUG
|
NotifyFailGetConfDescr();
|
||||||
Notify(PSTR("\r\ngetConf"), 0x80);
|
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
FailSetConf:
|
|
||||||
#ifdef DEBUG
|
FailSetConfDescr:
|
||||||
Notify(PSTR("\r\nsetConf"), 0x80);
|
NotifyFailSetConfDescr();
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
FailUnknownDevice:
|
|
||||||
#ifdef DEBUG
|
FailUnknownDevice:
|
||||||
Notify(PSTR("\r\nUnknown Device Connected - VID: "), 0x80);
|
NotifyFailUnknownDevice(VID,PID);
|
||||||
PrintHex<uint16_t > (VID, 0x80);
|
|
||||||
Notify(PSTR(" PID: "), 0x80);
|
|
||||||
PrintHex<uint16_t > (PID, 0x80);
|
|
||||||
#endif
|
|
||||||
pUsb->setAddr(bAddress, 0, 0); // Reset address
|
pUsb->setAddr(bAddress, 0, 0); // Reset address
|
||||||
rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
|
rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
|
||||||
goto Fail;
|
|
||||||
Fail:
|
Fail:
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
Notify(PSTR("\r\nBTD Init Failed, error code: "), 0x80);
|
Notify(PSTR("\r\nBTD Init Failed, error code: "), 0x80);
|
||||||
Serial.print(rcode);
|
|
||||||
#endif
|
#endif
|
||||||
|
NotifyFail(rcode);
|
||||||
Release();
|
Release();
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
31
PS3USB.cpp
31
PS3USB.cpp
|
@ -187,7 +187,7 @@ uint8_t PS3USB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
|
|
||||||
rcode = pUsb->setConf(bAddress, epInfo[ PS3_CONTROL_PIPE ].epAddr, 1);
|
rcode = pUsb->setConf(bAddress, epInfo[ PS3_CONTROL_PIPE ].epAddr, 1);
|
||||||
if (rcode)
|
if (rcode)
|
||||||
goto FailSetConf;
|
goto FailSetConfDescr;
|
||||||
|
|
||||||
if (PID == PS3_PID || PID == PS3NAVIGATION_PID) {
|
if (PID == PS3_PID || PID == PS3NAVIGATION_PID) {
|
||||||
if (PID == PS3_PID) {
|
if (PID == PS3_PID) {
|
||||||
|
@ -232,34 +232,25 @@ uint8_t PS3USB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
|
|
||||||
/* diagnostic messages */
|
/* diagnostic messages */
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
#ifdef DEBUG
|
NotifyFailGetDevDescr();
|
||||||
Notify(PSTR("\r\ngetDevDescr:"), 0x80);
|
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetDevTblEntry:
|
FailSetDevTblEntry:
|
||||||
#ifdef DEBUG
|
NotifyFailSetDevTblEntry();
|
||||||
Notify(PSTR("\r\nsetDevTblEn:"), 0x80);
|
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
FailSetConf:
|
|
||||||
#ifdef DEBUG
|
FailSetConfDescr:
|
||||||
Notify(PSTR("\r\nsetConf:"), 0x80);
|
NotifyFailSetConfDescr();
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
FailUnknownDevice:
|
FailUnknownDevice:
|
||||||
#ifdef DEBUG
|
NotifyFailUnknownDevice(VID,PID);
|
||||||
Notify(PSTR("\r\nUnknown Device Connected - VID: "), 0x80);
|
|
||||||
PrintHex<uint16_t > (VID, 0x80);
|
|
||||||
Notify(PSTR(" PID: "), 0x80);
|
|
||||||
PrintHex<uint16_t > (PID, 0x80);
|
|
||||||
#endif
|
|
||||||
rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
|
rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
|
||||||
goto Fail;
|
Fail:
|
||||||
Fail:
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
Notify(PSTR("\r\nPS3 Init Failed, error code: "), 0x80);
|
Notify(PSTR("\r\nPS3 Init Failed, error code: "), 0x80);
|
||||||
Serial.print(rcode, HEX);
|
|
||||||
#endif
|
#endif
|
||||||
|
NotifyFail(rcode);
|
||||||
Release();
|
Release();
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
32
XBOXRECV.cpp
32
XBOXRECV.cpp
|
@ -207,7 +207,7 @@ uint8_t XBOXRECV::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
|
|
||||||
rcode = pUsb->setConf(bAddress, epInfo[ XBOX_CONTROL_PIPE ].epAddr, 1);
|
rcode = pUsb->setConf(bAddress, epInfo[ XBOX_CONTROL_PIPE ].epAddr, 1);
|
||||||
if (rcode)
|
if (rcode)
|
||||||
goto FailSetConf;
|
goto FailSetConfDescr;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
Notify(PSTR("\r\nXbox Wireless Receiver Connected\r\n"), 0x80);
|
Notify(PSTR("\r\nXbox Wireless Receiver Connected\r\n"), 0x80);
|
||||||
|
@ -218,34 +218,26 @@ uint8_t XBOXRECV::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
|
|
||||||
/* diagnostic messages */
|
/* diagnostic messages */
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
#ifdef DEBUG
|
NotifyFailGetDevDescr();
|
||||||
Notify(PSTR("\r\ngetDevDescr:"), 0x80);
|
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetDevTblEntry:
|
FailSetDevTblEntry:
|
||||||
#ifdef DEBUG
|
NotifyFailSetDevTblEntry();
|
||||||
Notify(PSTR("\r\nsetDevTblEn:"), 0x80);
|
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
FailSetConf:
|
|
||||||
#ifdef DEBUG
|
FailSetConfDescr:
|
||||||
Notify(PSTR("\r\nsetConf:"), 0x80);
|
NotifyFailSetConfDescr();
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
FailUnknownDevice:
|
|
||||||
#ifdef DEBUG
|
FailUnknownDevice:
|
||||||
Notify(PSTR("\r\nUnknown Device Connected - VID: "), 0x80);
|
NotifyFailUnknownDevice(VID,PID);
|
||||||
PrintHex<uint16_t > (VID, 0x80);
|
|
||||||
Notify(PSTR(" PID: "), 0x80);
|
|
||||||
PrintHex<uint16_t > (PID, 0x80);
|
|
||||||
#endif
|
|
||||||
rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
|
rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
|
||||||
goto Fail;
|
|
||||||
Fail:
|
Fail:
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);
|
Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);
|
||||||
Serial.print(rcode, HEX);
|
|
||||||
#endif
|
#endif
|
||||||
|
NotifyFail(rcode);
|
||||||
Release();
|
Release();
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
29
XBOXUSB.cpp
29
XBOXUSB.cpp
|
@ -171,7 +171,7 @@ uint8_t XBOXUSB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
|
|
||||||
rcode = pUsb->setConf(bAddress, epInfo[ XBOX_CONTROL_PIPE ].epAddr, 1);
|
rcode = pUsb->setConf(bAddress, epInfo[ XBOX_CONTROL_PIPE ].epAddr, 1);
|
||||||
if (rcode)
|
if (rcode)
|
||||||
goto FailSetConf;
|
goto FailSetConfDescr;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
Notify(PSTR("\r\nXbox 360 Controller Connected\r\n"), 0x80);
|
Notify(PSTR("\r\nXbox 360 Controller Connected\r\n"), 0x80);
|
||||||
|
@ -183,34 +183,25 @@ uint8_t XBOXUSB::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
|
|
||||||
/* diagnostic messages */
|
/* diagnostic messages */
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
#ifdef DEBUG
|
NotifyFailGetDevDescr();
|
||||||
Notify(PSTR("\r\ngetDevDescr:"), 0x80);
|
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetDevTblEntry:
|
FailSetDevTblEntry:
|
||||||
#ifdef DEBUG
|
NotifyFailSetDevTblEntry();
|
||||||
Notify(PSTR("\r\nsetDevTblEn:"), 0x80);
|
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
FailSetConf:
|
|
||||||
#ifdef DEBUG
|
FailSetConfDescr:
|
||||||
Notify(PSTR("\r\nsetConf:"), 0x80);
|
NotifyFailSetConfDescr();
|
||||||
#endif
|
|
||||||
goto Fail;
|
goto Fail;
|
||||||
FailUnknownDevice:
|
FailUnknownDevice:
|
||||||
#ifdef DEBUG
|
NotifyFailUnknownDevice(VID,PID);
|
||||||
Notify(PSTR("\r\nUnknown Device Connected - VID: "), 0x80);
|
|
||||||
PrintHex<uint16_t > (VID, 0x80);
|
|
||||||
Notify(PSTR(" PID: "), 0x80);
|
|
||||||
PrintHex<uint16_t > (PID, 0x80);
|
|
||||||
#endif
|
|
||||||
rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
|
rcode = USB_DEV_CONFIG_ERROR_DEVICE_NOT_SUPPORTED;
|
||||||
goto Fail;
|
|
||||||
Fail:
|
Fail:
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);
|
Notify(PSTR("\r\nXbox 360 Init Failed, error code: "), 0x80);
|
||||||
Serial.print(rcode, HEX);
|
|
||||||
#endif
|
#endif
|
||||||
|
NotifyFail(rcode);
|
||||||
Release();
|
Release();
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
27
adk.cpp
27
adk.cpp
|
@ -176,7 +176,7 @@ uint8_t ADK::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
// Set Configuration Value
|
// Set Configuration Value
|
||||||
rcode = pUsb->setConf(bAddress, 0, bConfNum);
|
rcode = pUsb->setConf(bAddress, 0, bConfNum);
|
||||||
if (rcode) {
|
if (rcode) {
|
||||||
goto FailSetConf;
|
goto FailSetConfDescr;
|
||||||
}
|
}
|
||||||
/* print endpoint structure */
|
/* print endpoint structure */
|
||||||
// USBTRACE("\r\nEndpoint Structure:");
|
// USBTRACE("\r\nEndpoint Structure:");
|
||||||
|
@ -227,11 +227,19 @@ uint8_t ADK::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
|
|
||||||
/* diagnostic messages */
|
/* diagnostic messages */
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
USBTRACE("\r\ngetDevDescr:");
|
NotifyFailGetDevDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetDevTblEntry:
|
FailSetDevTblEntry:
|
||||||
USBTRACE("\r\nsetDevTblEn:");
|
NotifyFailSetDevTblEntry();
|
||||||
|
goto Fail;
|
||||||
|
|
||||||
|
FailGetConfDescr:
|
||||||
|
NotifyFailGetConfDescr();
|
||||||
|
goto Fail;
|
||||||
|
|
||||||
|
FailSetConfDescr:
|
||||||
|
NotifyFailSetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailGetProto:
|
FailGetProto:
|
||||||
|
@ -244,22 +252,15 @@ FailSwAcc:
|
||||||
|
|
||||||
SwAttempt:
|
SwAttempt:
|
||||||
USBTRACE("\r\nAccessory mode switch attempt");
|
USBTRACE("\r\nAccessory mode switch attempt");
|
||||||
goto Fail;
|
// goto Fail;
|
||||||
|
|
||||||
FailGetConfDescr:
|
//FailOnInit:
|
||||||
// USBTRACE("getConf:");
|
|
||||||
goto Fail;
|
|
||||||
//
|
|
||||||
FailSetConf:
|
|
||||||
// USBTRACE("setConf:");
|
|
||||||
goto Fail;
|
|
||||||
//
|
|
||||||
//FailOnInit:
|
|
||||||
// USBTRACE("OnInit:");
|
// USBTRACE("OnInit:");
|
||||||
// goto Fail;
|
// goto Fail;
|
||||||
//
|
//
|
||||||
Fail:
|
Fail:
|
||||||
//USBTRACE2("\r\nADK Init Failed, error code: ", rcode);
|
//USBTRACE2("\r\nADK Init Failed, error code: ", rcode);
|
||||||
|
//NotifyFail(rcode);
|
||||||
Release();
|
Release();
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
17
cdcacm.cpp
17
cdcacm.cpp
|
@ -165,7 +165,7 @@ uint8_t ACM::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
rcode = pUsb->setConf(bAddress, 0, bConfNum);
|
rcode = pUsb->setConf(bAddress, 0, bConfNum);
|
||||||
|
|
||||||
if (rcode)
|
if (rcode)
|
||||||
goto FailSetConf;
|
goto FailSetConfDescr;
|
||||||
|
|
||||||
rcode = pAsync->OnInit(this);
|
rcode = pAsync->OnInit(this);
|
||||||
|
|
||||||
|
@ -180,29 +180,26 @@ uint8_t ACM::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
USBTRACE("getDevDescr:");
|
NotifyFailGetDevDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetDevTblEntry:
|
FailSetDevTblEntry:
|
||||||
USBTRACE("setDevTblEn:");
|
NotifyFailSetDevTblEntry();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailGetConfDescr:
|
FailGetConfDescr:
|
||||||
USBTRACE("getConf:");
|
NotifyFailGetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetConf:
|
FailSetConfDescr:
|
||||||
USBTRACE("setConf:");
|
NotifyFailSetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailOnInit:
|
FailOnInit:
|
||||||
USBTRACE("OnInit:");
|
USBTRACE("OnInit:");
|
||||||
goto Fail;
|
|
||||||
|
|
||||||
Fail:
|
Fail:
|
||||||
PrintHex<uint8_t > (rcode, 0x80);
|
NotifyFail(rcode);
|
||||||
Notify(PSTR("\r\n"), 0x80);
|
|
||||||
// Serial.println(rcode, HEX);
|
|
||||||
Release();
|
Release();
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
13
cdcftdi.cpp
13
cdcftdi.cpp
|
@ -178,29 +178,26 @@ uint8_t FTDI::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
USBTRACE("getDevDescr:");
|
NotifyFailGetDevDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetDevTblEntry:
|
FailSetDevTblEntry:
|
||||||
USBTRACE("setDevTblEn:");
|
NotifyFailSetDevTblEntry();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailGetConfDescr:
|
FailGetConfDescr:
|
||||||
USBTRACE("getConf:");
|
NotifyFailGetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetConfDescr:
|
FailSetConfDescr:
|
||||||
USBTRACE("setConf:");
|
NotifyFailSetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailOnInit:
|
FailOnInit:
|
||||||
USBTRACE("OnInit:");
|
USBTRACE("OnInit:");
|
||||||
goto Fail;
|
|
||||||
|
|
||||||
Fail:
|
Fail:
|
||||||
PrintHex<uint8_t > (rcode, 0x80);
|
NotifyFail(rcode);
|
||||||
Notify(PSTR("\r\n"), 0x80);
|
|
||||||
//Serial.println(rcode, HEX);
|
|
||||||
Release();
|
Release();
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
|
@ -155,29 +155,26 @@ uint8_t PL2303::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
USBTRACE("getDevDescr:");
|
NotifyFailGetDevDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetDevTblEntry:
|
FailSetDevTblEntry:
|
||||||
USBTRACE("setDevTblEn:");
|
NotifyFailSetDevTblEntry();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailGetConfDescr:
|
FailGetConfDescr:
|
||||||
USBTRACE("getConf:");
|
NotifyFailGetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetConfDescr:
|
FailSetConfDescr:
|
||||||
USBTRACE("setConf:");
|
NotifyFailSetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailOnInit:
|
FailOnInit:
|
||||||
USBTRACE("OnInit:");
|
USBTRACE("OnInit:");
|
||||||
goto Fail;
|
|
||||||
|
|
||||||
Fail:
|
Fail:
|
||||||
PrintHex<uint8_t > (rcode, 0x80);
|
NotifyFail(rcode);
|
||||||
Notify(PSTR("\r\n"), 0x80);
|
|
||||||
//Serial.println(rcode, HEX);
|
|
||||||
Release();
|
Release();
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
19
hidboot.h
19
hidboot.h
|
@ -390,17 +390,22 @@ uint8_t HIDBoot<BOOT_PROTOCOL>::Init(uint8_t parent, uint8_t port, bool lowspeed
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
USBTRACE("getDevDescr:");
|
NotifyFailGetDevDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetDevTblEntry:
|
FailSetDevTblEntry:
|
||||||
USBTRACE("setDevTblEn:");
|
NotifyFailSetDevTblEntry();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailGetConfDescr:
|
FailGetConfDescr:
|
||||||
USBTRACE("getConf:");
|
NotifyFailGetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
|
FailSetConfDescr:
|
||||||
|
NotifyFailSetConfDescr();
|
||||||
|
goto Fail;
|
||||||
|
|
||||||
|
|
||||||
FailSetProtocol:
|
FailSetProtocol:
|
||||||
USBTRACE("SetProto:");
|
USBTRACE("SetProto:");
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
@ -409,14 +414,8 @@ FailSetIdle:
|
||||||
USBTRACE("SetIdle:");
|
USBTRACE("SetIdle:");
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetConfDescr:
|
|
||||||
USBTRACE("setConf:");
|
|
||||||
goto Fail;
|
|
||||||
|
|
||||||
Fail:
|
Fail:
|
||||||
PrintHex<uint8_t > (rcode, 0x80);
|
NotifyFail(rcode);
|
||||||
Notify(PSTR("\n"), 0x80);
|
|
||||||
// Serial.println(rcode, HEX);
|
|
||||||
Release();
|
Release();
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
|
@ -221,29 +221,27 @@ uint8_t HIDUniversal::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
USBTRACE("getDevDescr:");
|
NotifyFailGetDevDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetDevTblEntry:
|
FailSetDevTblEntry:
|
||||||
USBTRACE("setDevTblEn:");
|
NotifyFailSetDevTblEntry();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailGetConfDescr:
|
FailGetConfDescr:
|
||||||
USBTRACE("getConf:");
|
NotifyFailGetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetConfDescr:
|
FailSetConfDescr:
|
||||||
USBTRACE("setConf:");
|
NotifyFailSetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
|
|
||||||
FailSetIdle:
|
FailSetIdle:
|
||||||
USBTRACE("SetIdle:");
|
USBTRACE("SetIdle:");
|
||||||
goto Fail;
|
|
||||||
|
|
||||||
Fail:
|
Fail:
|
||||||
PrintHex<uint8_t > (rcode, 0x80);
|
NotifyFail(rcode);
|
||||||
Notify(PSTR("\r\n"), 0x80);
|
|
||||||
//Serial.println(rcode, HEX);
|
|
||||||
Release();
|
Release();
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#include "message.h"
|
||||||
#include "masstorage.h"
|
#include "masstorage.h"
|
||||||
const uint8_t BulkOnly::epDataInIndex = 1;
|
const uint8_t BulkOnly::epDataInIndex = 1;
|
||||||
const uint8_t BulkOnly::epDataOutIndex = 2;
|
const uint8_t BulkOnly::epDataOutIndex = 2;
|
||||||
|
@ -160,7 +161,7 @@ uint8_t BulkOnly::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
rcode = pUsb->setConf(bAddress, 0, bConfNum);
|
rcode = pUsb->setConf(bAddress, 0, bConfNum);
|
||||||
|
|
||||||
if (rcode)
|
if (rcode)
|
||||||
goto FailSetConf;
|
goto FailSetConfDescr;
|
||||||
|
|
||||||
delay(10000);
|
delay(10000);
|
||||||
|
|
||||||
|
@ -280,19 +281,19 @@ uint8_t BulkOnly::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
USBTRACE("getDevDescr:");
|
NotifyFailGetDevDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetDevTblEntry:
|
FailSetDevTblEntry:
|
||||||
USBTRACE("setDevTblEn:");
|
NotifyFailSetDevTblEntry();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailGetConfDescr:
|
FailGetConfDescr:
|
||||||
USBTRACE("getConf:");
|
NotifyFailGetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailSetConf:
|
FailSetConfDescr:
|
||||||
USBTRACE("setConf:");
|
NotifyFailSetConfDescr();
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
FailOnInit:
|
FailOnInit:
|
||||||
|
@ -325,12 +326,9 @@ FailModeSense0:
|
||||||
|
|
||||||
FailModeSense1:
|
FailModeSense1:
|
||||||
USBTRACE("ModeSense1:");
|
USBTRACE("ModeSense1:");
|
||||||
goto Fail;
|
|
||||||
|
|
||||||
Fail:
|
Fail:
|
||||||
PrintHex<uint8_t > (rcode, 0x80);
|
NotifyFail(rcode);
|
||||||
Notify(PSTR("\r\n"), 0x80);
|
|
||||||
//Serial.println(rcode, HEX);
|
|
||||||
Release();
|
Release();
|
||||||
return rcode;
|
return rcode;
|
||||||
}
|
}
|
||||||
|
|
29
message.cpp
29
message.cpp
|
@ -45,3 +45,32 @@ void NotifyStr(char const * msg, int lvl) {
|
||||||
|
|
||||||
while (c = *msg++) Notifyc(c, lvl);
|
while (c = *msg++) Notifyc(c, lvl);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef DEBUG
|
||||||
|
void NotifyFailGetDevDescr(void) {
|
||||||
|
Notify(PSTR("\r\ngetDevDescr"), 0x80);
|
||||||
|
}
|
||||||
|
|
||||||
|
void NotifyFailSetDevTblEntry(void) {
|
||||||
|
Notify(PSTR("\r\nsetDevTblEn"), 0x80);
|
||||||
|
}
|
||||||
|
void NotifyFailGetConfDescr(void) {
|
||||||
|
Notify(PSTR("\r\ngetConf"), 0x80);
|
||||||
|
}
|
||||||
|
|
||||||
|
void NotifyFailSetConf(void) {
|
||||||
|
Notify(PSTR("\r\nsetConf"), 0x80);
|
||||||
|
}
|
||||||
|
|
||||||
|
void NotifyFailUnknownDevice(uint16_t VID, uint16_t PID) {
|
||||||
|
Notify(PSTR("\r\nUnknown Device Connected - VID: "), 0x80);
|
||||||
|
PrintHex<uint16_t > (VID, 0x80);
|
||||||
|
Notify(PSTR(" PID: "), 0x80);
|
||||||
|
PrintHex<uint16_t > (PID, 0x80);
|
||||||
|
}
|
||||||
|
|
||||||
|
void NotifyFail(uint8_t rcode) {
|
||||||
|
PrintHex<uint8_t > (rcode, 0x80);
|
||||||
|
Notify(PSTR("\r\n"), 0x80);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
18
message.h
18
message.h
|
@ -22,11 +22,25 @@ e-mail : support@circuitsathome.com
|
||||||
|
|
||||||
void Notify(char const * msg, int lvl);
|
void Notify(char const * msg, int lvl);
|
||||||
void NotifyStr(char const * msg, int lvl);
|
void NotifyStr(char const * msg, int lvl);
|
||||||
|
#ifdef DEBUG
|
||||||
|
void NotifyFailGetDevDescr(void);
|
||||||
|
void NotifyFailSetDevTblEntry(void);
|
||||||
|
void NotifyFailGetConfDescr(void);
|
||||||
|
void NotifyFailSetConfDescr(void);
|
||||||
|
void NotifyFailUnknownDevice(uint16_t VID, uint16_t PID);
|
||||||
|
void NotifyFail(uint8_t rcode);
|
||||||
|
#else
|
||||||
|
#define NotifyFailGetDevDescr()
|
||||||
|
#define NotifyFailSetDevTblEntry()
|
||||||
|
#define NotifyFailGetConfDescr()
|
||||||
|
#define NotifyFailSetConfDescr()
|
||||||
|
#define NotifyFailUnknownDevice(VID, PID)
|
||||||
|
#define NotifyFail(rcode)
|
||||||
|
#endif
|
||||||
|
extern int UsbDEBUGlvl;
|
||||||
|
|
||||||
#include "printhex.h"
|
#include "printhex.h"
|
||||||
|
|
||||||
//void Notify(const char* msg);
|
|
||||||
|
|
||||||
template <class ERROR_TYPE>
|
template <class ERROR_TYPE>
|
||||||
void ErrorMessage(char const * msg, ERROR_TYPE rcode = 0) {
|
void ErrorMessage(char const * msg, ERROR_TYPE rcode = 0) {
|
||||||
Notify(msg, 0x80);
|
Notify(msg, 0x80);
|
||||||
|
|
|
@ -185,6 +185,7 @@ uint8_t USBHub::Init(uint8_t parent, uint8_t port, bool lowspeed) {
|
||||||
bInitState = 0;
|
bInitState = 0;
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
// Oleg, No debugging?? -- xxxajk
|
||||||
FailGetDevDescr:
|
FailGetDevDescr:
|
||||||
goto Fail;
|
goto Fail;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue