You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/08/24 18:56:11 UTC
[10/14] incubator-mynewt-core git commit: uart_hal;
don't include uart/uart.h in public header file.
uart_hal; don't include uart/uart.h in public header file.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/a181976c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/a181976c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/a181976c
Branch: refs/heads/sterly_refactor
Commit: a181976c8b0b64484f2323c5af3bce7813eb87fb
Parents: 1b2ae3f
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Wed Aug 24 09:34:16 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Wed Aug 24 09:34:16 2016 -0700
----------------------------------------------------------------------
drivers/uart/uart_hal/include/uart_hal/uart_hal.h | 3 +--
drivers/uart/uart_hal/src/uart_hal.c | 3 +++
hw/bsp/nrf52dk/src/os_bsp.c | 5 ++++-
3 files changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a181976c/drivers/uart/uart_hal/include/uart_hal/uart_hal.h
----------------------------------------------------------------------
diff --git a/drivers/uart/uart_hal/include/uart_hal/uart_hal.h b/drivers/uart/uart_hal/include/uart_hal/uart_hal.h
index 24776bc..702e91d 100644
--- a/drivers/uart/uart_hal/include/uart_hal/uart_hal.h
+++ b/drivers/uart/uart_hal/include/uart_hal/uart_hal.h
@@ -20,8 +20,7 @@
#ifndef __DRIVERS_UART_HAL_H_
#define __DRIVERS_UART_HAL_H_
-#include <uart/uart.h>
-
+struct os_dev;
int uart_hal_init(struct os_dev *, void *);
#endif /* __DRIVERS_UART_HAL_H_ */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a181976c/drivers/uart/uart_hal/src/uart_hal.c
----------------------------------------------------------------------
diff --git a/drivers/uart/uart_hal/src/uart_hal.c b/drivers/uart/uart_hal/src/uart_hal.c
index 61095c2..3937ce6 100644
--- a/drivers/uart/uart_hal/src/uart_hal.c
+++ b/drivers/uart/uart_hal/src/uart_hal.c
@@ -22,8 +22,11 @@
#include <string.h>
#include <os/os.h>
+#include <os/os_dev.h>
#include <hal/hal_uart.h>
+#include <uart/uart.h>
+
#include "uart_hal/uart_hal.h"
struct uart_hal_priv {
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/a181976c/hw/bsp/nrf52dk/src/os_bsp.c
----------------------------------------------------------------------
diff --git a/hw/bsp/nrf52dk/src/os_bsp.c b/hw/bsp/nrf52dk/src/os_bsp.c
index e20edd1..e2020fc 100644
--- a/hw/bsp/nrf52dk/src/os_bsp.c
+++ b/hw/bsp/nrf52dk/src/os_bsp.c
@@ -21,10 +21,13 @@
#include <hal/flash_map.h>
#include <hal/hal_bsp.h>
#include <hal/hal_cputime.h>
-#include <uart_hal/uart_hal.h>
#include <mcu/nrf52_hal.h>
+
#include <os/os_dev.h>
+#include <uart/uart.h>
+#include <uart_hal/uart_hal.h>
+
static struct flash_area bsp_flash_areas[] = {
[FLASH_AREA_BOOTLOADER] = {
.fa_flash_id = 0, /* internal flash */