kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

musb work well with tm4c123

This commit is contained in:
hathach 2021-11-08 16:41:08 +07:00
parent 91646d039c
commit 6fea50f735
7 changed files with 206 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/bsp/ek-tm4c123gxl/board.mk
View File

@ -25,6 +25,7 @@ INC += \
$(TOP)/hw/bsp
SRC_C += \
src/portable/mentor/musb/dcd_musb.c \
$(MCU_DIR)/Source/system_TM4C123.c \
$(MCU_DIR)/Source/GCC/tm4c123_startup.c

27
hw/bsp/ek-tm4c123gxl/tm4c123gxl.c
View File

@ -15,6 +15,18 @@
#define LED_PIN_GREEN 3
#define LED_STATE_ON 1
//--------------------------------------------------------------------+
// Forward USB interrupt events to TinyUSB IRQ Handler
//--------------------------------------------------------------------+
void USB0_Handler(void)
{
tud_int_handler(0);
}
//--------------------------------------------------------------------+
// MACRO TYPEDEF CONSTANT ENUM
//--------------------------------------------------------------------+
static void board_uart_init (void)
{
SYSCTL->RCGCUART |= (1 << 0); // Enable the clock to UART0
@ -25,7 +37,6 @@ static void board_uart_init(void)
GPIOA->DEN |= (1 << 0) | (1 << 1); // Enable the digital functionality in PA0 and PA1
/** BAUDRATE = 9600 bits per second, refer manual for calculation **/
UART0->CTL &= ~(1 << 0); // Disable UART0 by clearing UARTEN bit in the UARTCTL register
UART0->IBRD = 325; // Write the integer portion of the BRD to the UARTIRD register
UART0->FBRD = 33; // Write the fractional portion of the BRD to the UARTFBRD registerer
@ -42,7 +53,8 @@ static void initialize_board_led(GPIOA_Type* port, uint8_t PinMsk, uint8_t dirms
SYSCTL->RCGCGPIO |= (1 << 5);
/* Let the clock stabilize */
while(! ((SYSCTL->PRGPIO) & (1<<5)) ) ;
while ( !((SYSCTL->PRGPIO) & (1 << 5)) )
;
/* Port Digital Enable */
port->DEN |= PinMsk;
@ -86,7 +98,7 @@ void board_init(void)
/* Reset USB */
SYSCTL->SRCR2 |= (1u << 16);
for (volatile uint8_t i=0; i<20; i++);
for ( volatile uint8_t i = 0; i < 20; i++ ) {}
SYSCTL->SRCR2 &= ~(1u << 16);
@ -100,7 +112,8 @@ void board_init(void)
SYSCTL->RCGCGPIO |= (1u << 3);
/* Let the clock stabilize */
while(!(SYSCTL->PRGPIO & (1u<<3)));
while ( !(SYSCTL->PRGPIO & (1u << 3)) )
;
/* USB IOs to Analog Mode */
GPIOD->AFSEL &= ~((1u << 4) | (1u << 5));
@ -138,7 +151,7 @@ int board_uart_write(void const* buf, int len)
for ( int i = 0; i < len; i++ )
{
while((UART0->FR &(1<<5)) != 0); // Poll until previous data was shofted out
while ( (UART0->FR & (1 << 5)) != 0 ) {} // Poll until previous data was shofted out
UART0->DR = data[i]; // Write UART0 DATA REGISTER
}
@ -147,11 +160,11 @@ int board_uart_write(void const* buf, int len)
int board_uart_read (uint8_t *buf, int len)
{
(void) buf; (void) len;
(void) buf;
(void) len;
return 0;
}
#if CFG_TUSB_OS == OPT_OS_NONE
volatile uint32_t system_ticks = 0;
void SysTick_Handler (void)

5
src/device/dcd_attr.h
View File

@ -143,7 +143,10 @@
#define DCD_ATTR_ENDPOINT_EXCLUSIVE_NUMBER
//------------- TI -------------//
#elif TU_CHECK_MCU(OPT_MCU_MSP430x5xx, OPT_MCU_MSP432E4xx)
#elif TU_CHECK_MCU(OPT_MCU_MSP430x5xx)
#define DCD_ATTR_ENDPOINT_MAX 8
#elif TU_CHECK_MCU(OPT_MCU_MSP432E4xx, OPT_MCU_TM4C123, OPT_MCU_TM4C129)
#define DCD_ATTR_ENDPOINT_MAX 8
//------------- ValentyUSB -------------//

18
src/portable/mentor/musb/dcd_musb.c
View File

@ -26,7 +26,7 @@
#include "tusb_option.h"
#if CFG_TUSB_MCU == OPT_MCU_MSP432E4xx
#if TU_CHECK_MCU(OPT_MCU_MSP432E4xx, OPT_MCU_TM4C123, OPT_MCU_TM4C129)
#if __GNUC__ > 8 && defined(__ARM_FEATURE_UNALIGNED)
/* GCC warns that an address may be unaligned, even though
@ -35,7 +35,21 @@ _Pragma("GCC diagnostic ignored \"-Waddress-of-packed-member\"");
#endif
#include "device/dcd.h"
#include "msp.h"
#if TU_CHECK_MCU(OPT_MCU_MSP432E4xx)
#include "musb_msp432e.h"
#elif TU_CHECK_MCU(OPT_MCU_TM4C123, OPT_MCU_TM4C129)
#include "musb_tm4c.h"
// HACK generalize later
#include "musb_type.h"
#define FIFO0_WORD FIFO0
#define FIFO1_WORD FIFO1
#else
#error "Unsupported MCUs"
#endif
/*------------------------------------------------------------------
* MACRO TYPEDEF CONSTANT ENUM DECLARATION

40
src/portable/mentor/musb/musb_msp432e.h Normal file
View File

@ -0,0 +1,40 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2021, Ha Thach (tinyusb.org)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* This file is part of the TinyUSB stack.
*/
#ifndef _TUSB_MUSB_MSP432E_H_
#define _TUSB_MUSB_MSP432E_H_
#ifdef __cplusplus
extern "C" {
#endif
#include "msp.h"
#ifdef __cplusplus
}
#endif
#endif

45
src/portable/mentor/musb/musb_tm4c.h Normal file
View File

@ -0,0 +1,45 @@
/*
* The MIT License (MIT)
*
* Copyright (c) 2021, Ha Thach (tinyusb.org)
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* This file is part of the TinyUSB stack.
*/
#ifndef _TUSB_MUSB_TM4C_H_
#define _TUSB_MUSB_TM4C_H_
#ifdef __cplusplus
extern "C" {
#endif
#if CFG_TUSB_MCU == OPT_MCU_TM4C123
#include "TM4C123.h"
//#elif CFG_TUSB_MCU == OPT_MCU_TM4C129
#else
#error "Unsupported MCUs"
#endif
#ifdef __cplusplus
}
#endif
#endif

3
src/tusb_option.h
View File

@ -87,7 +87,8 @@
// TI MSP430
#define OPT_MCU_MSP430x5xx 500 ///< TI MSP430x5xx
#define OPT_MCU_MSP432E4xx 510 ///< TI MSP432E4xx
#define OPT_MCU_TM4C123 511 ///< TI Tiva C 123x
#define OPT_MCU_TM4C123 511 ///< TI Tiva-C 123x
#define OPT_MCU_TM4C129 512 ///< TI Tiva-C 129x
// ValentyUSB eptri
#define OPT_MCU_VALENTYUSB_EPTRI 600 ///< Fomu eptri config