Author: uwe
Date: 2009-06-01 03:38:29 +0200 (Mon, 01 Jun 2009)
New Revision: 4328
Modified:
trunk/coreboot-v2/src/superio/serverengines/pilot/pilot.h
trunk/coreboot-v2/src/superio/serverengines/pilot/pilot_early_init.c
trunk/coreboot-v2/src/superio/serverengines/pilot/pilot_early_serial.c
Log:
Cosmetics and consistency fixes in src/superio/serverengines/pilot/ (trivial).
Signed-off-by: Uwe Hermann <uwe at hermann-uwe.de>
Acked-by: Uwe Hermann <uwe at hermann-uwe.de>
Modified: trunk/coreboot-v2/src/superio/serverengines/pilot/pilot.h
===================================================================
--- trunk/coreboot-v2/src/superio/serverengines/pilot/pilot.h 2009-05-31 17:00:25 UTC (rev 4327)
+++ trunk/coreboot-v2/src/superio/serverengines/pilot/pilot.h 2009-06-01 01:38:29 UTC (rev 4328)
@@ -2,7 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2009 University of Heidelberg
- * Written by Mondrian Nuessle <nuessle at uni-heidelberg.de> for University of Heidelberg
+ * Written by Mondrian Nuessle <nuessle at uni-heidelberg.de> for Univ. Heidelberg
*
* 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
@@ -19,15 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/* PILOT SuperIO is only based on LPC observation done on factory system. */
+/* PILOT Super I/O is only based on LPC observation done on factory system. */
-#define PILOT_SP1 0x02
-// Serial port COM1
-#define PILOT_LD1 0x01
-// logical device 1
-#define PILOT_LD4 0x04
-// logical device 4
-#define PILOT_LD5 0x05
-// logical device 5
-#define PILOT_LD7 0x07
-// logical device 7
+#define PILOT_SP1 0x02 /* Com1 */
+#define PILOT_LD1 0x01 /* Logical device 1 */
+#define PILOT_LD4 0x04 /* Logical device 4 */
+#define PILOT_LD5 0x05 /* Logical device 5 */
+#define PILOT_LD7 0x07 /* Logical device 7 */
Modified: trunk/coreboot-v2/src/superio/serverengines/pilot/pilot_early_init.c
===================================================================
--- trunk/coreboot-v2/src/superio/serverengines/pilot/pilot_early_init.c 2009-05-31 17:00:25 UTC (rev 4327)
+++ trunk/coreboot-v2/src/superio/serverengines/pilot/pilot_early_init.c 2009-06-01 01:38:29 UTC (rev 4328)
@@ -2,7 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2009 University of Heidelberg
- * Written by Mondrian Nuessle <nuessle at uni-heidelberg.de> for University of Heidelberg
+ * Written by Mondrian Nuessle <nuessle at uni-heidelberg.de> for Univ. Heidelberg
*
* 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
@@ -19,78 +19,79 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/* PILOT SuperIO is only based on LPC observation done on factory system. */
+/* PILOT Super I/O is only based on LPC observation done on factory system. */
#define BLUBB_DEV PNP_DEV(port, 0x04)
-/* Logical device 4, 5 and 7 are being deactivated. Logical Device 1 seems to
- be another serial (?), it is also deactivated on the HP machine */
+/*
+ * Logical device 4, 5 and 7 are being deactivated. Logical Device 1 seems to
+ * be another serial (?), it is also deactivated on the HP machine.
+ */
static void pilot_early_init(device_t dev)
{
- unsigned port = dev>>8;
- print_debug("Using port:");print_debug_hex16(port);print_debug("\r\n");
- pilot_disable_serial(PNP_DEV(port,0x1));
+ unsigned port = dev >> 8;
+
+ print_debug("Using port: ");
+ print_debug_hex16(port);
+ print_debug("\r\n");
+ pilot_disable_serial(PNP_DEV(port, 0x1));
print_debug("disable serial 1\r\n");
/*
-pnp_enter_ext_func_mode(dev);
- pnp_set_logical_device(PNP_DEV(port,0x3));
+ pnp_enter_ext_func_mode(dev);
+ pnp_set_logical_device(PNP_DEV(port, 0x3));
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
- pnp_set_enable( PNP_DEV(port,0x3),0);
+ pnp_set_enable(PNP_DEV(port, 0x3), 0);
pnp_exit_ext_func_mode(dev);
*/
pnp_enter_ext_func_mode(dev);
- pnp_set_logical_device(PNP_DEV(port,0x4));
+ pnp_set_logical_device(PNP_DEV(port, 0x4));
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
- pnp_set_enable( PNP_DEV(port,0x4),0);
+ pnp_set_enable( PNP_DEV(port, 0x4), 0);
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
- pnp_set_logical_device(PNP_DEV(port,0x5));
+ pnp_set_logical_device(PNP_DEV(port, 0x5));
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
- pnp_set_enable(PNP_DEV(port,0x5),0);
+ pnp_set_enable(PNP_DEV(port, 0x5), 0);
pnp_exit_ext_func_mode(dev);
- /*
+/*
pnp_enter_ext_func_mode(dev);
- pnp_set_logical_device(PNP_DEV(port,0x6));
+ pnp_set_logical_device(PNP_DEV(port, 0x6));
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
- pnp_set_enable( PNP_DEV(port,0x6),0);
+ pnp_set_enable( PNP_DEV(port, 0x6), 0);
pnp_exit_ext_func_mode(dev);
*/
pnp_enter_ext_func_mode(dev);
- pnp_set_logical_device(PNP_DEV(port,0x7));
+ pnp_set_logical_device(PNP_DEV(port, 0x7));
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
- pnp_set_enable(PNP_DEV(port,0x7), 0);
+ pnp_set_enable(PNP_DEV(port, 0x7), 0);
pnp_exit_ext_func_mode(dev);
/*
pnp_enter_ext_func_mode(dev);
- pnp_set_logical_device(PNP_DEV(port,0x8));
+ pnp_set_logical_device(PNP_DEV(port, 0x8));
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
- pnp_set_enable(PNP_DEV(port,0x8), 0);
+ pnp_set_enable(PNP_DEV(port, 0x8), 0);
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
- pnp_set_logical_device(PNP_DEV(port,0x9));
+ pnp_set_logical_device(PNP_DEV(port, 0x9));
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
- pnp_set_enable(PNP_DEV(port,0x9), 0);
+ pnp_set_enable(PNP_DEV(port, 0x9), 0);
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
- pnp_set_logical_device(PNP_DEV(port,0x10;
+ pnp_set_logical_device(PNP_DEV(port, 0x10));
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
- pnp_set_enable(PNP_DEV(port,0x10 0);
+ pnp_set_enable(PNP_DEV(port, 0x10), 0);
pnp_exit_ext_func_mode(dev);
*/
-
}
-
-
-
Modified: trunk/coreboot-v2/src/superio/serverengines/pilot/pilot_early_serial.c
===================================================================
--- trunk/coreboot-v2/src/superio/serverengines/pilot/pilot_early_serial.c 2009-05-31 17:00:25 UTC (rev 4327)
+++ trunk/coreboot-v2/src/superio/serverengines/pilot/pilot_early_serial.c 2009-06-01 01:38:29 UTC (rev 4328)
@@ -2,7 +2,7 @@
* This file is part of the coreboot project.
*
* Copyright (C) 2009 University of Heidelberg
- * Written by Mondrian Nuessle <nuessle at uni-heidelberg.de> for University of Heidelberg
+ * Written by Mondrian Nuessle <nuessle at uni-heidelberg.de> for Univ. Heidelberg
*
* 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
@@ -19,25 +19,25 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
-/* PILOT SuperIO is only based on LPC observation done on factory system. */
+/* PILOT Super I/O is only based on LPC observation done on factory system. */
#include <arch/romcc_io.h>
#include "pilot.h"
-/* pilot uses 0x5A/0xA5 pattern to actiavte deactivate config access */
+/* Pilot uses 0x5A/0xA5 pattern to actiavte deactivate config access. */
static inline void pnp_enter_ext_func_mode(device_t dev)
{
- unsigned port = dev>>8;
+ unsigned port = dev >> 8;
outb(0x5A, port);
}
static void pnp_exit_ext_func_mode(device_t dev)
{
- unsigned port = dev>>8;
+ unsigned port = dev >> 8;
outb(0xA5, port);
}
-/* serial config is failry standard procedure */
+/* Serial config is a fairly standard procedure. */
static void pilot_enable_serial(device_t dev, unsigned iobase)
{
pnp_enter_ext_func_mode(dev);
@@ -55,4 +55,3 @@
pnp_set_enable(dev, 0);
pnp_exit_ext_func_mode(dev);
}
-