From 810f20230824e0a5c08801dd6cfd1c78e3e61172 Mon Sep 17 00:00:00 2001 From: "Deployment Bot (from Travis CI)" Date: Sun, 14 Oct 2018 20:27:13 +0000 Subject: [PATCH] Deploy felis/USB_Host_Shield_2.0 to github.com/felis/USB_Host_Shield_2.0.git:gh-pages --- _usb_8cpp_source.html | 12 +- class_m_a_x3421e-members.html | 23 +- class_m_a_x3421e.html | 69 ++- class_u_s_b-members.html | 45 +- class_u_s_b.html | 4 + functions_func_g.html | 3 + functions_func_r.html | 2 +- functions_func_w.html | 2 +- functions_g.html | 3 + functions_w.html | 2 +- search/all_12.js | 6 +- search/all_15.js | 2 +- search/all_17.js | 2 +- search/all_7.js | 1 + search/functions_14.js | 2 +- search/functions_6.js | 1 + search/functions_f.js | 4 +- search/variables_11.js | 2 +- usbhost_8h_source.html | 878 +++++++++++++++++----------------- 19 files changed, 564 insertions(+), 499 deletions(-) diff --git a/_usb_8cpp_source.html b/_usb_8cpp_source.html index d24d40e8..2fb2c9ae 100644 --- a/_usb_8cpp_source.html +++ b/_usb_8cpp_source.html @@ -933,7 +933,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
SETUP_PKT::wLength
uint16_t wLength
Definition: UsbCore.h:196
USB_SETTLE_DELAY
#define USB_SETTLE_DELAY
Definition: UsbCore.h:108
USB_ATTACHED_SUBSTATE_SETTLE
#define USB_ATTACHED_SUBSTATE_SETTLE
Definition: UsbCore.h:121
-
MAX3421e::getVbusState
uint8_t getVbusState(void)
Definition: usbhost.h:151
+
MAX3421e::getVbusState
uint8_t getVbusState(void)
Definition: usbhost.h:152
bmRCVTOGRD
#define bmRCVTOGRD
Definition: max3421e.h:206
USB_DEV_CONFIG_ERROR_DEVICE_INIT_INCOMPLETE
#define USB_DEV_CONFIG_ERROR_DEVICE_INIT_INCOMPLETE
Definition: UsbCore.h:89
USB_RETRY_LIMIT
#define USB_RETRY_LIMIT
Definition: UsbCore.h:107
@@ -949,7 +949,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
hrJERR
#define hrJERR
Definition: max3421e.h:227
USB::setEpInfoEntry
uint8_t setEpInfoEntry(uint8_t addr, uint8_t epcount, EpInfo *eprecord_ptr)
Definition: Usb.cpp:71
USBDeviceConfig::ConfigureDevice
virtual uint8_t ConfigureDevice(uint8_t parent, uint8_t port, bool lowspeed)
Definition: UsbCore.h:139
-
MAX3421e::Task
uint8_t Task()
Definition: usbhost.h:525
+
MAX3421e::Task
uint8_t Task()
Definition: usbhost.h:542
hrSUCCESS
#define hrSUCCESS
Definition: max3421e.h:214
USB_STATE_ERROR
#define USB_STATE_ERROR
Definition: UsbCore.h:130
SETUP_PKT::bmRequestType
uint8_t bmRequestType
Definition: UsbCore.h:177
@@ -982,11 +982,11 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
rSNDBC
#define rSNDBC
Definition: max3421e.h:48
rHRSL
#define rHRSL
Definition: max3421e.h:203
USB_ATTACHED_SUBSTATE_RESET_DEVICE
#define USB_ATTACHED_SUBSTATE_RESET_DEVICE
Definition: UsbCore.h:122
-
MAX3421e::bytesRd
uint8_t * bytesRd(uint8_t reg, uint8_t nbytes, uint8_t *data_p)
Definition: usbhost.h:321
+
MAX3421e::bytesRd
uint8_t * bytesRd(uint8_t reg, uint8_t nbytes, uint8_t *data_p)
Definition: usbhost.h:322
tokINHS
#define tokINHS
Definition: max3421e.h:198
bmLOWSPEED
#define bmLOWSPEED
Definition: max3421e.h:171
USBDeviceConfig::ResetHubPort
virtual void ResetHubPort(uint8_t port)
Definition: UsbCore.h:155
-
MAX3421e::bytesWr
uint8_t * bytesWr(uint8_t reg, uint8_t nbytes, uint8_t *data_p)
Definition: usbhost.h:219
+
MAX3421e::bytesWr
uint8_t * bytesWr(uint8_t reg, uint8_t nbytes, uint8_t *data_p)
Definition: usbhost.h:220
USB::getStrDescr
uint8_t getStrDescr(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t index, uint16_t langid, uint8_t *dataptr)
Definition: Usb.cpp:809
L
Definition: controllerEnums.h:102
USB_REQUEST_SET_ADDRESS
#define USB_REQUEST_SET_ADDRESS
Definition: usb_ch9.h:43
@@ -1010,7 +1010,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
rPERADDR
#define rPERADDR
Definition: max3421e.h:179
bmRCVDAVIRQ
#define bmRCVDAVIRQ
Definition: max3421e.h:148
USB_ATTACHED_SUBSTATE_WAIT_RESET_COMPLETE
#define USB_ATTACHED_SUBSTATE_WAIT_RESET_COMPLETE
Definition: UsbCore.h:123
-
MAX3421e::regWr
void regWr(uint8_t reg, uint8_t data)
Definition: usbhost.h:176
+
MAX3421e::regWr
void regWr(uint8_t reg, uint8_t data)
Definition: usbhost.h:177
bmRCVTOG0
#define bmRCVTOG0
Definition: max3421e.h:187
UsbDevice::epcount
uint8_t epcount
Definition: address.h:85
USB::inTransfer
uint8_t inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t *data, uint8_t bInterval=0)
Definition: Usb.cpp:213
@@ -1019,7 +1019,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
USB::dispatchPkt
uint8_t dispatchPkt(uint8_t token, uint8_t ep, uint16_t nak_limit)
Definition: Usb.cpp:384
USBDeviceConfig::Init
virtual uint8_t Init(uint8_t parent, uint8_t port, bool lowspeed)
Definition: UsbCore.h:135
bmSNDTOG0
#define bmSNDTOG0
Definition: max3421e.h:189
-
MAX3421e::regRd
uint8_t regRd(uint8_t reg)
Definition: usbhost.h:282
+
MAX3421e::regRd
uint8_t regRd(uint8_t reg)
Definition: usbhost.h:283
EpInfo::maxPktSize
uint8_t maxPktSize
Definition: address.h:41
USB::GetAddressPool
AddressPool & GetAddressPool()
Definition: UsbCore.h:224
USB_ERROR_INVALID_ARGUMENT
#define USB_ERROR_INVALID_ARGUMENT
Definition: UsbCore.h:95
diff --git a/class_m_a_x3421e-members.html b/class_m_a_x3421e-members.html index fce6fdc5..c4d5f703 100644 --- a/class_m_a_x3421e-members.html +++ b/class_m_a_x3421e-members.html @@ -95,17 +95,18 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); bytesWr(uint8_t reg, uint8_t nbytes, uint8_t *data_p)MAX3421e< SPI_SS, INTR > getVbusState(void)MAX3421e< SPI_SS, INTR >inline gpioRd()MAX3421e< SPI_SS, INTR > - gpioWr(uint8_t data)MAX3421e< SPI_SS, INTR > - GpxHandler()MAX3421e< SPI_SS, INTR > - Init()MAX3421e< SPI_SS, INTR > - Init(int mseconds)MAX3421e< SPI_SS, INTR > - IntHandler()MAX3421e< SPI_SS, INTR > - MAX3421e()MAX3421e< SPI_SS, INTR > - regRd(uint8_t reg)MAX3421e< SPI_SS, INTR > - regWr(uint8_t reg, uint8_t data)MAX3421e< SPI_SS, INTR > - reset()MAX3421e< SPI_SS, INTR > - Task()MAX3421e< SPI_SS, INTR > - vbusPower(VBUS_t state)MAX3421e< SPI_SS, INTR >inline + gpioRdOutput()MAX3421e< SPI_SS, INTR > + gpioWr(uint8_t data)MAX3421e< SPI_SS, INTR > + GpxHandler()MAX3421e< SPI_SS, INTR > + Init()MAX3421e< SPI_SS, INTR > + Init(int mseconds)MAX3421e< SPI_SS, INTR > + IntHandler()MAX3421e< SPI_SS, INTR > + MAX3421e()MAX3421e< SPI_SS, INTR > + regRd(uint8_t reg)MAX3421e< SPI_SS, INTR > + regWr(uint8_t reg, uint8_t data)MAX3421e< SPI_SS, INTR > + reset()MAX3421e< SPI_SS, INTR > + Task()MAX3421e< SPI_SS, INTR > + vbusPower(VBUS_t state)MAX3421e< SPI_SS, INTR >inline
diff --git a/class_m_a_x3421e.html b/class_m_a_x3421e.html index 09b3fbb9..0522dd48 100644 --- a/class_m_a_x3421e.html +++ b/class_m_a_x3421e.html @@ -115,7 +115,11 @@ Public Member Functions uint8_t * bytesRd (uint8_t reg, uint8_t nbytes, uint8_t *data_p)   uint8_t gpioRd () + Reads the current GPI input values. More...
  +uint8_t gpioRdOutput () + Reads the current GPI output values. More...
+  uint16_t reset ()   int8_t Init () @@ -157,7 +161,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 165 of file usbhost.h.

+

Definition at line 166 of file usbhost.h.

@@ -188,7 +192,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 176 of file usbhost.h.

+

Definition at line 177 of file usbhost.h.

@@ -224,7 +228,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 219 of file usbhost.h.

+

Definition at line 220 of file usbhost.h.

@@ -244,7 +248,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 273 of file usbhost.h.

+

Definition at line 274 of file usbhost.h.

@@ -264,7 +268,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 282 of file usbhost.h.

+

Definition at line 283 of file usbhost.h.

@@ -300,7 +304,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 321 of file usbhost.h.

+

Definition at line 322 of file usbhost.h.

@@ -319,7 +323,42 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 384 of file usbhost.h.

+

Reads the current GPI input values.

+
Return values
+ + +
uint8_tBitwise value of all 8 GPI inputs
+
+
+ +

Definition at line 388 of file usbhost.h.

+ +
+ + +
+
+
+template<typename SPI_SS , typename INTR >
+ + + + + + + +
uint8_t MAX3421e< SPI_SS, INTR >::gpioRdOutput ()
+
+ +

Reads the current GPI output values.

+
Return values
+ + +
uint8_tBitwise value of all 8 GPI outputs
+
+
+ +

Definition at line 401 of file usbhost.h.

@@ -338,7 +377,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 395 of file usbhost.h.

+

Definition at line 412 of file usbhost.h.

@@ -357,7 +396,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 409 of file usbhost.h.

+

Definition at line 426 of file usbhost.h.

@@ -377,7 +416,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 446 of file usbhost.h.

+

Definition at line 463 of file usbhost.h.

@@ -405,7 +444,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 147 of file usbhost.h.

+

Definition at line 148 of file usbhost.h.

@@ -433,7 +472,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 151 of file usbhost.h.

+

Definition at line 152 of file usbhost.h.

@@ -452,7 +491,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 490 of file usbhost.h.

+

Definition at line 507 of file usbhost.h.

@@ -488,7 +527,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 544 of file usbhost.h.

+

Definition at line 561 of file usbhost.h.

@@ -508,7 +547,7 @@ template<typename SPI_SS , typename INTR >
-

Definition at line 525 of file usbhost.h.

+

Definition at line 542 of file usbhost.h.

