diff options
Diffstat (limited to 'drivers/ieee1394/ohci1394.h')
| -rw-r--r-- | drivers/ieee1394/ohci1394.h | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/drivers/ieee1394/ohci1394.h b/drivers/ieee1394/ohci1394.h index 7c362d8d6..5d02b2933 100644 --- a/drivers/ieee1394/ohci1394.h +++ b/drivers/ieee1394/ohci1394.h @@ -23,10 +23,14 @@ #include "ieee1394_types.h" -#define IEEE1394_USE_BOTTOM_HALVES 0 +#define IEEE1394_USE_BOTTOM_HALVES 1 #define OHCI1394_DRIVER_NAME "ohci1394" +#define USE_DEVICE 0 + +#if USE_DEVICE + #ifndef PCI_DEVICE_ID_TI_OHCI1394_LV22 #define PCI_DEVICE_ID_TI_OHCI1394_LV22 0x8009 #endif @@ -39,6 +43,10 @@ #define PCI_DEVICE_ID_TI_OHCI1394_LV26 0x8020 #endif +#ifndef PCI_DEVICE_ID_TI_OHCI1394_PCI4450 +#define PCI_DEVICE_ID_TI_OHCI1394_PCI4450 0x8011 +#endif + #ifndef PCI_DEVICE_ID_VIA_OHCI1394 #define PCI_DEVICE_ID_VIA_OHCI1394 0x3044 #endif @@ -83,6 +91,9 @@ #define PCI_DEVICE_ID_LUCENT_FW323 0x5811 #endif +#endif /* USE_DEVICE */ + + #define MAX_OHCI1394_CARDS 4 #define OHCI1394_MAX_AT_REQ_RETRIES 0x2 @@ -218,13 +229,14 @@ struct ti_ohci { /* iso receive */ struct dma_rcv_ctx *ir_context; - u64 IR_channel_usage; spinlock_t IR_channel_lock; int nb_iso_rcv_ctx; /* iso transmit */ int nb_iso_xmit_ctx; + u64 ISO_channel_usage; + /* IEEE-1394 part follows */ struct hpsb_host *host; @@ -451,6 +463,8 @@ quadlet_t ohci_csr_rom[] = { #define DMA_SPEED_200 0x1 #define DMA_SPEED_400 0x2 +#define OHCI1394_TCODE_PHY 0xE + void ohci1394_stop_context(struct ti_ohci *ohci, int reg, char *msg); struct ti_ohci *ohci1394_get_struct(int card_num); int ohci1394_register_video(struct ti_ohci *ohci, |