summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/include/usbdebug.h5
-rw-r--r--src/lib/usbdebug.c20
2 files changed, 17 insertions, 8 deletions
diff --git a/src/include/usbdebug.h b/src/include/usbdebug.h
index e32410ed18..16077b0448 100644
--- a/src/include/usbdebug.h
+++ b/src/include/usbdebug.h
@@ -62,9 +62,8 @@ int dbgp_bulk_read_x(struct ehci_debug_info *dbg_info, void *data, int size);
void set_debug_port(unsigned port);
int usbdebug_init(void);
-struct ehci_debug_info *dbgp_ehci_info(void);
-#define dbgp_console_output dbgp_ehci_info
-#define dbgp_console_input dbgp_ehci_info
+struct ehci_debug_info *dbgp_console_output(void);
+struct ehci_debug_info *dbgp_console_input(void);
int dbgp_ep_is_active(struct ehci_debug_info *dbg_info);
void usbdebug_tx_byte(struct ehci_debug_info *info, unsigned char data);
void usbdebug_tx_flush(struct ehci_debug_info *info);
diff --git a/src/lib/usbdebug.c b/src/lib/usbdebug.c
index b16e325728..b6c7f100c4 100644
--- a/src/lib/usbdebug.c
+++ b/src/lib/usbdebug.c
@@ -94,6 +94,11 @@ static struct device_operations *ehci_drv_ops;
static struct device_operations ehci_dbg_ops;
#endif
+static inline struct ehci_debug_info *dbgp_ehci_info(void)
+{
+ return car_get_var_ptr(&glob_dbg_info);
+}
+
static int dbgp_wait_until_complete(struct ehci_dbg_port *ehci_debug)
{
u32 ctrl;
@@ -603,7 +608,7 @@ void usbdebug_tx_flush(struct ehci_debug_info *dbg_info)
#if !defined(__PRE_RAM__) && !defined(__SMM__)
static void usbdebug_re_enable(unsigned ehci_base)
{
- struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info);
+ struct ehci_debug_info *dbg_info = dbgp_ehci_info();
unsigned diff;
if (!dbg_info->ehci_debug)
@@ -618,7 +623,7 @@ static void usbdebug_re_enable(unsigned ehci_base)
static void usbdebug_disable(void)
{
- struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info);
+ struct ehci_debug_info *dbg_info = dbgp_ehci_info();
dbg_info->status &= ~DBGP_EP_ENABLED;
}
@@ -661,14 +666,19 @@ int dbgp_ep_is_active(struct ehci_debug_info *dbg_info)
return (dbg_info->status & DBGP_EP_STATMASK) == (DBGP_EP_VALID | DBGP_EP_ENABLED);
}
-struct ehci_debug_info *dbgp_ehci_info(void)
+struct ehci_debug_info *dbgp_console_input(void)
{
- return car_get_var_ptr(&glob_dbg_info);
+ return dbgp_ehci_info();
+}
+
+struct ehci_debug_info *dbgp_console_input(void)
+{
+ return dbgp_ehci_info();
}
int usbdebug_init(void)
{
- struct ehci_debug_info *dbg_info = car_get_var_ptr(&glob_dbg_info);
+ struct ehci_debug_info *dbg_info = dbgp_ehci_info();
#if defined(__PRE_RAM__) || !CONFIG_EARLY_CONSOLE
enable_usbdebug(CONFIG_USBDEBUG_DEFAULT_PORT);