diff --git a/class_u_s_b-members.html b/class_u_s_b-members.html index adc470b6..65869663 100644 --- a/class_u_s_b-members.html +++ b/class_u_s_b-members.html @@ -109,28 +109,29 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); getUsbTaskState(void)USB getVbusState(void)MAX3421e< SPI_SS, INTR >inline gpioRd()MAX3421e< SPI_SS, INTR > - gpioWr(uint8_t data)MAX3421e< SPI_SS, INTR > - GpxHandler()MAX3421e< SPI_SS, INTR > - Init()MAX3421e< SPI_SS, INTR > - Init(int mseconds)MAX3421e< SPI_SS, INTR > - IntHandler()MAX3421e< SPI_SS, INTR > - inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t *data, uint8_t bInterval=0)USB - MAX3421e()MAX3421e< SPI_SS, INTR > - outTransfer(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t *data)USB - RegisterDeviceClass(USBDeviceConfig *pdev)USBinline - regRd(uint8_t reg)MAX3421e< SPI_SS, INTR > - regWr(uint8_t reg, uint8_t data)MAX3421e< SPI_SS, INTR > - ReleaseDevice(uint8_t addr)USB - reset()MAX3421e< SPI_SS, INTR > - ResetHubPreMask()USBinline - setAddr(uint8_t oldaddr, uint8_t ep, uint8_t newaddr)USB - setConf(uint8_t addr, uint8_t ep, uint8_t conf_value)USB - setEpInfoEntry(uint8_t addr, uint8_t epcount, EpInfo *eprecord_ptr)USB - SetHubPreMask()USBinline - setUsbTaskState(uint8_t state)USB - Task(void)USB - USB(void)USB - vbusPower(VBUS_t state)MAX3421e< SPI_SS, INTR >inline + gpioRdOutput()MAX3421e< SPI_SS, INTR > + gpioWr(uint8_t data)MAX3421e< SPI_SS, INTR > + GpxHandler()MAX3421e< SPI_SS, INTR > + Init()MAX3421e< SPI_SS, INTR > + Init(int mseconds)MAX3421e< SPI_SS, INTR > + IntHandler()MAX3421e< SPI_SS, INTR > + inTransfer(uint8_t addr, uint8_t ep, uint16_t *nbytesptr, uint8_t *data, uint8_t bInterval=0)USB + MAX3421e()MAX3421e< SPI_SS, INTR > + outTransfer(uint8_t addr, uint8_t ep, uint16_t nbytes, uint8_t *data)USB + RegisterDeviceClass(USBDeviceConfig *pdev)USBinline + regRd(uint8_t reg)MAX3421e< SPI_SS, INTR > + regWr(uint8_t reg, uint8_t data)MAX3421e< SPI_SS, INTR > + ReleaseDevice(uint8_t addr)USB + reset()MAX3421e< SPI_SS, INTR > + ResetHubPreMask()USBinline + setAddr(uint8_t oldaddr, uint8_t ep, uint8_t newaddr)USB + setConf(uint8_t addr, uint8_t ep, uint8_t conf_value)USB + setEpInfoEntry(uint8_t addr, uint8_t epcount, EpInfo *eprecord_ptr)USB + SetHubPreMask()USBinline + setUsbTaskState(uint8_t state)USB + Task(void)USB + USB(void)USB + vbusPower(VBUS_t state)MAX3421e< SPI_SS, INTR >inline
diff --git a/class_u_s_b.html b/class_u_s_b.html index 6a0742e0..5f99950f 100644 --- a/class_u_s_b.html +++ b/class_u_s_b.html @@ -176,7 +176,11 @@ Public Member Functions uint8_t * bytesRd (uint8_t reg, uint8_t nbytes, uint8_t *data_p)   uint8_t gpioRd () + Reads the current GPI input values. More...
  +uint8_t gpioRdOutput () + Reads the current GPI output values. More...
