Hellen says merge #1772 helping merge
This commit is contained in:
parent
07bc8100c7
commit
6e64d243da
|
@ -9,8 +9,11 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
#include "global.h"
|
#include "global.h"
|
||||||
|
|
||||||
#if EFI_PROD_CODE
|
#if HAL_USE_SERIAL_USB
|
||||||
#include "usbconsole.h"
|
#include "usbconsole.h"
|
||||||
|
#endif // HAL_USE_SERIAL_USB
|
||||||
|
|
||||||
|
#if EFI_PROD_CODE
|
||||||
#include "pin_repository.h"
|
#include "pin_repository.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -5,8 +5,7 @@
|
||||||
* @author Andrey Belomutskiy, (c) 2012-2020
|
* @author Andrey Belomutskiy, (c) 2012-2020
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef USBCONSOLE_H_
|
#pragma once
|
||||||
#define USBCONSOLE_H_
|
|
||||||
|
|
||||||
#define USB_SERIAL_DRIVER SD2
|
#define USB_SERIAL_DRIVER SD2
|
||||||
|
|
||||||
|
@ -21,5 +20,3 @@ bool is_usb_serial_ready(void);
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
#endif /* USBCONSOLE_H_ */
|
|
||||||
|
|
Loading…
Reference in New Issue