summaryrefslogtreecommitdiff
path: root/src/console
diff options
context:
space:
mode:
Diffstat (limited to 'src/console')
-rw-r--r--src/console/usbdebug_direct_console.c60
1 files changed, 44 insertions, 16 deletions
diff --git a/src/console/usbdebug_direct_console.c b/src/console/usbdebug_direct_console.c
index 86b89bd920..388715cff8 100644
--- a/src/console/usbdebug_direct_console.c
+++ b/src/console/usbdebug_direct_console.c
@@ -1,19 +1,40 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA
+ */
+
#include <string.h>
#include <console/console.h>
#include <usbdebug_direct.h>
#include <pc80/mc146818rtc.h>
-struct ehci_debug_info dbg_info;
+static struct ehci_debug_info dbg_info;
void set_ehci_base(unsigned ehci_base)
{
unsigned diff;
- if(!dbg_info.ehci_debug) return;
+
+ if (!dbg_info.ehci_debug)
+ return;
+
diff = dbg_info.ehci_caps - ehci_base;
dbg_info.ehci_regs -= diff;
dbg_info.ehci_debug -= diff;
dbg_info.ehci_caps = ehci_base;
}
+
void set_ehci_debug(unsigned ehci_debug)
{
dbg_info.ehci_debug = ehci_debug;
@@ -21,39 +42,46 @@ void set_ehci_debug(unsigned ehci_debug)
unsigned get_ehci_debug(void)
{
- return dbg_info.ehci_debug;
+ return dbg_info.ehci_debug;
}
static void dbgp_init(void)
{
struct ehci_debug_info *dbg_infox;
- dbg_infox = (struct ehci_debug_info *)((CONFIG_LB_MEM_TOPK<<10) - sizeof (struct ehci_debug_info)); //in RAM
- memcpy(&dbg_info, dbg_infox, sizeof(struct ehci_debug_info) );
+
+ /* At this point, all we have to do is copy the fixed address
+ * debug_info data structure to our version defined above. */
+
+ dbg_infox = (struct ehci_debug_info *)
+ ((CONFIG_LB_MEM_TOPK << 10) - sizeof(struct ehci_debug_info));
+
+ memcpy(&dbg_info, dbg_infox, sizeof(struct ehci_debug_info));
}
-static void dbgp_tx_byte(unsigned char data)
+static void dbgp_tx_byte(unsigned char data)
{
- if(dbg_info.ehci_debug)
- dbgp_bulk_write_x(&dbg_info,&data,1);
+ if (dbg_info.ehci_debug)
+ dbgp_bulk_write_x(&dbg_info, &data, 1);
}
-static unsigned char dbgp_rx_byte(void)
+static unsigned char dbgp_rx_byte(void)
{
unsigned char data = 0xff;
- if(dbg_info.ehci_debug)
- dbgp_bulk_read_x(&dbg_info,&data,1);
+
+ if (dbg_info.ehci_debug)
+ dbgp_bulk_read_x(&dbg_info, &data, 1);
+
return data;
}
-static int dbgp_tst_byte(void)
+static int dbgp_tst_byte(void)
{
return dbg_info.ehci_debug;
}
static const struct console_driver usbdebug_direct_console __console = {
- .init = dbgp_init,
- .tx_byte = dbgp_tx_byte,
- .rx_byte = dbgp_rx_byte,
+ .init = dbgp_init,
+ .tx_byte = dbgp_tx_byte,
+ .rx_byte = dbgp_rx_byte,
.tst_byte = dbgp_tst_byte,
};
-