Skip to content

Commit b3d935c

Browse files
Ganesh Ramachandranadbridge
Ganesh Ramachandran
authored and
adbridge
committed
Fix for pinmap & usticker free() to TMPM3H6
Implemented usticker free() Fix pinmap data overwriting to same port pins
1 parent 5e105dd commit b3d935c

File tree

2 files changed

+51
-45
lines changed

2 files changed

+51
-45
lines changed

‎targets/TARGET_TOSHIBA/TARGET_TMPM3H6/pinmap.c

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -120,77 +120,77 @@ void pin_mode(PinName pin, PinMode mode)
120120

121121
switch (port) {
122122
case PortA:
123-
if (mode == OpenDrain) TSB_PA->OD = val;
124-
else if (mode == PullUp) TSB_PA->PUP = val;
125-
else if (mode == PullDown || mode == PullDefault) TSB_PA->PDN = val;
123+
if (mode == OpenDrain) TSB_PA->OD |= val;
124+
else if (mode == PullUp) TSB_PA->PUP |= val;
125+
else if (mode == PullDown || mode == PullDefault) TSB_PA->PDN |= val;
126126
break;
127127
case PortB:
128-
if (mode == OpenDrain) TSB_PB->OD = val;
129-
else if (mode == PullUp) TSB_PB->PUP = val;
130-
else if (mode == PullDown || mode == PullDefault) TSB_PB->PDN = val;
128+
if (mode == OpenDrain) TSB_PB->OD |= val;
129+
else if (mode == PullUp) TSB_PB->PUP |= val;
130+
else if (mode == PullDown || mode == PullDefault) TSB_PB->PDN |= val;
131131
break;
132132
case PortC:
133-
if (mode == OpenDrain) TSB_PC->OD = val;
134-
else if (mode == PullUp) TSB_PC->PUP = val;
135-
else if (mode == PullDown || mode == PullDefault) TSB_PC->PDN = val;
133+
if (mode == OpenDrain) TSB_PC->OD |= val;
134+
else if (mode == PullUp) TSB_PC->PUP |= val;
135+
else if (mode == PullDown || mode == PullDefault) TSB_PC->PDN |= val;
136136
break;
137137
case PortD:
138-
if (mode == OpenDrain) TSB_PD->OD = val;
139-
else if (mode == PullUp) TSB_PD->PUP = val;
140-
else if (mode == PullDown || mode == PullDefault) TSB_PD->PDN = val;
138+
if (mode == OpenDrain) TSB_PD->OD |= val;
139+
else if (mode == PullUp) TSB_PD->PUP |= val;
140+
else if (mode == PullDown || mode == PullDefault) TSB_PD->PDN |= val;
141141
break;
142142
case PortE:
143-
if (mode == OpenDrain) TSB_PE->OD = val;
144-
else if (mode == PullUp) TSB_PE->PUP = val;
145-
else if (mode == PullDown || mode == PullDefault) TSB_PE->PDN = val;
143+
if (mode == OpenDrain) TSB_PE->OD |= val;
144+
else if (mode == PullUp) TSB_PE->PUP |= val;
145+
else if (mode == PullDown || mode == PullDefault) TSB_PE->PDN |= val;
146146
break;
147147
case PortF:
148-
if (mode == OpenDrain) TSB_PF->OD = val;
149-
else if (mode == PullUp) TSB_PF->PUP = val;
150-
else if (mode == PullDown || mode == PullDefault) TSB_PF->PDN = val;
148+
if (mode == OpenDrain) TSB_PF->OD |= val;
149+
else if (mode == PullUp) TSB_PF->PUP |= val;
150+
else if (mode == PullDown || mode == PullDefault) TSB_PF->PDN |= val;
151151
break;
152152
case PortG:
153-
if (mode == OpenDrain) TSB_PG->OD = val;
154-
else if (mode == PullUp) TSB_PG->PUP = val;
155-
else if (mode == PullDown || mode == PullDefault) TSB_PG->PDN = val;
153+
if (mode == OpenDrain) TSB_PG->OD |= val;
154+
else if (mode == PullUp) TSB_PG->PUP |= val;
155+
else if (mode == PullDown || mode == PullDefault) TSB_PG->PDN |= val;
156156
break;
157157
case PortH:
158-
if (mode == PullDown) TSB_PH->PDN = val;
158+
if (mode == PullDown) TSB_PH->PDN |= val;
159159
break;
160160
case PortJ:
161-
if (mode == OpenDrain) TSB_PJ->OD = val;
162-
else if (mode == PullUp) TSB_PJ->PUP = val;
163-
else if (mode == PullDown || mode == PullDefault) TSB_PJ->PDN = val;
161+
if (mode == OpenDrain) TSB_PJ->OD |= val;
162+
else if (mode == PullUp) TSB_PJ->PUP |= val;
163+
else if (mode == PullDown || mode == PullDefault) TSB_PJ->PDN |= val;
164164
break;
165165
case PortK:
166-
if (mode == OpenDrain) TSB_PK->OD = val;
167-
else if (mode == PullUp) TSB_PK->PUP = val;
168-
else if (mode == PullDown || mode == PullDefault) TSB_PK->PDN = val;
166+
if (mode == OpenDrain) TSB_PK->OD |= val;
167+
else if (mode == PullUp) TSB_PK->PUP |= val;
168+
else if (mode == PullDown || mode == PullDefault) TSB_PK->PDN |= val;
169169
break;
170170
case PortL:
171-
if (mode == OpenDrain) TSB_PL->OD = val;
172-
else if (mode == PullUp) TSB_PL->PUP = val;
173-
else if (mode == PullDown || mode == PullDefault) TSB_PL->PDN = val;
171+
if (mode == OpenDrain) TSB_PL->OD |= val;
172+
else if (mode == PullUp) TSB_PL->PUP |= val;
173+
else if (mode == PullDown || mode == PullDefault) TSB_PL->PDN |= val;
174174
break;
175175
case PortM:
176-
if (mode == OpenDrain) TSB_PM->OD = val;
177-
else if (mode == PullUp) TSB_PM->PUP = val;
178-
else if (mode == PullDown || mode == PullDefault) TSB_PM->PDN = val;
176+
if (mode == OpenDrain) TSB_PM->OD |= val;
177+
else if (mode == PullUp) TSB_PM->PUP |= val;
178+
else if (mode == PullDown || mode == PullDefault) TSB_PM->PDN |= val;
179179
break;
180180
case PortN:
181-
if (mode == OpenDrain) TSB_PN->OD = val;
182-
else if (mode == PullUp) TSB_PN->PUP = val;
183-
else if (mode == PullDown || mode == PullDefault) TSB_PN->PDN = val;
181+
if (mode == OpenDrain) TSB_PN->OD |= val;
182+
else if (mode == PullUp) TSB_PN->PUP |= val;
183+
else if (mode == PullDown || mode == PullDefault) TSB_PN->PDN |= val;
184184
break;
185185
case PortP:
186-
if (mode == OpenDrain) TSB_PP->OD = val;
187-
else if (mode == PullUp) TSB_PP->PUP = val;
188-
else if (mode == PullDown || mode == PullDefault) TSB_PP->PDN = val;
186+
if (mode == OpenDrain) TSB_PP->OD |= val;
187+
else if (mode == PullUp) TSB_PP->PUP |= val;
188+
else if (mode == PullDown || mode == PullDefault) TSB_PP->PDN |= val;
189189
break;
190190
case PortR:
191-
if (mode == OpenDrain) TSB_PR->OD = val;
192-
else if (mode == PullUp) TSB_PR->PUP = val;
193-
else if (mode == PullDown || mode == PullDefault) TSB_PR->PDN = val;
191+
if (mode == OpenDrain) TSB_PR->OD |= val;
192+
else if (mode == PullUp) TSB_PR->PUP |= val;
193+
else if (mode == PullDown || mode == PullDefault) TSB_PR->PDN |= val;
194194
break;
195195
default:
196196
break;

‎targets/TARGET_TOSHIBA/TARGET_TMPM3H6/us_ticker.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
static bool us_ticker_inited = false; // Is ticker initialized yet?
2020

21-
const ticker_info_t* us_ticker_get_info()
21+
const ticker_info_t* us_ticker_get_info(void)
2222
{
2323
static const ticker_info_t info = {
2424
1248125, // (39.94 MHz / 32 )
@@ -86,5 +86,11 @@ void us_ticker_clear_interrupt(void)
8686

8787
void us_ticker_free(void)
8888
{
89-
89+
TSB_CG_FSYSENA_IPENA26 = TXZ_DISABLE;
90+
us_ticker_inited = false;
91+
TSB_T32A0->RUNC = (T32A_RUN_ENABLE | T32A_COUNT_STOP);
92+
// Disable and clear interrupts in NVIC
93+
TSB_T32A0->STC = T32A_INT_MASK;
94+
NVIC_ClearPendingIRQ(INTT32A00C_IRQn);
95+
NVIC_DisableIRQ(INTT32A00C_IRQn);
9096
}

0 commit comments

Comments
 (0)