--- trunk/src/include/device.h	2007/10/08 16:19:23	20
+++ trunk/src/include/device.h	2007/10/08 16:21:17	34
@@ -2,7 +2,7 @@
 #define	DEVICE_H
 
 /*
- *  Copyright (C) 2005  Anders Gavare.  All rights reserved.
+ *  Copyright (C) 2005-2007  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,7 +28,7 @@
  *  SUCH DAMAGE.
  *
  *
- *  $Id: device.h,v 1.14 2005/11/22 16:26:38 debug Exp $
+ *  $Id: device.h,v 1.20 2006/12/30 13:31:00 debug Exp $
  *
  *  Device registry.  (See device.c for more info.)
  */
@@ -46,7 +46,12 @@
 	uint64_t	addr;		/*  Device base address  */
 	uint64_t	addr2;		/*  Secondary address (optional)  */
 	uint64_t	len;
+
+	/*  Old-style IRQ:  */
 	int		irq_nr;
+
+	char		*interrupt_path;/*  Interrupt path:  */
+
 	int		in_use;
 	int		addr_mult;
 	int		pci_little_endian;
@@ -65,6 +70,8 @@
 			    struct pci_device *);
 };
 
+#define	DEVINIT(name)		int devinit_ ## name (struct devinit *devinit)
+
 /*  autodev.c: (built automatically in the devices/ directory):  */
 void autodev_init(void);
 
@@ -80,7 +87,7 @@
 /*  PCI stuff:  (TODO: move somewhere else?)  */
 int pci_register(char *name, void (*initf)(struct machine *, struct memory *,
 	struct pci_device *));
-void (*pci_lookup_initf(char *name))(struct machine *machine,
+void (*pci_lookup_initf(const char *name))(struct machine *machine,
 	struct memory *mem, struct pci_device *pd);
 
 #endif	/*  DEVICE_H  */