--- trunk/src/include/bus_isa.h 2007/10/08 16:19:28 21 +++ trunk/src/include/bus_isa.h 2007/10/08 16:19:37 22 @@ -2,7 +2,7 @@ #define BUS_ISA_H /* - * Copyright (C) 2005 Anders Gavare. All rights reserved. + * Copyright (C) 2005-2006 Anders Gavare. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -28,16 +28,27 @@ * SUCH DAMAGE. * * - * $Id: bus_isa.h,v 1.1 2005/11/21 09:17:27 debug Exp $ + * $Id: bus_isa.h,v 1.4 2006/01/16 01:45:50 debug Exp $ * * ISA bus. */ #include "misc.h" -void bus_isa(struct machine *machine, uint32_t bus_isa_flags, - uint64_t isa_portbase, uint64_t isa_membase, int isa_irqbase, - int reassert_irq); +#ifdef BUS_ISA_C + +struct bus_isa_data { + int isa_irqbase; + int reassert_irq; + uint64_t isa_portbase; + uint64_t isa_membase; +}; + +#endif /* BUS_ISA_C */ + +struct bus_isa_data *bus_isa_init(struct machine *machine, + uint32_t bus_isa_flags, uint64_t isa_portbase, uint64_t isa_membase, + int isa_irqbase, int reassert_irq); /* ISA bus flags: */ #define BUS_ISA_IDE0 1 @@ -48,5 +59,6 @@ #define BUS_ISA_PCKBC_FORCE_USE 32 #define BUS_ISA_PCKBC_NONPCSTYLE 64 #define BUS_ISA_NO_SECOND_PIC 128 +#define BUS_ISA_LPTBASE_3BC 256 #endif /* BUS_ISA_H */