nrf5/modules: Updating machine uart module to use new hal uart interface name.

glennrub · glennrub · commit 9ddd62e73e16 · 2017-03-05T22:37:52.000+01:00
diff --git a/nrf5/modules/machine/uart.c b/nrf5/modules/machine/uart.c
@@ -111,11 +111,11 @@ STATIC bool uart_rx_wait(pyb_uart_obj_t *self, uint32_t timeout) {
 }
 
 int uart_rx_char(pyb_uart_obj_t *self) {
-    return (int)nrf_uart_char_read();
+    return (int)hal_uart_char_read();
 }
 
 STATIC void uart_tx_char(pyb_uart_obj_t * self, int c) {
-    nrf_uart_char_write((char)c);
+    hal_uart_char_write((char)c);
 }
 
 
@@ -225,7 +225,7 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, mp_uint_t n_args, con
     uart_init.cts_pin = &MICROPY_HW_UART1_CTS;
 #endif
 
-    nrf_uart_init(&uart_init);
+    hal_uart_init(&uart_init);
 
     return mp_const_none;
 }

Original file line number	Diff line number	Diff line change
`@@ -111,11 +111,11 @@ STATIC bool uart_rx_wait(pyb_uart_obj_t *self, uint32_t timeout) {`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`int uart_rx_char(pyb_uart_obj_t *self) {`
`114`		`- return (int)nrf_uart_char_read();`
	`114`	`+ return (int)hal_uart_char_read();`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`STATIC void uart_tx_char(pyb_uart_obj_t * self, int c) {`
`118`		`- nrf_uart_char_write((char)c);`
	`118`	`+ hal_uart_char_write((char)c);`
`119`	`119`	`}`
`120`	`120`
`121`	`121`
`@@ -225,7 +225,7 @@ STATIC mp_obj_t pyb_uart_init_helper(pyb_uart_obj_t *self, mp_uint_t n_args, con`
`225`	`225`	`uart_init.cts_pin = &MICROPY_HW_UART1_CTS;`
`226`	`226`	`#endif`
`227`	`227`
`228`		`- nrf_uart_init(&uart_init);`
	`228`	`+ hal_uart_init(&uart_init);`
`229`	`229`
`230`	`230`	`return mp_const_none;`
`231`	`231`	`}`