uart: multichip support

components/driver/include/driver/uart.h

@@ -1,9 +1,9 @@
-// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2015-2019 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
-
+//
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
@@ -12,9 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef _DRIVER_UART_H_
-#define _DRIVER_UART_H_
-
+#pragma once
 
 #ifdef __cplusplus
 extern "C" {
@@ -870,4 +868,3 @@ esp_err_t uart_get_wakeup_threshold(uart_port_t uart_num, int* out_wakeup_thresh
 }
 #endif
 
-#endif /*_DRIVER_UART_H_*/

components/driver/uart.c

@@ -36,6 +36,8 @@
 
 #define UART_NUM SOC_UART_NUM
 
+#define UART_NUM SOC_UART_NUM
+
 #define XOFF (char)0x13
 #define XON (char)0x11
 

components/soc/esp32/include/soc/uart_caps.h

@@ -1,4 +1,4 @@
-// Copyright 2017-2018 Espressif Systems (Shanghai) PTE LTD
+// Copyright 2017-2019 Espressif Systems (Shanghai) PTE LTD
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,8 +11,9 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
-#ifndef _SOC_UART_CAPS_H_
-#define _SOC_UART_CAPS_H_
+
+#pragma once
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -22,5 +23,3 @@ extern "C" {
 #ifdef __cplusplus
 }
 #endif
-
-#endif  /* _SOC_UART_CAPS_H_ */

components/soc/include/soc/uart_periph.h

@@ -13,6 +13,8 @@
 // limitations under the License.
 
 #pragma once
+
+#include "soc/uart_caps.h"
 #include "soc/uart_reg.h"
 #include "soc/uart_struct.h"
 #include "soc/uart_channel.h"