diff options
| author | root <root@iss-tomyspiel-l> | 2011-06-16 04:28:59 +0200 |
|---|---|---|
| committer | root <root@iss-tomyspiel-l> | 2011-06-16 04:28:59 +0200 |
| commit | 1aafef50177b850efda576259cb78d2df7d03259 (patch) | |
| tree | 4ccf44b46983b652b741f7b92dd394c4dc600748 /driver | |
| parent | 3215a87dbbce676aa434a6d5b4835e456dac3605 (diff) | |
| download | ipecamera-1aafef50177b850efda576259cb78d2df7d03259.tar.gz ipecamera-1aafef50177b850efda576259cb78d2df7d03259.tar.bz2 ipecamera-1aafef50177b850efda576259cb78d2df7d03259.tar.xz ipecamera-1aafef50177b850efda576259cb78d2df7d03259.zip | |
A bit of DMA infrastructure
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/base.h | 2 | ||||
| -rw-r--r-- | driver/ioctl.c | 4 | ||||
| -rw-r--r-- | driver/pciDriver.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/driver/base.h b/driver/base.h index 743eee5..84f0aad 100644 --- a/driver/base.h +++ b/driver/base.h @@ -53,7 +53,7 @@ static const __devinitdata struct pci_device_id pcidriver_ids[] = { /* prototypes for internal driver functions */ int pcidriver_pci_read( pcidriver_privdata_t *privdata, pci_cfg_cmd *pci_cmd ); int pcidriver_pci_write( pcidriver_privdata_t *privdata, pci_cfg_cmd *pci_cmd ); -int pcidriver_pci_info( pcidriver_privdata_t *privdata, pci_board_info *pci_info ); +int pcidriver_pci_info( pcidriver_privdata_t *privdata, pcilib_board_info_t *pci_info ); int pcidriver_mmap_pci( pcidriver_privdata_t *privdata, struct vm_area_struct *vmap , int bar ); int pcidriver_mmap_kmem( pcidriver_privdata_t *privdata, struct vm_area_struct *vmap ); diff --git a/driver/ioctl.c b/driver/ioctl.c index 6240d31..dacf94a 100644 --- a/driver/ioctl.c +++ b/driver/ioctl.c @@ -143,7 +143,7 @@ static int ioctl_pci_info(pcidriver_privdata_t *privdata, unsigned long arg) { int ret; int bar; - READ_FROM_USER(pci_board_info, pci_info); + READ_FROM_USER(pcilib_board_info_t, pci_info); pci_info.vendor_id = privdata->pdev->vendor; pci_info.device_id = privdata->pdev->device; @@ -163,7 +163,7 @@ static int ioctl_pci_info(pcidriver_privdata_t *privdata, unsigned long arg) pci_info.bar_flags[bar] = pci_resource_flags(privdata->pdev, bar); } - WRITE_TO_USER(pci_board_info, pci_info); + WRITE_TO_USER(pcilib_board_info_t, pci_info); return 0; } diff --git a/driver/pciDriver.h b/driver/pciDriver.h index 083b0b2..98c1301 100644 --- a/driver/pciDriver.h +++ b/driver/pciDriver.h @@ -152,7 +152,7 @@ typedef struct { unsigned long bar_start[6]; unsigned long bar_length[6]; unsigned long bar_flags[6]; -} pci_board_info; +} pcilib_board_info_t; /* ioctl interface */ @@ -182,7 +182,7 @@ typedef struct { /* And now, the methods to access the PCI configuration area */ #define PCIDRIVER_IOC_PCI_CFG_RD _IOWR( PCIDRIVER_IOC_MAGIC, PCIDRIVER_IOC_BASE + 10, pci_cfg_cmd * ) #define PCIDRIVER_IOC_PCI_CFG_WR _IOWR( PCIDRIVER_IOC_MAGIC, PCIDRIVER_IOC_BASE + 11, pci_cfg_cmd * ) -#define PCIDRIVER_IOC_PCI_INFO _IOWR( PCIDRIVER_IOC_MAGIC, PCIDRIVER_IOC_BASE + 12, pci_board_info * ) +#define PCIDRIVER_IOC_PCI_INFO _IOWR( PCIDRIVER_IOC_MAGIC, PCIDRIVER_IOC_BASE + 12, pcilib_board_info_t * ) /* Clear interrupt queues */ #define PCIDRIVER_IOC_CLEAR_IOQ _IO( PCIDRIVER_IOC_MAGIC, PCIDRIVER_IOC_BASE + 13 ) |