summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-04-09 02:13:18 +0700
committerhathach <[email protected]>2013-04-09 02:13:18 +0700
commitc036efff1ddbbbc0eee87e5d298ebe0f94b442be (patch)
tree0a2be74004c85d6820488d1a5a4c0083de47f404
parentb0a54cbf8f7a1591fa35d9b5a3a85f0a7bcc89e4 (diff)
adding code to allow configure MIC2555 to pull down D+/D- (still need bit bangding I2C on PB_0 PB_1)
add back port reset after get 8 bytes of device descriptor
-rw-r--r--demos/bsp/boards/board.h2
-rw-r--r--demos/bsp/boards/board_ea4357.c62
-rw-r--r--demos/bsp/boards/board_ea4357.h1
-rw-r--r--tinyusb/common/assertion.h2
-rw-r--r--tinyusb/host/ehci/ehci.c8
-rw-r--r--tinyusb/host/usbh.c2
6 files changed, 66 insertions, 11 deletions
diff --git a/demos/bsp/boards/board.h b/demos/bsp/boards/board.h
index 23286f835..1fdc4a878 100644
--- a/demos/bsp/boards/board.h
+++ b/demos/bsp/boards/board.h
@@ -57,7 +57,7 @@
#include <stdint.h>
#include "common/compiler/compiler.h"
-#include "common/binary.h" // This file is too good to not use
+#include "common/binary.h"
#define BOARD_AT86RF2XX 1
#define BOARD_LPCXPRESSO1347 2
diff --git a/demos/bsp/boards/board_ea4357.c b/demos/bsp/boards/board_ea4357.c
index 51801bcb4..5cc26fc33 100644
--- a/demos/bsp/boards/board_ea4357.c
+++ b/demos/bsp/boards/board_ea4357.c
@@ -39,6 +39,8 @@
#if BOARD == BOARD_EA4357
+#include "common/assertion.h" // TODO there is hal_debugger_ in assertion
+
#define UART_PORT LPC_USART0
#if 0
@@ -48,6 +50,59 @@ static const struct {
}leds[CFG_LED_NUMBER] = { {0, 8} };
#endif
+// MIC2555 1YML = 0101111, 0YML = 0101101
+#define MIC255_ADDR BIN8(0101111)
+
+static uint8_t mic255_regs_read(uint8_t regs_addr)
+{
+ uint8_t value;
+
+ ASSERT( SUCCESS == I2C_MasterTransferData(
+ LPC_I2C0,
+ & (I2C_M_SETUP_Type)
+ {
+ .sl_addr7bit = MIC255_ADDR,
+ .retransmissions_max = 3,
+
+ .tx_data = &regs_addr,
+ .tx_length = 1,
+
+ .rx_data = &value,
+ .rx_length = 1
+ },
+ I2C_TRANSFER_POLLING), 0xFF);
+
+ return value;
+}
+
+static bool mic255_regs_write(uint8_t regs_addr, uint8_t data)
+{
+ uint8_t xfer_data[2] = { regs_addr, data} ;
+
+ ASSERT( SUCCESS == I2C_MasterTransferData(
+ LPC_I2C0,
+ & (I2C_M_SETUP_Type)
+ {
+ .sl_addr7bit = MIC255_ADDR,
+ .retransmissions_max = 3,
+
+ .tx_data = xfer_data,
+ .tx_length = 2,
+ },
+ I2C_TRANSFER_POLLING), false);
+
+ return true;
+}
+
+
+static uint16_t mic255_get_vendorid(void)
+{
+ uint8_t vendor_low = mic255_regs_read(0);
+ uint8_t vendor_high = mic255_regs_read(1);
+
+ return (vendor_high << 8) | vendor_low;
+}
+
void board_init(void)
{
SystemInit();
@@ -61,6 +116,13 @@ void board_init(void)
// USB1 Power: EA4357 channel A U20 is enabled by SJ5 connected to pad 1-2, no more action required
scu_pinmux(0x2, 5, MD_PLN | MD_EZI | MD_ZI, FUNC2); // USB1_VBUS monitor presence, must be high for bus reset occur
+ // init I2C and set up MIC2555 to have 15k pull-down on USB1 D+ & D-
+// I2C_Init(LPC_I2C0, 100000);
+// I2C_Cmd(LPC_I2C0, ENABLE);
+//
+// ASSERT_INT(0x058d, mic255_get_vendorid(), (void) 0); // verify vendor id
+// ASSERT( mic255_regs_write(6, BIN8(1100)), (void) 0); // pull down D+/D- for host
+
#if 0
// Leds Init
for (uint8_t i=0; i<CFG_LED_NUMBER; i++)
diff --git a/demos/bsp/boards/board_ea4357.h b/demos/bsp/boards/board_ea4357.h
index ce4d482ea..b808ad9ed 100644
--- a/demos/bsp/boards/board_ea4357.h
+++ b/demos/bsp/boards/board_ea4357.h
@@ -60,6 +60,7 @@
#include "lpc43xx_cgu.h"
#include "lpc43xx_gpio.h"
#include "lpc43xx_uart.h"
+#include "lpc43xx_i2c.h"
#define CFG_LED_NUMBER 0
#define CFG_LED_ON (1)
diff --git a/tinyusb/common/assertion.h b/tinyusb/common/assertion.h
index 82a9c05fb..2a807b054 100644
--- a/tinyusb/common/assertion.h
+++ b/tinyusb/common/assertion.h
@@ -57,7 +57,7 @@ extern "C"
#endif
#include "tusb_option.h"
-#include "hal/hal.h"
+#include "hal/hal.h" // TODO find a way to break hal dependency
//--------------------------------------------------------------------+
// Compile-time Assert
diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c
index 7293c264a..cc2c5738e 100644
--- a/tinyusb/host/ehci/ehci.c
+++ b/tinyusb/host/ehci/ehci.c
@@ -452,14 +452,6 @@ void port_connect_status_change_isr(uint8_t hostid)
if (regs->portsc_bit.current_connect_status) // device plugged
{
hcd_port_reset(hostid);
-
- #ifndef _TEST_
- // TODO finalize delay after reset, hack delay 100 ms, otherwise speed is detected as LOW in most cases
- volatile uint32_t delay_us = 100000;
- delay_us *= (SystemCoreClock / 1000000) / 3;
- while(delay_us--);
- #endif
-
usbh_device_plugged_isr(hostid, regs->portsc_bit.nxp_port_speed); // NXP specific port speed
}else // device unplugged
{
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 0902c8ed9..fbf7c64b2 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -295,7 +295,7 @@ OSAL_TASK_DECLARE(usbh_enumeration_task)
)
);
-// hcd_port_reset( usbh_devices[0].core_id ); // reset port after 8 byte descriptor
+ hcd_port_reset( usbh_devices[0].core_id ); // reset port after 8 byte descriptor
//------------- Set new address -------------//
new_addr = get_new_address();