--- trunk/src/include/devices.h	2007/10/08 16:18:00	4
+++ trunk/src/include/devices.h	2007/10/08 16:18:11	6
@@ -28,7 +28,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: devices.h,v 1.162 2005/04/11 20:44:40 debug Exp $
+ *  $Id: devices.h,v 1.167 2005/05/22 20:05:40 debug Exp $
  *
  *  Memory mapped devices.
  *
@@ -48,6 +48,20 @@
 #include <X11/Xlib.h>
 #endif */
 
+/*  dev_8259.c:  */
+struct pic8259_data {
+	int		irq_nr;		/*  if connected to another 8259  */
+
+	int		irq_base;
+	int		current_command;
+
+	int		init_state;
+
+	int		priority_reg;
+	uint8_t		irr;		/*  interrupt request register  */
+	uint8_t		isr;		/*  interrupt in-service register  */
+	uint8_t		ier;		/*  interrupt enable register  */
+};
 
 /*  dev_dec_ioasic.c:  */
 #define	DEV_DEC_IOASIC_LENGTH		0x80100
@@ -206,6 +220,7 @@
 #define	VFB_MFB_VRAM			0x200000
 #define	VFB_CFB_BT459			0x200000
 void set_grayscale_palette(struct vfb_data *d, int ncolors);
+void dev_fb_resize(struct vfb_data *d, int new_xsize, int new_ysize);
 void dev_fb_setcursor(struct vfb_data *d, int cursor_x, int cursor_y, int on, 
         int cursor_xsize, int cursor_ysize);
 void framebuffer_blockcopyfill(struct vfb_data *d, int fillflag, int fill_r,
@@ -344,7 +359,7 @@
 	int writeflag, void *);
 int dev_pckbc_init(struct machine *machine, struct memory *mem,
 	uint64_t baseaddr, int type, int keyboard_irqnr, int mouse_irqnr,
-	int in_use);
+	int in_use, int pc_style_flag);
 
 /*  dev_pmppc.c:  */
 int dev_pmppc_board_access(struct cpu *cpu, struct memory *mem,
@@ -524,15 +539,18 @@
 
 /*  dev_turbochannel.c:  */
 #define	DEV_TURBOCHANNEL_LEN		0x0470
-int dev_turbochannel_access(struct cpu *cpu, struct memory *mem, uint64_t relative_addr, unsigned char *data, size_t len, int writeflag, void *);
-void dev_turbochannel_init(struct machine *machine, struct memory *mem, int slot_nr, uint64_t baseaddr, uint64_t endaddr, char *device_name, int irq);
+int dev_turbochannel_access(struct cpu *cpu, struct memory *mem,
+	uint64_t relative_addr, unsigned char *data, size_t len,
+	int writeflag, void *);
+void dev_turbochannel_init(struct machine *machine, struct memory *mem,
+	int slot_nr, uint64_t baseaddr, uint64_t endaddr, char *device_name,
+	int irq);
 
 /*  dev_vga.c:  */
 int dev_vga_access(struct cpu *cpu, struct memory *mem, uint64_t relative_addr,
 	unsigned char *data, size_t len, int writeflag, void *);
 void dev_vga_init(struct machine *machine, struct memory *mem,
-	uint64_t videomem_base, uint64_t control_base, int max_x, int max_y,
-	char *name);
+	uint64_t videomem_base, uint64_t control_base, char *name);
 
 /*  dev_vr41xx.c:  */
 #define	DEV_VR41XX_LENGTH		0x800		/*  TODO?  */