File tree Expand file tree Collapse file tree 8 files changed +3
-39
lines changed
libraries/mbed/targets/hal/TARGET_NXP Expand file tree Collapse file tree 8 files changed +3
-39
lines changed Original file line number Diff line number Diff line change @@ -28,16 +28,16 @@ uint32_t gpio_set(PinName pin) {
28
28
(1 ) : (0 );
29
29
30
30
pin_function (pin , f );
31
- return ((pin & 0x0F00 ) >> 8 );
31
+ return ((pin & 0x0F00 ) >> PIN_SHIFT );
32
32
}
33
33
34
34
void gpio_init (gpio_t * obj , PinName pin , PinDirection direction ) {
35
35
if (pin == NC ) return ;
36
36
37
37
obj -> pin = pin ;
38
38
LPC_GPIO_TypeDef * port_reg = ((LPC_GPIO_TypeDef * ) (LPC_GPIO0_BASE + (((pin & 0xF000 ) >> PORT_SHIFT ) * 0x10000 )));
39
-
40
- obj -> reg_mask_read = & port_reg -> MASKED_ACCESS [gpio_set (pin ) + 1 ];
39
+
40
+ obj -> reg_mask_read = & port_reg -> MASKED_ACCESS [1 << gpio_set (pin )];
41
41
obj -> reg_dir = & port_reg -> DIR ;
42
42
obj -> reg_write = & port_reg -> DATA ;
43
43
Original file line number Diff line number Diff line change @@ -249,12 +249,6 @@ int serial_getc(serial_t *obj) {
249
249
void serial_putc (serial_t * obj , int c ) {
250
250
while (!serial_writable (obj ));
251
251
obj -> uart -> THR = c ;
252
-
253
- #warning TODO(@toyowata): need to fix a full-duplex bug? https://mbed.org/forum/bugs-suggestions/topic/4473/
254
- uint32_t lsr = obj->uart->LSR;
255
- lsr = lsr ;
256
- uint32_t thr = obj -> uart -> THR ;
257
- thr = thr ;
258
252
}
259
253
260
254
int serial_readable (serial_t * obj ) {
Original file line number Diff line number Diff line change @@ -247,11 +247,6 @@ int serial_getc(serial_t *obj) {
247
247
void serial_putc (serial_t * obj , int c ) {
248
248
while (!serial_writable (obj ));
249
249
obj -> uart -> THR = c ;
250
-
251
- uint32_t lsr = obj -> uart -> LSR ;
252
- lsr = lsr ;
253
- uint32_t thr = obj -> uart -> THR ;
254
- thr = thr ;
255
250
}
256
251
257
252
int serial_readable (serial_t * obj ) {
Original file line number Diff line number Diff line change @@ -247,11 +247,6 @@ int serial_getc(serial_t *obj) {
247
247
void serial_putc (serial_t * obj , int c ) {
248
248
while (!serial_writable (obj ));
249
249
obj -> uart -> THR = c ;
250
-
251
- uint32_t lsr = obj -> uart -> LSR ;
252
- lsr = lsr ;
253
- uint32_t thr = obj -> uart -> THR ;
254
- thr = thr ;
255
250
}
256
251
257
252
int serial_readable (serial_t * obj ) {
Original file line number Diff line number Diff line change @@ -283,11 +283,6 @@ int serial_getc(serial_t *obj) {
283
283
void serial_putc (serial_t * obj , int c ) {
284
284
while (!serial_writable (obj ));
285
285
obj -> uart -> THR = c ;
286
-
287
- uint32_t lsr = obj -> uart -> LSR ;
288
- lsr = lsr ;
289
- uint32_t thr = obj -> uart -> THR ;
290
- thr = thr ;
291
286
}
292
287
293
288
int serial_readable (serial_t * obj ) {
Original file line number Diff line number Diff line change @@ -283,11 +283,6 @@ int serial_getc(serial_t *obj) {
283
283
void serial_putc (serial_t * obj , int c ) {
284
284
while (!serial_writable (obj ));
285
285
obj -> uart -> THR = c ;
286
-
287
- uint32_t lsr = obj -> uart -> LSR ;
288
- lsr = lsr ;
289
- uint32_t thr = obj -> uart -> THR ;
290
- thr = thr ;
291
286
}
292
287
293
288
int serial_readable (serial_t * obj ) {
Original file line number Diff line number Diff line change @@ -276,11 +276,6 @@ int serial_getc(serial_t *obj) {
276
276
void serial_putc (serial_t * obj , int c ) {
277
277
while (!serial_writable (obj ));
278
278
obj -> uart -> THR = c ;
279
-
280
- uint32_t lsr = obj -> uart -> LSR ;
281
- lsr = lsr ;
282
- uint32_t thr = obj -> uart -> THR ;
283
- thr = thr ;
284
279
}
285
280
286
281
int serial_readable (serial_t * obj ) {
Original file line number Diff line number Diff line change @@ -257,11 +257,6 @@ int serial_getc(serial_t *obj) {
257
257
void serial_putc (serial_t * obj , int c ) {
258
258
while (!serial_writable (obj ));
259
259
obj -> uart -> THR = c ;
260
-
261
- uint32_t lsr = obj -> uart -> LSR ;
262
- lsr = lsr ;
263
- uint32_t thr = obj -> uart -> THR ;
264
- thr = thr ;
265
260
}
266
261
267
262
int serial_readable (serial_t * obj ) {
You can’t perform that action at this time.
0 commit comments