Cosmetics and consistency fixes in src/superio/serverengines/pilot/ (trivial).

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4328 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann 2009-06-01 01:38:29 +00:00
parent a519fe77b6
commit fff87d31ca
3 changed files with 61 additions and 66 deletions

View File

@ -2,7 +2,7 @@
* This file is part of the coreboot project. * This file is part of the coreboot project.
* *
* Copyright (C) 2009 University of Heidelberg * Copyright (C) 2009 University of Heidelberg
* Written by Mondrian Nuessle <nuessle@uni-heidelberg.de> for University of Heidelberg * Written by Mondrian Nuessle <nuessle@uni-heidelberg.de> for Univ. Heidelberg
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * 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 #define PILOT_SP1 0x02 /* Com1 */
// Serial port COM1 #define PILOT_LD1 0x01 /* Logical device 1 */
#define PILOT_LD1 0x01 #define PILOT_LD4 0x04 /* Logical device 4 */
// logical device 1 #define PILOT_LD5 0x05 /* Logical device 5 */
#define PILOT_LD4 0x04 #define PILOT_LD7 0x07 /* Logical device 7 */
// logical device 4
#define PILOT_LD5 0x05
// logical device 5
#define PILOT_LD7 0x07
// logical device 7

View File

@ -2,7 +2,7 @@
* This file is part of the coreboot project. * This file is part of the coreboot project.
* *
* Copyright (C) 2009 University of Heidelberg * Copyright (C) 2009 University of Heidelberg
* Written by Mondrian Nuessle <nuessle@uni-heidelberg.de> for University of Heidelberg * Written by Mondrian Nuessle <nuessle@uni-heidelberg.de> for Univ. Heidelberg
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * 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) #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) static void pilot_early_init(device_t dev)
{ {
unsigned port = dev>>8; 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("Using port: ");
print_debug_hex16(port);
print_debug("\r\n");
pilot_disable_serial(PNP_DEV(port, 0x1));
print_debug("disable serial 1\r\n"); print_debug("disable serial 1\r\n");
/* /*
pnp_enter_ext_func_mode(dev); pnp_enter_ext_func_mode(dev);
pnp_set_logical_device(PNP_DEV(port,0x3)); pnp_set_logical_device(PNP_DEV(port, 0x3));
pnp_exit_ext_func_mode(dev); pnp_exit_ext_func_mode(dev);
pnp_enter_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_exit_ext_func_mode(dev);
*/ */
pnp_enter_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_exit_ext_func_mode(dev);
pnp_enter_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_exit_ext_func_mode(dev);
pnp_enter_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_exit_ext_func_mode(dev);
pnp_enter_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_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
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_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
pnp_set_enable(PNP_DEV(port,0x7), 0);
pnp_exit_ext_func_mode(dev); pnp_exit_ext_func_mode(dev);
/* /*
pnp_enter_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, 0x6));
pnp_exit_ext_func_mode(dev); pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev); pnp_enter_ext_func_mode(dev);
pnp_set_enable(PNP_DEV(port,0x8), 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,0x9));
pnp_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
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_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
pnp_set_enable(PNP_DEV(port,0x10 0);
pnp_exit_ext_func_mode(dev); pnp_exit_ext_func_mode(dev);
*/ */
pnp_enter_ext_func_mode(dev);
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_exit_ext_func_mode(dev);
/*
pnp_enter_ext_func_mode(dev);
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_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
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_exit_ext_func_mode(dev);
pnp_enter_ext_func_mode(dev);
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_exit_ext_func_mode(dev);
*/
} }

View File

@ -2,7 +2,7 @@
* This file is part of the coreboot project. * This file is part of the coreboot project.
* *
* Copyright (C) 2009 University of Heidelberg * Copyright (C) 2009 University of Heidelberg
* Written by Mondrian Nuessle <nuessle@uni-heidelberg.de> for University of Heidelberg * Written by Mondrian Nuessle <nuessle@uni-heidelberg.de> for Univ. Heidelberg
* *
* This program is free software; you can redistribute it and/or modify * 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 * 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 * 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 <arch/romcc_io.h>
#include "pilot.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) static inline void pnp_enter_ext_func_mode(device_t dev)
{ {
unsigned port = dev>>8; unsigned port = dev >> 8;
outb(0x5A, port); outb(0x5A, port);
} }
static void pnp_exit_ext_func_mode(device_t dev) static void pnp_exit_ext_func_mode(device_t dev)
{ {
unsigned port = dev>>8; unsigned port = dev >> 8;
outb(0xA5, port); 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) static void pilot_enable_serial(device_t dev, unsigned iobase)
{ {
pnp_enter_ext_func_mode(dev); pnp_enter_ext_func_mode(dev);
@ -55,4 +55,3 @@ static void pilot_disable_serial(device_t dev)
pnp_set_enable(dev, 0); pnp_set_enable(dev, 0);
pnp_exit_ext_func_mode(dev); pnp_exit_ext_func_mode(dev);
} }