+  uint16_t reset ()   int8_t Init () diff --git a/functions_func_g.html b/functions_func_g.html index 9f47d258..d095339b 100644 --- a/functions_func_g.html +++ b/functions_func_g.html @@ -401,6 +401,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
  • gpioRd() : MAX3421e< SPI_SS, INTR >
    • +
  • gpioRdOutput() +: MAX3421e< SPI_SS, INTR > +
  • gpioWr() : MAX3421e< SPI_SS, INTR >
    • diff --git a/functions_func_r.html b/functions_func_r.html index 17ca4793..2f9e4384 100644 --- a/functions_func_r.html +++ b/functions_func_r.html @@ -129,7 +129,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search'); , USBH_MIDI
  • Read() -: BulkOnly +: BulkOnly
  • read() : SPP diff --git a/functions_func_w.html b/functions_func_w.html index d122c9e9..d625e38b 100644 --- a/functions_func_w.html +++ b/functions_func_w.html @@ -133,7 +133,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
  • write() : Max_LCD -, SPP +, SPP
  • write_register() : XR21B1411 diff --git a/functions_g.html b/functions_g.html index dfc0c0de..2fa6925b 100644 --- a/functions_g.html +++ b/functions_g.html @@ -431,6 +431,9 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
  • gpioRd() : MAX3421e< SPI_SS, INTR >
    • +
  • gpioRdOutput() +: MAX3421e< SPI_SS, INTR > +
  • gpioWr() : MAX3421e< SPI_SS, INTR >
    • diff --git a/functions_w.html b/functions_w.html index 082fa81b..ba0a2d3c 100644 --- a/functions_w.html +++ b/functions_w.html @@ -173,7 +173,7 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
  • write() : Max_LCD -, SPP +, SPP
  • write_register() : XR21B1411 diff --git a/search/all_12.js b/search/all_12.js index 42508296..ee70820a 100644 --- a/search/all_12.js +++ b/search/all_12.js @@ -1,12 +1,12 @@ var searchData= [ ['r',['r',['../struct_p_s4_output.html#a76a85e749899e2e6cb135a6ec6acabb3',1,'PS4Output::r()'],['../controller_enums_8h.html#a94f7389d205c78830a5441370d7870fda1784b1a3d7cbd43c45ff82c72d05e4ae',1,'R(): controllerEnums.h']]], - ['r1',['r1',['../union_p_s4_buttons.html#aba0cb76ee82bd0ebe9872aa7bcbffac6',1,'PS4Buttons::r1()'],['../struct_inquiry_response.html#a72abbdbd399647227ea05cb1cec32b2d',1,'InquiryResponse::R1()'],['../controller_enums_8h.html#a94f7389d205c78830a5441370d7870fdaf8d87ff07efe24755164f550526f4dac',1,'R1(): controllerEnums.h']]], + ['r1',['R1',['../struct_inquiry_response.html#a72abbdbd399647227ea05cb1cec32b2d',1,'InquiryResponse::R1()'],['../union_p_s4_buttons.html#aba0cb76ee82bd0ebe9872aa7bcbffac6',1,'PS4Buttons::r1()'],['../controller_enums_8h.html#a94f7389d205c78830a5441370d7870fdaf8d87ff07efe24755164f550526f4dac',1,'R1(): controllerEnums.h']]], ['r2',['r2',['../union_p_s4_buttons.html#a416642ff357b1313825fe94e0491b60e',1,'PS4Buttons::r2()'],['../struct_inquiry_response.html#aa635575deb7f984d27142ee2071af5b3',1,'InquiryResponse::R2()'],['../controller_enums_8h.html#a94f7389d205c78830a5441370d7870fda629d7b403cea5f826352f3aefb9a6d6a',1,'R2(): controllerEnums.h']]], ['r3',['r3',['../union_p_s4_buttons.html#a09805f3bcc362c410d7897792599d61d',1,'PS4Buttons::r3()'],['../controller_enums_8h.html#a94f7389d205c78830a5441370d7870fdaad0b4725f69a34fed2c914517bcd9baa',1,'R3(): controllerEnums.h']]], ['rcpuctl',['rCPUCTL',['../max3421e_8h.html#a53da9de92c56d0cdac2a09ca10e94455',1,'max3421e.h']]], ['rcvdata',['RcvData',['../class_a_d_k.html#a66b9943dfa89f783a8cdeb655e6fe9b1',1,'ADK::RcvData()'],['../class_a_c_m.html#a7f455b7a649522c29f2e63d668b0ccca',1,'ACM::RcvData()'],['../class_f_t_d_i.html#aa367ae72fbfda931cae8ec751e9dc434',1,'FTDI::RcvData()'],['../class_u_s_b_h___m_i_d_i.html#a1f522c0aca86795e1bfb7575e1759338',1,'USBH_MIDI::RcvData(uint16_t *bytes_rcvd, uint8_t *dataptr)'],['../class_u_s_b_h___m_i_d_i.html#afa51b7a718728cdc4f25f9abec25be52',1,'USBH_MIDI::RcvData(uint8_t *outBuf)']]], - ['read',['read',['../class_s_p_p.html#aae8dc037e845480f582afea57b858b95',1,'SPP::read()'],['../class_bulk_only.html#a470a8f0ffd6694d9dfc834da5efa627a',1,'BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, uint8_t *buf)'],['../class_bulk_only.html#a52f54376dcd7f5baf17718105e8f085d',1,'BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, USBReadParser *prs)']]], + ['read',['Read',['../class_bulk_only.html#a470a8f0ffd6694d9dfc834da5efa627a',1,'BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, uint8_t *buf)'],['../class_bulk_only.html#a52f54376dcd7f5baf17718105e8f085d',1,'BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, USBReadParser *prs)'],['../class_s_p_p.html#aae8dc037e845480f582afea57b858b95',1,'SPP::read()']]], ['read_5fregister',['read_register',['../class_x_r21_b1411.html#adfcc22eba1ec95fe62af960682b8ecbc',1,'XR21B1411']]], ['readme_2emd',['README.md',['../_r_e_a_d_m_e_8md.html',1,'']]], ['readpollinterval',['readPollInterval',['../class_b_t_d.html#a2a9ecb996243e070e70972370e45e4fd',1,'BTD::readPollInterval()'],['../class_x_b_o_x_o_n_e.html#ae606811be2389140b19421aad2cb040f',1,'XBOXONE::readPollInterval()']]], @@ -36,7 +36,7 @@ var searchData= ['res',['Res',['../struct_inquiry_response.html#a9f642c5fccc1c87cf6b444a138b6aa4b',1,'InquiryResponse']]], ['reserved',['Reserved',['../struct_inquiry_response.html#abb4a48d4fc326ad932fb41c82fe289f3',1,'InquiryResponse::Reserved()'],['../struct_hub_descriptor.html#a0c3292fe67fdbdab6ceac8b198ef44bf',1,'HubDescriptor::Reserved()']]], ['reserved4',['Reserved4',['../struct_inquiry_response.html#ae5c315ca0c47104b17d5bde7c4d485a6',1,'InquiryResponse']]], - ['reset',['Reset',['../class_bluetooth_service.html#aa7c81841d4e898e9dc91533da6d7ab64',1,'BluetoothService::Reset()'],['../class_b_t_h_i_d.html#af4c58b81414a037910dd6fb78f97b96e',1,'BTHID::Reset()'],['../class_p_s3_b_t.html#a576d72cdf12af58ae59c8f2a02f99c0f',1,'PS3BT::Reset()'],['../class_p_s4_parser.html#a24640b2362b0f6f51785fbd3dd4f13f9',1,'PS4Parser::Reset()'],['../class_p_s_buzz.html#a5bb4f2ee80ca9d10d87031b57bd09268',1,'PSBuzz::Reset()'],['../class_s_p_p.html#ae2c661bd46cd2d74bd29c4c771cd2ef0',1,'SPP::Reset()'],['../class_w_i_i.html#a769ee2f9a0088da097438bc3cc677f7c',1,'WII::Reset()'],['../class_m_a_x3421e.html#a15b78912dd4b1c96b6ad141117dcb7ee',1,'MAX3421e::reset()']]], + ['reset',['reset',['../class_m_a_x3421e.html#a15b78912dd4b1c96b6ad141117dcb7ee',1,'MAX3421e::reset()'],['../class_bluetooth_service.html#aa7c81841d4e898e9dc91533da6d7ab64',1,'BluetoothService::Reset()'],['../class_b_t_h_i_d.html#af4c58b81414a037910dd6fb78f97b96e',1,'BTHID::Reset()'],['../class_p_s3_b_t.html#a576d72cdf12af58ae59c8f2a02f99c0f',1,'PS3BT::Reset()'],['../class_p_s4_parser.html#a24640b2362b0f6f51785fbd3dd4f13f9',1,'PS4Parser::Reset()'],['../class_p_s_buzz.html#a5bb4f2ee80ca9d10d87031b57bd09268',1,'PSBuzz::Reset()'],['../class_s_p_p.html#ae2c661bd46cd2d74bd29c4c771cd2ef0',1,'SPP::Reset()'],['../class_w_i_i.html#a769ee2f9a0088da097438bc3cc677f7c',1,'WII::Reset()']]], ['reset_5fdownstream_5fdata_5fpipe',['RESET_DOWNSTREAM_DATA_PIPE',['../cdcprolific_8h.html#a810fdf3da740b4c9e309cefb29f4eb3a',1,'cdcprolific.h']]], ['reset_5fupstream_5fdata_5fpipe',['RESET_UPSTREAM_DATA_PIPE',['../cdcprolific_8h.html#aea64b328d877a5eead187856dd28f847',1,'cdcprolific.h']]], ['resetbthid',['ResetBTHID',['../class_b_t_h_i_d.html#acc22bf5baaa096fe09b72c812c1134f0',1,'BTHID::ResetBTHID()'],['../class_p_s4_b_t.html#a4b1c9e15ccdc7ab24f7fb42fc9b5d827',1,'PS4BT::ResetBTHID()']]], diff --git a/search/all_15.js b/search/all_15.js index fff94d8d..de71051b 100644 --- a/search/all_15.js +++ b/search/all_15.js @@ -17,7 +17,7 @@ var searchData= ['usagepagefunctions',['usagePageFunctions',['../class_report_desc_parser_base.html#af91679187bb24d185979b3ec045c215b',1,'ReportDescParserBase']]], ['usagepagetitles0',['usagePageTitles0',['../class_report_desc_parser_base.html#a7f723a8b7bddd061aee7f0af06aeae08',1,'ReportDescParserBase']]], ['usagepagetitles1',['usagePageTitles1',['../class_report_desc_parser_base.html#ae6dadd42986663f261aac948d24911a6',1,'ReportDescParserBase']]], - ['usb',['USB',['../class_u_s_b.html',1,'USB'],['../struct_p_s4_status.html#a3e7fc4ece250c83c7753e3f557f6d710',1,'PS4Status::usb()'],['../class_u_s_b.html#a8ff8cd03496bdcb0ca26f18878ad299d',1,'USB::USB()']]], + ['usb',['USB',['../class_u_s_b.html',1,'USB'],['../class_u_s_b.html#a8ff8cd03496bdcb0ca26f18878ad299d',1,'USB::USB()'],['../struct_p_s4_status.html#a3e7fc4ece250c83c7753e3f557f6d710',1,'PS4Status::usb()']]], ['usb_2ecpp',['Usb.cpp',['../_usb_8cpp.html',1,'']]], ['usb_2eh',['Usb.h',['../_usb_8h.html',1,'']]], ['usb_5fattached_5fsubstate_5fget_5fdevice_5fdescriptor_5fsize',['USB_ATTACHED_SUBSTATE_GET_DEVICE_DESCRIPTOR_SIZE',['../_usb_core_8h.html#a23ebcbb956f600e06435b28ae0c855d4',1,'UsbCore.h']]], diff --git a/search/all_17.js b/search/all_17.js index 7254f679..fa2888c1 100644 --- a/search/all_17.js +++ b/search/all_17.js @@ -32,7 +32,7 @@ var searchData= ['windex',['wIndex',['../struct_c_l_a_s_s___n_o_t_i_f_i_c_a_t_i_o_n.html#aae0d299b4d6e5ee396ace3f1b4cc7352',1,'CLASS_NOTIFICATION::wIndex()'],['../struct_s_e_t_u_p___p_k_t.html#a299d9f88d294369ea88b48b5026f4c7e',1,'SETUP_PKT::wIndex()']]], ['wlength',['wLength',['../struct_c_l_a_s_s___n_o_t_i_f_i_c_a_t_i_o_n.html#a7933669f6b6379d7ee0605f50422cbe2',1,'CLASS_NOTIFICATION::wLength()'],['../struct_s_e_t_u_p___p_k_t.html#a1ec9b19c0ed1e66e399ad9cf3c4a6537',1,'SETUP_PKT::wLength()']]], ['wmaxpacketsize',['wMaxPacketSize',['../struct_u_s_b___e_n_d_p_o_i_n_t___d_e_s_c_r_i_p_t_o_r.html#af34105fa6bd0029d9c6b73d85f7853c6',1,'USB_ENDPOINT_DESCRIPTOR']]], - ['write',['write',['../class_max___l_c_d.html#a43e5618993b77b81773af3a88cdf4c96',1,'Max_LCD::write()'],['../class_s_p_p.html#a6fb231316ca9b1028322d2d2188b27b0',1,'SPP::write(uint8_t data)'],['../class_s_p_p.html#a8bb421b7d948c3ffefc23aef95813192',1,'SPP::write(const uint8_t *data, size_t size)'],['../class_bulk_only.html#a45d327ddf87e01607c3a5b1849936053',1,'BulkOnly::Write()']]], + ['write',['Write',['../class_bulk_only.html#a45d327ddf87e01607c3a5b1849936053',1,'BulkOnly::Write()'],['../class_max___l_c_d.html#a43e5618993b77b81773af3a88cdf4c96',1,'Max_LCD::write()'],['../class_s_p_p.html#a6fb231316ca9b1028322d2d2188b27b0',1,'SPP::write(uint8_t data)'],['../class_s_p_p.html#a8bb421b7d948c3ffefc23aef95813192',1,'SPP::write(const uint8_t *data, size_t size)']]], ['write_5fregister',['write_register',['../class_x_r21_b1411.html#acdc8c732d517b2748d3d6643ae5642ee',1,'XR21B1411']]], ['writeok',['WriteOk',['../class_bulk_only.html#af763ffffdd131949322d583fb4cd2737',1,'BulkOnly']]], ['writeprotected',['WriteProtected',['../class_bulk_only.html#a85d034c7da25090c36c9bdeb85338009',1,'BulkOnly']]], diff --git a/search/all_7.js b/search/all_7.js index 6884cea8..c5dded95 100644 --- a/search/all_7.js +++ b/search/all_7.js @@ -90,6 +90,7 @@ var searchData= ['gety',['getY',['../class_p_s4_parser.html#a9972eeb87f2ed4a96dcdccf2dabbbc5a',1,'PS4Parser']]], ['getyaw',['getYaw',['../class_w_i_i.html#ad8c2d7acc64b32272de0ec9c1675e1fa',1,'WII']]], ['gpiord',['gpioRd',['../class_m_a_x3421e.html#aac5d00653f8fb1cb61d9d7509acb8e00',1,'MAX3421e']]], + ['gpiordoutput',['gpioRdOutput',['../class_m_a_x3421e.html#aeef352a1518ea20bf7d1925c671c2c46',1,'MAX3421e']]], ['gpiowr',['gpioWr',['../class_m_a_x3421e.html#afccded4a32cdc2a811f7437d3b489336',1,'MAX3421e']]], ['gpx_5fbusact',['GPX_BUSACT',['../max3421e_8h.html#aaab0be06b205a6e6f308ca709c762d32',1,'max3421e.h']]], ['gpx_5foperate',['GPX_OPERATE',['../max3421e_8h.html#a0f6b05e67d0f8bbd1a392e877a16edff',1,'max3421e.h']]], diff --git a/search/functions_14.js b/search/functions_14.js index 88b446c5..54c8ec9b 100644 --- a/search/functions_14.js +++ b/search/functions_14.js @@ -2,7 +2,7 @@ var searchData= [ ['wide',['wide',['../class_a_c_m.html#ab171c6eefd542e7d4a7ce555d2f2f389',1,'ACM']]], ['wii',['WII',['../class_w_i_i.html#a6597cb0e240a8ccb4ebdb236daef712e',1,'WII']]], - ['write',['write',['../class_max___l_c_d.html#a43e5618993b77b81773af3a88cdf4c96',1,'Max_LCD::write()'],['../class_s_p_p.html#a6fb231316ca9b1028322d2d2188b27b0',1,'SPP::write(uint8_t data)'],['../class_s_p_p.html#a8bb421b7d948c3ffefc23aef95813192',1,'SPP::write(const uint8_t *data, size_t size)'],['../class_bulk_only.html#a45d327ddf87e01607c3a5b1849936053',1,'BulkOnly::Write()']]], + ['write',['Write',['../class_bulk_only.html#a45d327ddf87e01607c3a5b1849936053',1,'BulkOnly::Write()'],['../class_max___l_c_d.html#a43e5618993b77b81773af3a88cdf4c96',1,'Max_LCD::write()'],['../class_s_p_p.html#a6fb231316ca9b1028322d2d2188b27b0',1,'SPP::write(uint8_t data)'],['../class_s_p_p.html#a8bb421b7d948c3ffefc23aef95813192',1,'SPP::write(const uint8_t *data, size_t size)']]], ['write_5fregister',['write_register',['../class_x_r21_b1411.html#acdc8c732d517b2748d3d6643ae5642ee',1,'XR21B1411']]], ['writeprotected',['WriteProtected',['../class_bulk_only.html#a85d034c7da25090c36c9bdeb85338009',1,'BulkOnly']]] ]; diff --git a/search/functions_6.js b/search/functions_6.js index 165d8aa7..e32a97d9 100644 --- a/search/functions_6.js +++ b/search/functions_6.js @@ -76,6 +76,7 @@ var searchData= ['gety',['getY',['../class_p_s4_parser.html#a9972eeb87f2ed4a96dcdccf2dabbbc5a',1,'PS4Parser']]], ['getyaw',['getYaw',['../class_w_i_i.html#ad8c2d7acc64b32272de0ec9c1675e1fa',1,'WII']]], ['gpiord',['gpioRd',['../class_m_a_x3421e.html#aac5d00653f8fb1cb61d9d7509acb8e00',1,'MAX3421e']]], + ['gpiordoutput',['gpioRdOutput',['../class_m_a_x3421e.html#aeef352a1518ea20bf7d1925c671c2c46',1,'MAX3421e']]], ['gpiowr',['gpioWr',['../class_m_a_x3421e.html#afccded4a32cdc2a811f7437d3b489336',1,'MAX3421e']]], ['gpxhandler',['GpxHandler',['../class_m_a_x3421e.html#a102e1af23477b564529392ff0962f22d',1,'MAX3421e']]] ]; diff --git a/search/functions_f.js b/search/functions_f.js index 4b55dfb0..423a73fb 100644 --- a/search/functions_f.js +++ b/search/functions_f.js @@ -1,7 +1,7 @@ var searchData= [ ['rcvdata',['RcvData',['../class_a_d_k.html#a66b9943dfa89f783a8cdeb655e6fe9b1',1,'ADK::RcvData()'],['../class_a_c_m.html#a7f455b7a649522c29f2e63d668b0ccca',1,'ACM::RcvData()'],['../class_f_t_d_i.html#aa367ae72fbfda931cae8ec751e9dc434',1,'FTDI::RcvData()'],['../class_u_s_b_h___m_i_d_i.html#a1f522c0aca86795e1bfb7575e1759338',1,'USBH_MIDI::RcvData(uint16_t *bytes_rcvd, uint8_t *dataptr)'],['../class_u_s_b_h___m_i_d_i.html#afa51b7a718728cdc4f25f9abec25be52',1,'USBH_MIDI::RcvData(uint8_t *outBuf)']]], - ['read',['read',['../class_s_p_p.html#aae8dc037e845480f582afea57b858b95',1,'SPP::read()'],['../class_bulk_only.html#a470a8f0ffd6694d9dfc834da5efa627a',1,'BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, uint8_t *buf)'],['../class_bulk_only.html#a52f54376dcd7f5baf17718105e8f085d',1,'BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, USBReadParser *prs)']]], + ['read',['Read',['../class_bulk_only.html#a470a8f0ffd6694d9dfc834da5efa627a',1,'BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, uint8_t *buf)'],['../class_bulk_only.html#a52f54376dcd7f5baf17718105e8f085d',1,'BulkOnly::Read(uint8_t lun, uint32_t addr, uint16_t bsize, uint8_t blocks, USBReadParser *prs)'],['../class_s_p_p.html#aae8dc037e845480f582afea57b858b95',1,'SPP::read()']]], ['read_5fregister',['read_register',['../class_x_r21_b1411.html#adfcc22eba1ec95fe62af960682b8ecbc',1,'XR21B1411']]], ['readpollinterval',['readPollInterval',['../class_b_t_d.html#a2a9ecb996243e070e70972370e45e4fd',1,'BTD::readPollInterval()'],['../class_x_b_o_x_o_n_e.html#ae606811be2389140b19421aad2cb040f',1,'XBOXONE::readPollInterval()']]], ['recvdata',['RecvData',['../class_u_s_b_h___m_i_d_i.html#adb10f3867c2171603faa37af3e9fd210',1,'USBH_MIDI::RecvData(uint16_t *bytes_rcvd, uint8_t *dataptr)'],['../class_u_s_b_h___m_i_d_i.html#aea89f48a206501ecf09b7d962e1fa688',1,'USBH_MIDI::RecvData(uint8_t *outBuf, bool isRaw=false)']]], @@ -14,7 +14,7 @@ var searchData= ['releasedevice',['ReleaseDevice',['../class_u_s_b.html#ac681c6c98e1641f705bc14d670a2663a',1,'USB']]], ['reportdescparser2',['ReportDescParser2',['../class_report_desc_parser2.html#a6ee7a47ffbc5c2905506c10039fcfaff',1,'ReportDescParser2']]], ['reportdescparserbase',['ReportDescParserBase',['../class_report_desc_parser_base.html#a607a81ff9d8f282298533a1dbf10f8e1',1,'ReportDescParserBase']]], - ['reset',['Reset',['../class_bluetooth_service.html#aa7c81841d4e898e9dc91533da6d7ab64',1,'BluetoothService::Reset()'],['../class_b_t_h_i_d.html#af4c58b81414a037910dd6fb78f97b96e',1,'BTHID::Reset()'],['../class_p_s3_b_t.html#a576d72cdf12af58ae59c8f2a02f99c0f',1,'PS3BT::Reset()'],['../class_p_s4_parser.html#a24640b2362b0f6f51785fbd3dd4f13f9',1,'PS4Parser::Reset()'],['../class_p_s_buzz.html#a5bb4f2ee80ca9d10d87031b57bd09268',1,'PSBuzz::Reset()'],['../class_s_p_p.html#ae2c661bd46cd2d74bd29c4c771cd2ef0',1,'SPP::Reset()'],['../class_w_i_i.html#a769ee2f9a0088da097438bc3cc677f7c',1,'WII::Reset()'],['../class_m_a_x3421e.html#a15b78912dd4b1c96b6ad141117dcb7ee',1,'MAX3421e::reset()']]], + ['reset',['reset',['../class_m_a_x3421e.html#a15b78912dd4b1c96b6ad141117dcb7ee',1,'MAX3421e::reset()'],['../class_bluetooth_service.html#aa7c81841d4e898e9dc91533da6d7ab64',1,'BluetoothService::Reset()'],['../class_b_t_h_i_d.html#af4c58b81414a037910dd6fb78f97b96e',1,'BTHID::Reset()'],['../class_p_s3_b_t.html#a576d72cdf12af58ae59c8f2a02f99c0f',1,'PS3BT::Reset()'],['../class_p_s4_parser.html#a24640b2362b0f6f51785fbd3dd4f13f9',1,'PS4Parser::Reset()'],['../class_p_s_buzz.html#a5bb4f2ee80ca9d10d87031b57bd09268',1,'PSBuzz::Reset()'],['../class_s_p_p.html#ae2c661bd46cd2d74bd29c4c771cd2ef0',1,'SPP::Reset()'],['../class_w_i_i.html#a769ee2f9a0088da097438bc3cc677f7c',1,'WII::Reset()']]], ['resetbthid',['ResetBTHID',['../class_b_t_h_i_d.html#acc22bf5baaa096fe09b72c812c1134f0',1,'BTHID::ResetBTHID()'],['../class_p_s4_b_t.html#a4b1c9e15ccdc7ab24f7fb42fc9b5d827',1,'PS4BT::ResetBTHID()']]], ['resethubport',['ResetHubPort',['../class_u_s_b_device_config.html#a12bb63558ded5bb6661bb173b07ff391',1,'USBDeviceConfig::ResetHubPort()'],['../class_u_s_b_hub.html#ae7e4c1e231ce7cb56bae1688c0e95e58',1,'USBHub::ResetHubPort()']]], ['resethubpremask',['ResetHubPreMask',['../class_u_s_b.html#a5b4de045ea7fefe0fab967ddf44c39b1',1,'USB']]], diff --git a/search/variables_11.js b/search/variables_11.js index 82fcf137..a0070f8c 100644 --- a/search/variables_11.js +++ b/search/variables_11.js @@ -1,7 +1,7 @@ var searchData= [ ['r',['r',['../struct_p_s4_output.html#a76a85e749899e2e6cb135a6ec6acabb3',1,'PS4Output']]], - ['r1',['r1',['../union_p_s4_buttons.html#aba0cb76ee82bd0ebe9872aa7bcbffac6',1,'PS4Buttons::r1()'],['../struct_inquiry_response.html#a72abbdbd399647227ea05cb1cec32b2d',1,'InquiryResponse::R1()']]], + ['r1',['R1',['../struct_inquiry_response.html#a72abbdbd399647227ea05cb1cec32b2d',1,'InquiryResponse::R1()'],['../union_p_s4_buttons.html#aba0cb76ee82bd0ebe9872aa7bcbffac6',1,'PS4Buttons::r1()']]], ['r2',['r2',['../union_p_s4_buttons.html#a416642ff357b1313825fe94e0491b60e',1,'PS4Buttons::r2()'],['../struct_inquiry_response.html#aa635575deb7f984d27142ee2071af5b3',1,'InquiryResponse::R2()']]], ['r3',['r3',['../union_p_s4_buttons.html#a09805f3bcc362c410d7897792599d61d',1,'PS4Buttons']]], ['readptr',['readPtr',['../class_u_s_b_h___m_i_d_i.html#aad25eeebfe8741afa7a242ec398c846e',1,'USBH_MIDI']]], diff --git a/usbhost_8h_source.html b/usbhost_8h_source.html index 3720553a..cca923f8 100644 --- a/usbhost_8h_source.html +++ b/usbhost_8h_source.html @@ -227,433 +227,444 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    140  uint8_t regRd(uint8_t reg);
    141  uint8_t* bytesRd(uint8_t reg, uint8_t nbytes, uint8_t* data_p);
    142  uint8_t gpioRd();
    -
    143  uint16_t reset();
    -
    144  int8_t Init();
    -
    145  int8_t Init(int mseconds);
    -
    146 
    -
    147  void vbusPower(VBUS_t state) {
    -
    148  regWr(rPINCTL, (bmFDUPSPI | bmINTLEVEL | state));
    -
    149  }
    -
    150 
    -
    151  uint8_t getVbusState(void) {
    -
    152  return vbusState;
    -
    153  };
    -
    154  void busprobe();
    -
    155  uint8_t GpxHandler();
    -
    156  uint8_t IntHandler();
    -
    157  uint8_t Task();
    -
    158 };
    -
    159 
    -
    160 template< typename SPI_SS, typename INTR >
    -
    161  uint8_t MAX3421e< SPI_SS, INTR >::vbusState = 0;
    -
    162 
    -
    163 /* constructor */
    -
    164 template< typename SPI_SS, typename INTR >
    -
    165 MAX3421e< SPI_SS, INTR >::MAX3421e() {
    -
    166  // Leaving ADK hardware setup in here, for now. This really belongs with the other parts.
    -
    167 #ifdef BOARD_MEGA_ADK
    -
    168  // For Mega ADK, which has a Max3421e on-board, set MAX_RESET to output mode, and then set it to HIGH
    -
    169  P55::SetDirWrite();
    -
    170  P55::Set();
    -
    171 #endif
    -
    172 };
    -
    173 
    -
    174 /* write single byte into MAX3421 register */
    -
    175 template< typename SPI_SS, typename INTR >
    -
    176 void MAX3421e< SPI_SS, INTR >::regWr(uint8_t reg, uint8_t data) {
    -
    177  XMEM_ACQUIRE_SPI();
    -
    178 #if defined(SPI_HAS_TRANSACTION)
    -
    179  USB_SPI.beginTransaction(SPISettings(26000000, MSBFIRST, SPI_MODE0)); // The MAX3421E can handle up to 26MHz, use MSB First and SPI mode 0
    -
    180 #endif
    -
    181  SPI_SS::Clear();
    -
    182 
    -
    183 #if USING_SPI4TEENSY3
    -
    184  uint8_t c[2];
    -
    185  c[0] = reg | 0x02;
    -
    186  c[1] = data;
    -
    187  spi4teensy3::send(c, 2);
    -
    188 #elif defined(SPI_HAS_TRANSACTION) && !defined(ESP8266) && !defined(ESP32)
    -
    189  uint8_t c[2];
    -
    190  c[0] = reg | 0x02;
    -
    191  c[1] = data;
    -
    192  USB_SPI.transfer(c, 2);
    -
    193 #elif defined(STM32F4)
    -
    194  uint8_t c[2];
    -
    195  c[0] = reg | 0x02;
    -
    196  c[1] = data;
    -
    197  HAL_SPI_Transmit(&SPI_Handle, c, 2, HAL_MAX_DELAY);
    -
    198 #elif !defined(SPDR) // ESP8266, ESP32
    -
    199  USB_SPI.transfer(reg | 0x02);
    -
    200  USB_SPI.transfer(data);
    -
    201 #else
    -
    202  SPDR = (reg | 0x02);
    -
    203  while(!(SPSR & (1 << SPIF)));
    -
    204  SPDR = data;
    -
    205  while(!(SPSR & (1 << SPIF)));
    -
    206 #endif
    -
    207 
    -
    208  SPI_SS::Set();
    -
    209 #if defined(SPI_HAS_TRANSACTION)
    -
    210  USB_SPI.endTransaction();
    -
    211 #endif
    -
    212  XMEM_RELEASE_SPI();
    -
    213  return;
    -
    214 };
    -
    215 /* multiple-byte write */
    -
    216 
    -
    217 /* returns a pointer to memory position after last written */
    -
    218 template< typename SPI_SS, typename INTR >
    -
    219 uint8_t* MAX3421e< SPI_SS, INTR >::bytesWr(uint8_t reg, uint8_t nbytes, uint8_t* data_p) {
    -
    220  XMEM_ACQUIRE_SPI();
    -
    221 #if defined(SPI_HAS_TRANSACTION)
    -
    222  USB_SPI.beginTransaction(SPISettings(26000000, MSBFIRST, SPI_MODE0)); // The MAX3421E can handle up to 26MHz, use MSB First and SPI mode 0
    -
    223 #endif
    -
    224  SPI_SS::Clear();
    -
    225 
    -
    226 #if USING_SPI4TEENSY3
    -
    227  spi4teensy3::send(reg | 0x02);
    -
    228  spi4teensy3::send(data_p, nbytes);
    -
    229  data_p += nbytes;
    -
    230 #elif defined(SPI_HAS_TRANSACTION) && !defined(ESP8266) && !defined(ESP32)
    -
    231  USB_SPI.transfer(reg | 0x02);
    -
    232  USB_SPI.transfer(data_p, nbytes);
    -
    233  data_p += nbytes;
    -
    234 #elif defined(__ARDUINO_X86__)
    -
    235  USB_SPI.transfer(reg | 0x02);
    -
    236  USB_SPI.transferBuffer(data_p, NULL, nbytes);
    -
    237  data_p += nbytes;
    -
    238 #elif defined(STM32F4)
    -
    239  uint8_t data = reg | 0x02;
    -
    240  HAL_SPI_Transmit(&SPI_Handle, &data, 1, HAL_MAX_DELAY);
    -
    241  HAL_SPI_Transmit(&SPI_Handle, data_p, nbytes, HAL_MAX_DELAY);
    -
    242  data_p += nbytes;
    -
    243 #elif !defined(SPDR) // ESP8266, ESP32
    -
    244  USB_SPI.transfer(reg | 0x02);
    -
    245  while(nbytes) {
    -
    246  USB_SPI.transfer(*data_p);
    -
    247  nbytes--;
    -
    248  data_p++; // advance data pointer
    -
    249  }
    -
    250 #else
    -
    251  SPDR = (reg | 0x02); //set WR bit and send register number
    -
    252  while(nbytes) {
    -
    253  while(!(SPSR & (1 << SPIF))); //check if previous byte was sent
    -
    254  SPDR = (*data_p); // send next data byte
    -
    255  nbytes--;
    -
    256  data_p++; // advance data pointer
    -
    257  }
    -
    258  while(!(SPSR & (1 << SPIF)));
    -
    259 #endif
    -
    260 
    -
    261  SPI_SS::Set();
    -
    262 #if defined(SPI_HAS_TRANSACTION)
    -
    263  USB_SPI.endTransaction();
    -
    264 #endif
    -
    265  XMEM_RELEASE_SPI();
    -
    266  return ( data_p);
    -
    267 }
    -
    268 /* GPIO write */
    -
    269 /*GPIO byte is split between 2 registers, so two writes are needed to write one byte */
    -
    270 
    -
    271 /* GPOUT bits are in the low nibble. 0-3 in IOPINS1, 4-7 in IOPINS2 */
    -
    272 template< typename SPI_SS, typename INTR >
    -
    273 void MAX3421e< SPI_SS, INTR >::gpioWr(uint8_t data) {
    -
    274  regWr(rIOPINS1, data);
    -
    275  data >>= 4;
    -
    276  regWr(rIOPINS2, data);
    -
    277  return;
    -
    278 }
    -
    279 
    -
    280 /* single host register read */
    -
    281 template< typename SPI_SS, typename INTR >
    -
    282 uint8_t MAX3421e< SPI_SS, INTR >::regRd(uint8_t reg) {
    -
    283  XMEM_ACQUIRE_SPI();
    -
    284 #if defined(SPI_HAS_TRANSACTION)
    -
    285  USB_SPI.beginTransaction(SPISettings(26000000, MSBFIRST, SPI_MODE0)); // The MAX3421E can handle up to 26MHz, use MSB First and SPI mode 0
    -
    286 #endif
    -
    287  SPI_SS::Clear();
    -
    288 
    -
    289 #if USING_SPI4TEENSY3
    -
    290  spi4teensy3::send(reg);
    -
    291  uint8_t rv = spi4teensy3::receive();
    -
    292  SPI_SS::Set();
    -
    293 #elif defined(STM32F4)
    -
    294  HAL_SPI_Transmit(&SPI_Handle, &reg, 1, HAL_MAX_DELAY);
    -
    295  uint8_t rv = 0;
    -
    296  HAL_SPI_Receive(&SPI_Handle, &rv, 1, HAL_MAX_DELAY);
    -
    297  SPI_SS::Set();
    -
    298 #elif !defined(SPDR) || defined(SPI_HAS_TRANSACTION)
    -
    299  USB_SPI.transfer(reg);
    -
    300  uint8_t rv = USB_SPI.transfer(0); // Send empty byte
    -
    301  SPI_SS::Set();
    -
    302 #else
    -
    303  SPDR = reg;
    -
    304  while(!(SPSR & (1 << SPIF)));
    -
    305  SPDR = 0; // Send empty byte
    -
    306  while(!(SPSR & (1 << SPIF)));
    -
    307  SPI_SS::Set();
    -
    308  uint8_t rv = SPDR;
    -
    309 #endif
    -
    310 
    -
    311 #if defined(SPI_HAS_TRANSACTION)
    -
    312  USB_SPI.endTransaction();
    -
    313 #endif
    -
    314  XMEM_RELEASE_SPI();
    -
    315  return (rv);
    -
    316 }
    -
    317 /* multiple-byte register read */
    -
    318 
    -
    319 /* returns a pointer to a memory position after last read */
    -
    320 template< typename SPI_SS, typename INTR >
    -
    321 uint8_t* MAX3421e< SPI_SS, INTR >::bytesRd(uint8_t reg, uint8_t nbytes, uint8_t* data_p) {
    -
    322  XMEM_ACQUIRE_SPI();
    -
    323 #if defined(SPI_HAS_TRANSACTION)
    -
    324  USB_SPI.beginTransaction(SPISettings(26000000, MSBFIRST, SPI_MODE0)); // The MAX3421E can handle up to 26MHz, use MSB First and SPI mode 0
    -
    325 #endif
    -
    326  SPI_SS::Clear();
    -
    327 
    -
    328 #if USING_SPI4TEENSY3
    -
    329  spi4teensy3::send(reg);
    -
    330  spi4teensy3::receive(data_p, nbytes);
    -
    331  data_p += nbytes;
    -
    332 #elif defined(SPI_HAS_TRANSACTION) && !defined(ESP8266) && !defined(ESP32)
    -
    333  USB_SPI.transfer(reg);
    -
    334  memset(data_p, 0, nbytes); // Make sure we send out empty bytes
    -
    335  USB_SPI.transfer(data_p, nbytes);
    -
    336  data_p += nbytes;
    -
    337 #elif defined(__ARDUINO_X86__)
    -
    338  USB_SPI.transfer(reg);
    -
    339  USB_SPI.transferBuffer(NULL, data_p, nbytes);
    -
    340  data_p += nbytes;
    -
    341 #elif defined(STM32F4)
    -
    342  HAL_SPI_Transmit(&SPI_Handle, &reg, 1, HAL_MAX_DELAY);
    -
    343  memset(data_p, 0, nbytes); // Make sure we send out empty bytes
    -
    344  HAL_SPI_Receive(&SPI_Handle, data_p, nbytes, HAL_MAX_DELAY);
    -
    345  data_p += nbytes;
    -
    346 #elif !defined(SPDR) // ESP8266, ESP32
    -
    347  USB_SPI.transfer(reg);
    -
    348  while(nbytes) {
    -
    349  *data_p++ = USB_SPI.transfer(0);
    -
    350  nbytes--;
    -
    351  }
    -
    352 #else
    -
    353  SPDR = reg;
    -
    354  while(!(SPSR & (1 << SPIF))); //wait
    -
    355  while(nbytes) {
    -
    356  SPDR = 0; // Send empty byte
    -
    357  nbytes--;
    -
    358  while(!(SPSR & (1 << SPIF)));
    -
    359 #if 0
    -
    360  {
    -
    361  *data_p = SPDR;
    -
    362  printf("%2.2x ", *data_p);
    -
    363  }
    -
    364  data_p++;
    -
    365  }
    -
    366  printf("\r\n");
    -
    367 #else
    -
    368  *data_p++ = SPDR;
    -
    369  }
    -
    370 #endif
    -
    371 #endif
    -
    372 
    -
    373  SPI_SS::Set();
    -
    374 #if defined(SPI_HAS_TRANSACTION)
    -
    375  USB_SPI.endTransaction();
    -
    376 #endif
    -
    377  XMEM_RELEASE_SPI();
    -
    378  return ( data_p);
    -
    379 }
    -
    380 /* GPIO read. See gpioWr for explanation */
    -
    381 
    -
    382 /* GPIN pins are in high nibbles of IOPINS1, IOPINS2 */
    -
    383 template< typename SPI_SS, typename INTR >
    -
    384 uint8_t MAX3421e< SPI_SS, INTR >::gpioRd() {
    -
    385  uint8_t gpin = 0;
    -
    386  gpin = regRd(rIOPINS2); //pins 4-7
    -
    387  gpin &= 0xf0; //clean lower nibble
    -
    388  gpin |= (regRd(rIOPINS1) >> 4); //shift low bits and OR with upper from previous operation.
    -
    389  return ( gpin);
    -
    390 }
    -
    391 
    -
    392 /* reset MAX3421E. Returns number of cycles it took for PLL to stabilize after reset
    -
    393  or zero if PLL haven't stabilized in 65535 cycles */
    -
    394 template< typename SPI_SS, typename INTR >
    -
    395 uint16_t MAX3421e< SPI_SS, INTR >::reset() {
    -
    396  uint16_t i = 0;
    -
    397  regWr(rUSBCTL, bmCHIPRES);
    -
    398  regWr(rUSBCTL, 0x00);
    -
    399  while(++i) {
    -
    400  if((regRd(rUSBIRQ) & bmOSCOKIRQ)) {
    -
    401  break;
    -
    402  }
    -
    403  }
    -
    404  return ( i);
    -
    405 }
    -
    406 
    -
    407 /* initialize MAX3421E. Set Host mode, pullups, and stuff. Returns 0 if success, -1 if not */
    -
    408 template< typename SPI_SS, typename INTR >
    -
    409 int8_t MAX3421e< SPI_SS, INTR >::Init() {
    -
    410  XMEM_ACQUIRE_SPI();
    -
    411  // Moved here.
    -
    412  // you really should not init hardware in the constructor when it involves locks.
    -
    413  // Also avoids the vbus flicker issue confusing some devices.
    -
    414  /* pin and peripheral setup */
    -
    415  SPI_SS::SetDirWrite();
    -
    416  SPI_SS::Set();
    -
    417  spi::init();
    -
    418  INTR::SetDirRead();
    -
    419  XMEM_RELEASE_SPI();
    -
    420  /* MAX3421E - full-duplex SPI, level interrupt */
    -
    421  // GPX pin on. Moved here, otherwise we flicker the vbus.
    -
    422  regWr(rPINCTL, (bmFDUPSPI | bmINTLEVEL));
    +
    143  uint8_t gpioRdOutput();
    +
    144  uint16_t reset();
    +
    145  int8_t Init();
    +
    146  int8_t Init(int mseconds);
    +
    147 
    +
    148  void vbusPower(VBUS_t state) {
    +
    149  regWr(rPINCTL, (bmFDUPSPI | bmINTLEVEL | state));
    +
    150  }
    +
    151 
    +
    152  uint8_t getVbusState(void) {
    +
    153  return vbusState;
    +
    154  };
    +
    155  void busprobe();
    +
    156  uint8_t GpxHandler();
    +
    157  uint8_t IntHandler();
    +
    158  uint8_t Task();
    +
    159 };
    +
    160 
    +
    161 template< typename SPI_SS, typename INTR >
    +
    162  uint8_t MAX3421e< SPI_SS, INTR >::vbusState = 0;
    +
    163 
    +
    164 /* constructor */
    +
    165 template< typename SPI_SS, typename INTR >
    +
    166 MAX3421e< SPI_SS, INTR >::MAX3421e() {
    +
    167  // Leaving ADK hardware setup in here, for now. This really belongs with the other parts.
    +
    168 #ifdef BOARD_MEGA_ADK
    +
    169  // For Mega ADK, which has a Max3421e on-board, set MAX_RESET to output mode, and then set it to HIGH
    +
    170  P55::SetDirWrite();
    +
    171  P55::Set();
    +
    172 #endif
    +
    173 };
    +
    174 
    +
    175 /* write single byte into MAX3421 register */
    +
    176 template< typename SPI_SS, typename INTR >
    +
    177 void MAX3421e< SPI_SS, INTR >::regWr(uint8_t reg, uint8_t data) {
    +
    178  XMEM_ACQUIRE_SPI();
    +
    179 #if defined(SPI_HAS_TRANSACTION)
    +
    180  USB_SPI.beginTransaction(SPISettings(26000000, MSBFIRST, SPI_MODE0)); // The MAX3421E can handle up to 26MHz, use MSB First and SPI mode 0
    +
    181 #endif
    +
    182  SPI_SS::Clear();
    +
    183 
    +
    184 #if USING_SPI4TEENSY3
    +
    185  uint8_t c[2];
    +
    186  c[0] = reg | 0x02;
    +
    187  c[1] = data;
    +
    188  spi4teensy3::send(c, 2);
    +
    189 #elif defined(SPI_HAS_TRANSACTION) && !defined(ESP8266) && !defined(ESP32)
    +
    190  uint8_t c[2];
    +
    191  c[0] = reg | 0x02;
    +
    192  c[1] = data;
    +
    193  USB_SPI.transfer(c, 2);
    +
    194 #elif defined(STM32F4)
    +
    195  uint8_t c[2];
    +
    196  c[0] = reg | 0x02;
    +
    197  c[1] = data;
    +
    198  HAL_SPI_Transmit(&SPI_Handle, c, 2, HAL_MAX_DELAY);
    +
    199 #elif !defined(SPDR) // ESP8266, ESP32
    +
    200  USB_SPI.transfer(reg | 0x02);
    +
    201  USB_SPI.transfer(data);
    +
    202 #else
    +
    203  SPDR = (reg | 0x02);
    +
    204  while(!(SPSR & (1 << SPIF)));
    +
    205  SPDR = data;
    +
    206  while(!(SPSR & (1 << SPIF)));
    +
    207 #endif
    +
    208 
    +
    209  SPI_SS::Set();
    +
    210 #if defined(SPI_HAS_TRANSACTION)
    +
    211  USB_SPI.endTransaction();
    +
    212 #endif
    +
    213  XMEM_RELEASE_SPI();
    +
    214  return;
    +
    215 };
    +
    216 /* multiple-byte write */
    +
    217 
    +
    218 /* returns a pointer to memory position after last written */
    +
    219 template< typename SPI_SS, typename INTR >
    +
    220 uint8_t* MAX3421e< SPI_SS, INTR >::bytesWr(uint8_t reg, uint8_t nbytes, uint8_t* data_p) {
    +
    221  XMEM_ACQUIRE_SPI();
    +
    222 #if defined(SPI_HAS_TRANSACTION)
    +
    223  USB_SPI.beginTransaction(SPISettings(26000000, MSBFIRST, SPI_MODE0)); // The MAX3421E can handle up to 26MHz, use MSB First and SPI mode 0
    +
    224 #endif
    +
    225  SPI_SS::Clear();
    +
    226 
    +
    227 #if USING_SPI4TEENSY3
    +
    228  spi4teensy3::send(reg | 0x02);
    +
    229  spi4teensy3::send(data_p, nbytes);
    +
    230  data_p += nbytes;
    +
    231 #elif defined(SPI_HAS_TRANSACTION) && !defined(ESP8266) && !defined(ESP32)
    +
    232  USB_SPI.transfer(reg | 0x02);
    +
    233  USB_SPI.transfer(data_p, nbytes);
    +
    234  data_p += nbytes;
    +
    235 #elif defined(__ARDUINO_X86__)
    +
    236  USB_SPI.transfer(reg | 0x02);
    +
    237  USB_SPI.transferBuffer(data_p, NULL, nbytes);
    +
    238  data_p += nbytes;
    +
    239 #elif defined(STM32F4)
    +
    240  uint8_t data = reg | 0x02;
    +
    241  HAL_SPI_Transmit(&SPI_Handle, &data, 1, HAL_MAX_DELAY);
    +
    242  HAL_SPI_Transmit(&SPI_Handle, data_p, nbytes, HAL_MAX_DELAY);
    +
    243  data_p += nbytes;
    +
    244 #elif !defined(SPDR) // ESP8266, ESP32
    +
    245  USB_SPI.transfer(reg | 0x02);
    +
    246  while(nbytes) {
    +
    247  USB_SPI.transfer(*data_p);
    +
    248  nbytes--;
    +
    249  data_p++; // advance data pointer
    +
    250  }
    +
    251 #else
    +
    252  SPDR = (reg | 0x02); //set WR bit and send register number
    +
    253  while(nbytes) {
    +
    254  while(!(SPSR & (1 << SPIF))); //check if previous byte was sent
    +
    255  SPDR = (*data_p); // send next data byte
    +
    256  nbytes--;
    +
    257  data_p++; // advance data pointer
    +
    258  }
    +
    259  while(!(SPSR & (1 << SPIF)));
    +
    260 #endif
    +
    261 
    +
    262  SPI_SS::Set();
    +
    263 #if defined(SPI_HAS_TRANSACTION)
    +
    264  USB_SPI.endTransaction();
    +
    265 #endif
    +
    266  XMEM_RELEASE_SPI();
    +
    267  return ( data_p);
    +
    268 }
    +
    269 /* GPIO write */
    +
    270 /*GPIO byte is split between 2 registers, so two writes are needed to write one byte */
    +
    271 
    +
    272 /* GPOUT bits are in the low nibble. 0-3 in IOPINS1, 4-7 in IOPINS2 */
    +
    273 template< typename SPI_SS, typename INTR >
    +
    274 void MAX3421e< SPI_SS, INTR >::gpioWr(uint8_t data) {
    +
    275  regWr(rIOPINS1, data);
    +
    276  data >>= 4;
    +
    277  regWr(rIOPINS2, data);
    +
    278  return;
    +
    279 }
    +
    280 
    +
    281 /* single host register read */
    +
    282 template< typename SPI_SS, typename INTR >
    +
    283 uint8_t MAX3421e< SPI_SS, INTR >::regRd(uint8_t reg) {
    +
    284  XMEM_ACQUIRE_SPI();
    +
    285 #if defined(SPI_HAS_TRANSACTION)
    +
    286  USB_SPI.beginTransaction(SPISettings(26000000, MSBFIRST, SPI_MODE0)); // The MAX3421E can handle up to 26MHz, use MSB First and SPI mode 0
    +
    287 #endif
    +
    288  SPI_SS::Clear();
    +
    289 
    +
    290 #if USING_SPI4TEENSY3
    +
    291  spi4teensy3::send(reg);
    +
    292  uint8_t rv = spi4teensy3::receive();
    +
    293  SPI_SS::Set();
    +
    294 #elif defined(STM32F4)
    +
    295  HAL_SPI_Transmit(&SPI_Handle, &reg, 1, HAL_MAX_DELAY);
    +
    296  uint8_t rv = 0;
    +
    297  HAL_SPI_Receive(&SPI_Handle, &rv, 1, HAL_MAX_DELAY);
    +
    298  SPI_SS::Set();
    +
    299 #elif !defined(SPDR) || defined(SPI_HAS_TRANSACTION)
    +
    300  USB_SPI.transfer(reg);
    +
    301  uint8_t rv = USB_SPI.transfer(0); // Send empty byte
    +
    302  SPI_SS::Set();
    +
    303 #else
    +
    304  SPDR = reg;
    +
    305  while(!(SPSR & (1 << SPIF)));
    +
    306  SPDR = 0; // Send empty byte
    +
    307  while(!(SPSR & (1 << SPIF)));
    +
    308  SPI_SS::Set();
    +
    309  uint8_t rv = SPDR;
    +
    310 #endif
    +
    311 
    +
    312 #if defined(SPI_HAS_TRANSACTION)
    +
    313  USB_SPI.endTransaction();
    +
    314 #endif
    +
    315  XMEM_RELEASE_SPI();
    +
    316  return (rv);
    +
    317 }
    +
    318 /* multiple-byte register read */
    +
    319 
    +
    320 /* returns a pointer to a memory position after last read */
    +
    321 template< typename SPI_SS, typename INTR >
    +
    322 uint8_t* MAX3421e< SPI_SS, INTR >::bytesRd(uint8_t reg, uint8_t nbytes, uint8_t* data_p) {
    +
    323  XMEM_ACQUIRE_SPI();
    +
    324 #if defined(SPI_HAS_TRANSACTION)
    +
    325  USB_SPI.beginTransaction(SPISettings(26000000, MSBFIRST, SPI_MODE0)); // The MAX3421E can handle up to 26MHz, use MSB First and SPI mode 0
    +
    326 #endif
    +
    327  SPI_SS::Clear();
    +
    328 
    +
    329 #if USING_SPI4TEENSY3
    +
    330  spi4teensy3::send(reg);
    +
    331  spi4teensy3::receive(data_p, nbytes);
    +
    332  data_p += nbytes;
    +
    333 #elif defined(SPI_HAS_TRANSACTION) && !defined(ESP8266) && !defined(ESP32)
    +
    334  USB_SPI.transfer(reg);
    +
    335  memset(data_p, 0, nbytes); // Make sure we send out empty bytes
    +
    336  USB_SPI.transfer(data_p, nbytes);
    +
    337  data_p += nbytes;
    +
    338 #elif defined(__ARDUINO_X86__)
    +
    339  USB_SPI.transfer(reg);
    +
    340  USB_SPI.transferBuffer(NULL, data_p, nbytes);
    +
    341  data_p += nbytes;
    +
    342 #elif defined(STM32F4)
    +
    343  HAL_SPI_Transmit(&SPI_Handle, &reg, 1, HAL_MAX_DELAY);
    +
    344  memset(data_p, 0, nbytes); // Make sure we send out empty bytes
    +
    345  HAL_SPI_Receive(&SPI_Handle, data_p, nbytes, HAL_MAX_DELAY);
    +
    346  data_p += nbytes;
    +
    347 #elif !defined(SPDR) // ESP8266, ESP32
    +
    348  USB_SPI.transfer(reg);
    +
    349  while(nbytes) {
    +
    350  *data_p++ = USB_SPI.transfer(0);
    +
    351  nbytes--;
    +
    352  }
    +
    353 #else
    +
    354  SPDR = reg;
    +
    355  while(!(SPSR & (1 << SPIF))); //wait
    +
    356  while(nbytes) {
    +
    357  SPDR = 0; // Send empty byte
    +
    358  nbytes--;
    +
    359  while(!(SPSR & (1 << SPIF)));
    +
    360 #if 0
    +
    361  {
    +
    362  *data_p = SPDR;
    +
    363  printf("%2.2x ", *data_p);
    +
    364  }
    +
    365  data_p++;
    +
    366  }
    +
    367  printf("\r\n");
    +
    368 #else
    +
    369  *data_p++ = SPDR;
    +
    370  }
    +
    371 #endif
    +
    372 #endif
    +
    373 
    +
    374  SPI_SS::Set();
    +
    375 #if defined(SPI_HAS_TRANSACTION)
    +
    376  USB_SPI.endTransaction();
    +
    377 #endif
    +
    378  XMEM_RELEASE_SPI();
    +
    379  return ( data_p);
    +
    380 }
    +
    381 /* GPIO read. See gpioWr for explanation */
    +
    382 
    +
    386 /* GPIN pins are in high nibbles of IOPINS1, IOPINS2 */
    +
    387 template< typename SPI_SS, typename INTR >
    +
    388 uint8_t MAX3421e< SPI_SS, INTR >::gpioRd() {
    +
    389  uint8_t gpin = 0;
    +
    390  gpin = regRd(rIOPINS2); //pins 4-7
    +
    391  gpin &= 0xf0; //clean lower nibble
    +
    392  gpin |= (regRd(rIOPINS1) >> 4); //shift low bits and OR with upper from previous operation.
    +
    393  return ( gpin);
    +
    394 }
    +
    395 
    +
    399 /* GPOUT pins are in low nibbles of IOPINS1, IOPINS2 */
    +
    400 template< typename SPI_SS, typename INTR >
    +
    401 uint8_t MAX3421e< SPI_SS, INTR >::gpioRdOutput() {
    +
    402  uint8_t gpout = 0;
    +
    403  gpout = regRd(rIOPINS1); //pins 0-3
    +
    404  gpout &= 0x0f; //clean upper nibble
    +
    405  gpout |= (regRd(rIOPINS2) << 4); //shift high bits and OR with lower from previous operation.
    +
    406  return ( gpout);
    +
    407 }
    +
    408 
    +
    409 /* reset MAX3421E. Returns number of cycles it took for PLL to stabilize after reset
    +
    410  or zero if PLL haven't stabilized in 65535 cycles */
    +
    411 template< typename SPI_SS, typename INTR >
    +
    412 uint16_t MAX3421e< SPI_SS, INTR >::reset() {
    +
    413  uint16_t i = 0;
    +
    414  regWr(rUSBCTL, bmCHIPRES);
    +
    415  regWr(rUSBCTL, 0x00);
    +
    416  while(++i) {
    +
    417  if((regRd(rUSBIRQ) & bmOSCOKIRQ)) {
    +
    418  break;
    +
    419  }
    +
    420  }
    +
    421  return ( i);
    +
    422 }
    423 
    -
    424  if(reset() == 0) { //OSCOKIRQ hasn't asserted in time
    -
    425  return ( -1);
    -
    426  }
    -
    427 
    -
    428  regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST); // set pull-downs, Host
    -
    429 
    -
    430  regWr(rHIEN, bmCONDETIE | bmFRAMEIE); //connection detection
    -
    431 
    -
    432  /* check if device is connected */
    -
    433  regWr(rHCTL, bmSAMPLEBUS); // sample USB bus
    -
    434  while(!(regRd(rHCTL) & bmSAMPLEBUS)); //wait for sample operation to finish
    -
    435 
    -
    436  busprobe(); //check if anything is connected
    -
    437 
    -
    438  regWr(rHIRQ, bmCONDETIRQ); //clear connection detect interrupt
    -
    439  regWr(rCPUCTL, 0x01); //enable interrupt pin
    +
    424 /* initialize MAX3421E. Set Host mode, pullups, and stuff. Returns 0 if success, -1 if not */
    +
    425 template< typename SPI_SS, typename INTR >
    +
    426 int8_t MAX3421e< SPI_SS, INTR >::Init() {
    +
    427  XMEM_ACQUIRE_SPI();
    +
    428  // Moved here.
    +
    429  // you really should not init hardware in the constructor when it involves locks.
    +
    430  // Also avoids the vbus flicker issue confusing some devices.
    +
    431  /* pin and peripheral setup */
    +
    432  SPI_SS::SetDirWrite();
    +
    433  SPI_SS::Set();
    +
    434  spi::init();
    +
    435  INTR::SetDirRead();
    +
    436  XMEM_RELEASE_SPI();
    +
    437  /* MAX3421E - full-duplex SPI, level interrupt */
    +
    438  // GPX pin on. Moved here, otherwise we flicker the vbus.
    +
    439  regWr(rPINCTL, (bmFDUPSPI | bmINTLEVEL));
    440 
    -
    441  return ( 0);
    -
    442 }
    -
    443 
    -
    444 /* initialize MAX3421E. Set Host mode, pullups, and stuff. Returns 0 if success, -1 if not */
    -
    445 template< typename SPI_SS, typename INTR >
    -
    446 int8_t MAX3421e< SPI_SS, INTR >::Init(int mseconds) {
    -
    447  XMEM_ACQUIRE_SPI();
    -
    448  // Moved here.
    -
    449  // you really should not init hardware in the constructor when it involves locks.
    -
    450  // Also avoids the vbus flicker issue confusing some devices.
    -
    451  /* pin and peripheral setup */
    -
    452  SPI_SS::SetDirWrite();
    -
    453  SPI_SS::Set();
    -
    454  spi::init();
    -
    455  INTR::SetDirRead();
    -
    456  XMEM_RELEASE_SPI();
    -
    457  /* MAX3421E - full-duplex SPI, level interrupt, vbus off */
    -
    458  regWr(rPINCTL, (bmFDUPSPI | bmINTLEVEL | GPX_VBDET));
    -
    459 
    -
    460  if(reset() == 0) { //OSCOKIRQ hasn't asserted in time
    -
    461  return ( -1);
    -
    462  }
    -
    463 
    -
    464  // Delay a minimum of 1 second to ensure any capacitors are drained.
    -
    465  // 1 second is required to make sure we do not smoke a Microdrive!
    -
    466  if(mseconds < 1000) mseconds = 1000;
    -
    467  delay(mseconds);
    -
    468 
    -
    469  regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST); // set pull-downs, Host
    -
    470 
    -
    471  regWr(rHIEN, bmCONDETIE | bmFRAMEIE); //connection detection
    -
    472 
    -
    473  /* check if device is connected */
    -
    474  regWr(rHCTL, bmSAMPLEBUS); // sample USB bus
    -
    475  while(!(regRd(rHCTL) & bmSAMPLEBUS)); //wait for sample operation to finish
    +
    441  if(reset() == 0) { //OSCOKIRQ hasn't asserted in time
    +
    442  return ( -1);
    +
    443  }
    +
    444 
    +
    445  regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST); // set pull-downs, Host
    +
    446 
    +
    447  regWr(rHIEN, bmCONDETIE | bmFRAMEIE); //connection detection
    +
    448 
    +
    449  /* check if device is connected */
    +
    450  regWr(rHCTL, bmSAMPLEBUS); // sample USB bus
    +
    451  while(!(regRd(rHCTL) & bmSAMPLEBUS)); //wait for sample operation to finish
    +
    452 
    +
    453  busprobe(); //check if anything is connected
    +
    454 
    +
    455  regWr(rHIRQ, bmCONDETIRQ); //clear connection detect interrupt
    +
    456  regWr(rCPUCTL, 0x01); //enable interrupt pin
    +
    457 
    +
    458  return ( 0);
    +
    459 }
    +
    460 
    +
    461 /* initialize MAX3421E. Set Host mode, pullups, and stuff. Returns 0 if success, -1 if not */
    +
    462 template< typename SPI_SS, typename INTR >
    +
    463 int8_t MAX3421e< SPI_SS, INTR >::Init(int mseconds) {
    +
    464  XMEM_ACQUIRE_SPI();
    +
    465  // Moved here.
    +
    466  // you really should not init hardware in the constructor when it involves locks.
    +
    467  // Also avoids the vbus flicker issue confusing some devices.
    +
    468  /* pin and peripheral setup */
    +
    469  SPI_SS::SetDirWrite();
    +
    470  SPI_SS::Set();
    +
    471  spi::init();
    +
    472  INTR::SetDirRead();
    +
    473  XMEM_RELEASE_SPI();
    +
    474  /* MAX3421E - full-duplex SPI, level interrupt, vbus off */
    +
    475  regWr(rPINCTL, (bmFDUPSPI | bmINTLEVEL | GPX_VBDET));
    476 
    -
    477  busprobe(); //check if anything is connected
    -
    478 
    -
    479  regWr(rHIRQ, bmCONDETIRQ); //clear connection detect interrupt
    -
    480  regWr(rCPUCTL, 0x01); //enable interrupt pin
    -
    481 
    -
    482  // GPX pin on. This is done here so that busprobe will fail if we have a switch connected.
    -
    483  regWr(rPINCTL, (bmFDUPSPI | bmINTLEVEL));
    -
    484 
    -
    485  return ( 0);
    -
    486 }
    +
    477  if(reset() == 0) { //OSCOKIRQ hasn't asserted in time
    +
    478  return ( -1);
    +
    479  }
    +
    480 
    +
    481  // Delay a minimum of 1 second to ensure any capacitors are drained.
    +
    482  // 1 second is required to make sure we do not smoke a Microdrive!
    +
    483  if(mseconds < 1000) mseconds = 1000;
    +
    484  delay(mseconds);
    +
    485 
    +
    486  regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST); // set pull-downs, Host
    487 
    -
    488 /* probe bus to determine device presence and speed and switch host to this speed */
    -
    489 template< typename SPI_SS, typename INTR >
    -
    490 void MAX3421e< SPI_SS, INTR >::busprobe() {
    -
    491  uint8_t bus_sample;
    -
    492  bus_sample = regRd(rHRSL); //Get J,K status
    -
    493  bus_sample &= (bmJSTATUS | bmKSTATUS); //zero the rest of the byte
    -
    494  switch(bus_sample) { //start full-speed or low-speed host
    -
    495  case( bmJSTATUS):
    -
    496  if((regRd(rMODE) & bmLOWSPEED) == 0) {
    -
    497  regWr(rMODE, MODE_FS_HOST); //start full-speed host
    -
    498  vbusState = FSHOST;
    -
    499  } else {
    -
    500  regWr(rMODE, MODE_LS_HOST); //start low-speed host
    -
    501  vbusState = LSHOST;
    -
    502  }
    -
    503  break;
    -
    504  case( bmKSTATUS):
    -
    505  if((regRd(rMODE) & bmLOWSPEED) == 0) {
    -
    506  regWr(rMODE, MODE_LS_HOST); //start low-speed host
    -
    507  vbusState = LSHOST;
    -
    508  } else {
    -
    509  regWr(rMODE, MODE_FS_HOST); //start full-speed host
    -
    510  vbusState = FSHOST;
    -
    511  }
    -
    512  break;
    -
    513  case( bmSE1): //illegal state
    -
    514  vbusState = SE1;
    -
    515  break;
    -
    516  case( bmSE0): //disconnected state
    -
    517  regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST | bmSEPIRQ);
    -
    518  vbusState = SE0;
    -
    519  break;
    -
    520  }//end switch( bus_sample )
    -
    521 }
    -
    522 
    -
    523 /* MAX3421 state change task and interrupt handler */
    -
    524 template< typename SPI_SS, typename INTR >
    -
    525 uint8_t MAX3421e< SPI_SS, INTR >::Task(void) {
    -
    526  uint8_t rcode = 0;
    -
    527  uint8_t pinvalue;
    -
    528  //USB_HOST_SERIAL.print("Vbus state: ");
    -
    529  //USB_HOST_SERIAL.println( vbusState, HEX );
    -
    530  pinvalue = INTR::IsSet(); //Read();
    -
    531  //pinvalue = digitalRead( MAX_INT );
    -
    532  if(pinvalue == 0) {
    -
    533  rcode = IntHandler();
    -
    534  }
    -
    535  // pinvalue = digitalRead( MAX_GPX );
    -
    536  // if( pinvalue == LOW ) {
    -
    537  // GpxHandler();
    -
    538  // }
    -
    539  // usbSM(); //USB state machine
    -
    540  return ( rcode);
    -
    541 }
    -
    542 
    -
    543 template< typename SPI_SS, typename INTR >
    -
    544 uint8_t MAX3421e< SPI_SS, INTR >::IntHandler() {
    -
    545  uint8_t HIRQ;
    -
    546  uint8_t HIRQ_sendback = 0x00;
    -
    547  HIRQ = regRd(rHIRQ); //determine interrupt source
    -
    548  //if( HIRQ & bmFRAMEIRQ ) { //->1ms SOF interrupt handler
    -
    549  // HIRQ_sendback |= bmFRAMEIRQ;
    -
    550  //}//end FRAMEIRQ handling
    -
    551  if(HIRQ & bmCONDETIRQ) {
    -
    552  busprobe();
    -
    553  HIRQ_sendback |= bmCONDETIRQ;
    -
    554  }
    -
    555  /* End HIRQ interrupts handling, clear serviced IRQs */
    -
    556  regWr(rHIRQ, HIRQ_sendback);
    -
    557  return ( HIRQ_sendback);
    +
    488  regWr(rHIEN, bmCONDETIE | bmFRAMEIE); //connection detection
    +
    489 
    +
    490  /* check if device is connected */
    +
    491  regWr(rHCTL, bmSAMPLEBUS); // sample USB bus
    +
    492  while(!(regRd(rHCTL) & bmSAMPLEBUS)); //wait for sample operation to finish
    +
    493 
    +
    494  busprobe(); //check if anything is connected
    +
    495 
    +
    496  regWr(rHIRQ, bmCONDETIRQ); //clear connection detect interrupt
    +
    497  regWr(rCPUCTL, 0x01); //enable interrupt pin
    +
    498 
    +
    499  // GPX pin on. This is done here so that busprobe will fail if we have a switch connected.
    +
    500  regWr(rPINCTL, (bmFDUPSPI | bmINTLEVEL));
    +
    501 
    +
    502  return ( 0);
    +
    503 }
    +
    504 
    +
    505 /* probe bus to determine device presence and speed and switch host to this speed */
    +
    506 template< typename SPI_SS, typename INTR >
    +
    507 void MAX3421e< SPI_SS, INTR >::busprobe() {
    +
    508  uint8_t bus_sample;
    +
    509  bus_sample = regRd(rHRSL); //Get J,K status
    +
    510  bus_sample &= (bmJSTATUS | bmKSTATUS); //zero the rest of the byte
    +
    511  switch(bus_sample) { //start full-speed or low-speed host
    +
    512  case( bmJSTATUS):
    +
    513  if((regRd(rMODE) & bmLOWSPEED) == 0) {
    +
    514  regWr(rMODE, MODE_FS_HOST); //start full-speed host
    +
    515  vbusState = FSHOST;
    +
    516  } else {
    +
    517  regWr(rMODE, MODE_LS_HOST); //start low-speed host
    +
    518  vbusState = LSHOST;
    +
    519  }
    +
    520  break;
    +
    521  case( bmKSTATUS):
    +
    522  if((regRd(rMODE) & bmLOWSPEED) == 0) {
    +
    523  regWr(rMODE, MODE_LS_HOST); //start low-speed host
    +
    524  vbusState = LSHOST;
    +
    525  } else {
    +
    526  regWr(rMODE, MODE_FS_HOST); //start full-speed host
    +
    527  vbusState = FSHOST;
    +
    528  }
    +
    529  break;
    +
    530  case( bmSE1): //illegal state
    +
    531  vbusState = SE1;
    +
    532  break;
    +
    533  case( bmSE0): //disconnected state
    +
    534  regWr(rMODE, bmDPPULLDN | bmDMPULLDN | bmHOST | bmSEPIRQ);
    +
    535  vbusState = SE0;
    +
    536  break;
    +
    537  }//end switch( bus_sample )
    +
    538 }
    +
    539 
    +
    540 /* MAX3421 state change task and interrupt handler */
    +
    541 template< typename SPI_SS, typename INTR >
    +
    542 uint8_t MAX3421e< SPI_SS, INTR >::Task(void) {
    +
    543  uint8_t rcode = 0;
    +
    544  uint8_t pinvalue;
    +
    545  //USB_HOST_SERIAL.print("Vbus state: ");
    +
    546  //USB_HOST_SERIAL.println( vbusState, HEX );
    +
    547  pinvalue = INTR::IsSet(); //Read();
    +
    548  //pinvalue = digitalRead( MAX_INT );
    +
    549  if(pinvalue == 0) {
    +
    550  rcode = IntHandler();
    +
    551  }
    +
    552  // pinvalue = digitalRead( MAX_GPX );
    +
    553  // if( pinvalue == LOW ) {
    +
    554  // GpxHandler();
    +
    555  // }
    +
    556  // usbSM(); //USB state machine
    +
    557  return ( rcode);
    558 }
    -
    559 //template< typename SPI_SS, typename INTR >
    -
    560 //uint8_t MAX3421e< SPI_SS, INTR >::GpxHandler()
    -
    561 //{
    -
    562 // uint8_t GPINIRQ = regRd( rGPINIRQ ); //read GPIN IRQ register
    -
    569 // return( GPINIRQ );
    -
    570 //}
    -
    571 
    -
    572 #endif // _USBHOST_H_
    +
    559 
    +
    560 template< typename SPI_SS, typename INTR >
    +
    561 uint8_t MAX3421e< SPI_SS, INTR >::IntHandler() {
    +
    562  uint8_t HIRQ;
    +
    563  uint8_t HIRQ_sendback = 0x00;
    +
    564  HIRQ = regRd(rHIRQ); //determine interrupt source
    +
    565  //if( HIRQ & bmFRAMEIRQ ) { //->1ms SOF interrupt handler
    +
    566  // HIRQ_sendback |= bmFRAMEIRQ;
    +
    567  //}//end FRAMEIRQ handling
    +
    568  if(HIRQ & bmCONDETIRQ) {
    +
    569  busprobe();
    +
    570  HIRQ_sendback |= bmCONDETIRQ;
    +
    571  }
    +
    572  /* End HIRQ interrupts handling, clear serviced IRQs */
    +
    573  regWr(rHIRQ, HIRQ_sendback);
    +
    574  return ( HIRQ_sendback);
    +
    575 }
    +
    576 //template< typename SPI_SS, typename INTR >
    +
    577 //uint8_t MAX3421e< SPI_SS, INTR >::GpxHandler()
    +
    578 //{
    +
    579 // uint8_t GPINIRQ = regRd( rGPINIRQ ); //read GPIN IRQ register
    +
    586 // return( GPINIRQ );
    +
    587 //}
    +
    588 
    +
    589 #endif // _USBHOST_H_
    GPX_VBDET
    #define GPX_VBDET
    Definition: max3421e.h:82
    rIOPINS1
    #define rIOPINS1
    Definition: max3421e.h:88
    -
    MAX3421e::busprobe
    void busprobe()
    Definition: usbhost.h:490
    +
    MAX3421e::busprobe
    void busprobe()
    Definition: usbhost.h:507
    rHIEN
    #define rHIEN
    Definition: max3421e.h:155
    FSHOST
    #define FSHOST
    Definition: max3421e.h:37
    rHCTL
    #define rHCTL
    Definition: max3421e.h:181
    @@ -661,33 +672,34 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    bmCONDETIE
    #define bmCONDETIE
    Definition: max3421e.h:163
    bmSE1
    #define bmSE1
    Definition: max3421e.h:211
    bmCHIPRES
    #define bmCHIPRES
    Definition: max3421e.h:64
    -
    MAX3421e::getVbusState
    uint8_t getVbusState(void)
    Definition: usbhost.h:151
    +
    MAX3421e::getVbusState
    uint8_t getVbusState(void)
    Definition: usbhost.h:152
    rCPUCTL
    #define rCPUCTL
    Definition: max3421e.h:67
    bmJSTATUS
    #define bmJSTATUS
    Definition: max3421e.h:209
    -
    MAX3421e::reset
    uint16_t reset()
    Definition: usbhost.h:395
    +
    MAX3421e::reset
    uint16_t reset()
    Definition: usbhost.h:412
    MODE_LS_HOST
    #define MODE_LS_HOST
    Definition: max3421e.h:232
    +
    MAX3421e::gpioRdOutput
    uint8_t gpioRdOutput()
    Reads the current GPI output values.
    Definition: usbhost.h:401
    bmINTLEVEL
    #define bmINTLEVEL
    Definition: max3421e.h:76
    -
    MAX3421e::gpioWr
    void gpioWr(uint8_t data)
    Definition: usbhost.h:273
    -
    MAX3421e::Task
    uint8_t Task()
    Definition: usbhost.h:525
    +
    MAX3421e::gpioWr
    void gpioWr(uint8_t data)
    Definition: usbhost.h:274
    +
    MAX3421e::Task
    uint8_t Task()
    Definition: usbhost.h:542
    rUSBCTL
    #define rUSBCTL
    Definition: max3421e.h:62
    bmSE0
    #define bmSE0
    Definition: max3421e.h:210
    bmHOST
    #define bmHOST
    Definition: max3421e.h:170
    bmSEPIRQ
    #define bmSEPIRQ
    Definition: max3421e.h:174
    -
    MAX3421e::gpioRd
    uint8_t gpioRd()
    Definition: usbhost.h:384
    -
    MAX3421e::Init
    int8_t Init()
    Definition: usbhost.h:409
    +
    MAX3421e::gpioRd
    uint8_t gpioRd()
    Reads the current GPI input values.
    Definition: usbhost.h:388
    +
    MAX3421e::Init
    int8_t Init()
    Definition: usbhost.h:426
    MAX3421e::GpxHandler
    uint8_t GpxHandler()
    LSHOST
    #define LSHOST
    Definition: max3421e.h:38
    rMODE
    #define rMODE
    Definition: max3421e.h:167
    MODE_FS_HOST
    #define MODE_FS_HOST
    Definition: max3421e.h:231
    -
    MAX3421e::vbusPower
    void vbusPower(VBUS_t state)
    Definition: usbhost.h:147
    +
    MAX3421e::vbusPower
    void vbusPower(VBUS_t state)
    Definition: usbhost.h:148
    bmKSTATUS
    #define bmKSTATUS
    Definition: max3421e.h:208
    rHRSL
    #define rHRSL
    Definition: max3421e.h:203
    -
    MAX3421e::bytesRd
    uint8_t * bytesRd(uint8_t reg, uint8_t nbytes, uint8_t *data_p)
    Definition: usbhost.h:321
    +
    MAX3421e::bytesRd
    uint8_t * bytesRd(uint8_t reg, uint8_t nbytes, uint8_t *data_p)
    Definition: usbhost.h:322
    XMEM_ACQUIRE_SPI
    #define XMEM_ACQUIRE_SPI()
    Definition: settings.h:136
    bmLOWSPEED
    #define bmLOWSPEED
    Definition: max3421e.h:171
    -
    MAX3421e::bytesWr
    uint8_t * bytesWr(uint8_t reg, uint8_t nbytes, uint8_t *data_p)
    Definition: usbhost.h:219
    +
    MAX3421e::bytesWr
    uint8_t * bytesWr(uint8_t reg, uint8_t nbytes, uint8_t *data_p)
    Definition: usbhost.h:220
    SPi
    Definition: usbhost.h:38
    rHIRQ
    #define rHIRQ
    Definition: max3421e.h:144
    rUSBIRQ
    #define rUSBIRQ
    Definition: max3421e.h:50
    @@ -695,12 +707,12 @@ var searchBox = new SearchBox("searchBox", "search",false,'Search');
    bmFDUPSPI
    #define bmFDUPSPI
    Definition: max3421e.h:75
    rPINCTL
    #define rPINCTL
    Definition: max3421e.h:73
    VBUS_t
    VBUS_t
    Definition: usbhost.h:127
    -
    MAX3421e::regWr
    void regWr(uint8_t reg, uint8_t data)
    Definition: usbhost.h:176
    +
    MAX3421e::regWr
    void regWr(uint8_t reg, uint8_t data)
    Definition: usbhost.h:177
    bmFRAMEIE
    #define bmFRAMEIE
    Definition: max3421e.h:164
    -
    MAX3421e::IntHandler
    uint8_t IntHandler()
    Definition: usbhost.h:544
    +
    MAX3421e::IntHandler
    uint8_t IntHandler()
    Definition: usbhost.h:561
    bmOSCOKIRQ
    #define bmOSCOKIRQ
    Definition: max3421e.h:54
    -
    MAX3421e::regRd
    uint8_t regRd(uint8_t reg)
    Definition: usbhost.h:282
    -
    MAX3421e::MAX3421e
    MAX3421e()
    Definition: usbhost.h:165
    +
    MAX3421e::regRd
    uint8_t regRd(uint8_t reg)
    Definition: usbhost.h:283
    +
    MAX3421e::MAX3421e
    MAX3421e()
    Definition: usbhost.h:166
    USB_SPI
    #define USB_SPI
    Definition: settings.h:33
    SE0
    #define SE0
    Definition: max3421e.h:35