Changeset 305 for GPL/branches/uniaud-2.0/include/linux/pci.h

Timestamp:

Mar 24, 2008, 2:43:42 AM (17 years ago)

Author:

Paul Smedley

Message:

Update source to ALSA 1.0.16 level

File:

• GPL/branches/uniaud-2.0/include/linux/pci.h (modified) (4 diffs)

GPL/branches/uniaud-2.0/include/linux/pci.h

@@ -16 +16 @@
 #define LINUX_PCI_H
 
+#include <linux/types.h>
+#include <linux/list.h>
 #pragma pack(1) //!!! by vladest
 /*
@@ -285 +287 @@
 
 #include <asm/pci.h>
-
+#define BUS_ID_SIZE             20
 #define DEVICE_COUNT_COMPATIBLE 4
 #define DEVICE_COUNT_IRQ        2
@@ -293 +295 @@
 typedef struct pci_dev;
 
+
+
 typedef struct device {
     struct pci_dev *pci;        /* for PCI and PCI-SG types */
+        struct device   * parent;
+        struct bus_type * bus;          /* type of bus device is on */
+        char    bus_id[BUS_ID_SIZE];    /* position on parent bus */
+        void    (*release)(struct device * dev);
     unsigned int flags; /* GFP_XXX for continous and ISA types */
 #ifdef CONFIG_SBUS
     struct sbus_dev *sbus;      /* for SBUS type */
 #endif
+        void *private_data;
+        struct device_driver *driver;
+        struct pm_dev *pm_dev;
+        char    bus_id[20];
 } device;
 
@@ -648 +660 @@
 
 unsigned long pci_get_dma_mask(struct pci_dev *);
-int pci_set_dma_mask(struct pci_dev *, unsigned long mask);
+void pci_set_dma_mask(struct pci_dev *, unsigned long mask);
+
 
 void *pci_get_driver_data (struct pci_dev *dev);