diff options
| author | Ha Thach <[email protected]> | 2024-04-09 17:25:23 +0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-04-09 17:25:23 +0700 |
| commit | a5b109b6995acfa0b14ae41dcce16687cc033d2b (patch) | |
| tree | edbd8023218aeb9f6e3ad697ad8b0ab438e7b843 /hw | |
| parent | 1195fa8ee36f704704a003a386fc47c2a9204474 (diff) | |
| parent | 6c2f71ad19bbe9e3d346b5631ede9557b4252088 (diff) | |
Merge pull request #1580 from MatiMcFly/master
Fixing Renesas register write protection and some compiler warnings in static code analysis
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/bsp/rx/boards/gr_citrus/gr_citrus.c | 3 | ||||
| -rw-r--r-- | hw/bsp/rx/boards/rx65n_target/rx65n_target.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/hw/bsp/rx/boards/gr_citrus/gr_citrus.c b/hw/bsp/rx/boards/gr_citrus/gr_citrus.c index 5078c7569..26ad4a6aa 100644 --- a/hw/bsp/rx/boards/gr_citrus/gr_citrus.c +++ b/hw/bsp/rx/boards/gr_citrus/gr_citrus.c @@ -203,9 +203,10 @@ void board_init(void) IEN(SCI0, TEI0) = 1; /* Enable USB0 */ + unsigned short oldPRCR = SYSTEM.PRCR.WORD; SYSTEM.PRCR.WORD = SYSTEM_PRCR_PRKEY | SYSTEM_PRCR_PRC1; MSTP(USB0) = 0; - SYSTEM.PRCR.WORD = SYSTEM_PRCR_PRKEY; + SYSTEM.PRCR.WORD = SYSTEM_PRCR_PRKEY | oldPRCR; } //--------------------------------------------------------------------+ diff --git a/hw/bsp/rx/boards/rx65n_target/rx65n_target.c b/hw/bsp/rx/boards/rx65n_target/rx65n_target.c index 032dac810..66a319541 100644 --- a/hw/bsp/rx/boards/rx65n_target/rx65n_target.c +++ b/hw/bsp/rx/boards/rx65n_target/rx65n_target.c @@ -249,9 +249,10 @@ void board_init(void) EN(SCI5, TEI5) = 1; /* Enable USB0 */ + unsigned short oldPRCR = SYSTEM.PRCR.WORD; SYSTEM.PRCR.WORD = SYSTEM_PRCR_PRKEY | SYSTEM_PRCR_PRC1; MSTP(USB0) = 0; - SYSTEM.PRCR.WORD = SYSTEM_PRCR_PRKEY; + SYSTEM.PRCR.WORD = SYSTEM_PRCR_PRKEY | oldPRCR; /* setup USBI0 interrupt. */ IR(USB0, USBI0) = 0; @@ -277,6 +278,7 @@ int board_uart_read(uint8_t* buf, int len) sci_buf[1].buf = buf; sci_buf[1].cnt = len; SCI5.SCR.BYTE |= SCI_SCR_RE | SCI_SCR_RIE; + // TODO change to non blocking, return -1 immediately if no data while (SCI5.SCR.BIT.RE) ; return len - sci_buf[1].cnt; } |