mirror of
https://github.com/hathach/tinyusb.git
synced 2025-03-29 10:20:57 +00:00
correct read()/write() retarget for msp430, fix msp430 button state
This commit is contained in:
parent
de333a6f18
commit
71a4076e73
@ -26,6 +26,13 @@
|
||||
|
||||
#include "board.h"
|
||||
|
||||
#if defined(__MSP430__)
|
||||
#define sys_write write
|
||||
#define sys_read read
|
||||
#else
|
||||
#define sys_write _write
|
||||
#define sys_read _read
|
||||
#endif
|
||||
//--------------------------------------------------------------------+
|
||||
// MACRO TYPEDEF CONSTANT ENUM DECLARATION
|
||||
//--------------------------------------------------------------------+
|
||||
@ -45,13 +52,13 @@
|
||||
|
||||
// newlib read()/write() retarget
|
||||
|
||||
TU_ATTR_USED int _write (int fhdl, const void *buf, size_t count)
|
||||
TU_ATTR_USED int sys_write (int fhdl, const void *buf, size_t count)
|
||||
{
|
||||
(void) fhdl;
|
||||
return board_uart_write(buf, count);
|
||||
}
|
||||
|
||||
TU_ATTR_USED int _read (int fhdl, char *buf, size_t count)
|
||||
TU_ATTR_USED int sys_read (int fhdl, char *buf, size_t count)
|
||||
{
|
||||
(void) fhdl;
|
||||
return board_uart_read((uint8_t*) buf, count);
|
||||
|
@ -34,7 +34,7 @@
|
||||
|
||||
#define BUTTON_PORT P1IN
|
||||
#define BUTTON_PIN BIT1
|
||||
#define BUTTON_STATE_ACTIVE 1
|
||||
#define BUTTON_STATE_ACTIVE 0
|
||||
|
||||
uint32_t cnt = 0;
|
||||
|
||||
@ -161,7 +161,7 @@ void board_led_write(bool state)
|
||||
|
||||
uint32_t board_button_read(void)
|
||||
{
|
||||
return (P1IN & BIT1);
|
||||
return ((P1IN & BIT1) >> 1) == BUTTON_STATE_ACTIVE;
|
||||
}
|
||||
|
||||
int board_uart_read(uint8_t * buf, int len)
|
||||
@ -173,7 +173,7 @@ int board_uart_read(uint8_t * buf, int len)
|
||||
buf[i] = UCA1RXBUF;
|
||||
}
|
||||
|
||||
return 0;
|
||||
return len;
|
||||
}
|
||||
|
||||
int board_uart_write(void const * buf, int len)
|
||||
@ -187,7 +187,7 @@ int board_uart_write(void const * buf, int len)
|
||||
UCA1TXBUF = char_buf[i];
|
||||
}
|
||||
|
||||
return 0;
|
||||
return len;
|
||||
}
|
||||
|
||||
#if CFG_TUSB_OS == OPT_OS_NONE
|
||||
|
Loading…
x
Reference in New Issue
Block a user