diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/blkdev.h | 2 | ||||
| -rw-r--r-- | include/linux/cyclomx.h | 5 | ||||
| -rw-r--r-- | include/linux/mtd/doc2000.h | 109 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_nat_core.h | 8 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ip_tables.h | 2 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv4/ipt_REJECT.h | 5 | ||||
| -rw-r--r-- | include/linux/netfilter_ipv6/ip6_tables.h | 2 | ||||
| -rw-r--r-- | include/linux/parport.h | 17 | ||||
| -rw-r--r-- | include/linux/pci_ids.h | 4 | ||||
| -rw-r--r-- | include/linux/poll.h | 21 | ||||
| -rw-r--r-- | include/linux/usb.h | 1 |
11 files changed, 92 insertions, 84 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 5610b7fe2..4f00239bf 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -151,7 +151,7 @@ extern struct blk_dev_struct blk_dev[MAX_BLKDEV]; extern void grok_partitions(struct gendisk *dev, int drive, unsigned minors, long size); extern void register_disk(struct gendisk *dev, kdev_t first, unsigned minors, struct block_device_operations *ops, long size); extern void generic_unplug_device(void *data); -extern int generic_make_request(request_queue_t *q, int rw, +extern void generic_make_request(request_queue_t *q, int rw, struct buffer_head * bh); extern request_queue_t *blk_get_queue(kdev_t dev); extern void blkdev_release_request(struct request *); diff --git a/include/linux/cyclomx.h b/include/linux/cyclomx.h index 983295c18..555d38fbe 100644 --- a/include/linux/cyclomx.h +++ b/include/linux/cyclomx.h @@ -13,6 +13,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * ============================================================================ +* 2000/07/13 acme remove crap #if KERNEL_VERSION > blah * 2000/01/21 acme rename cyclomx_open to cyclomx_mod_inc_use_count * and cyclomx_close to cyclomx_mod_dec_use_count * 1999/05/19 acme wait_queue_head_t wait_stats(support for 2.3.*) @@ -58,11 +59,7 @@ typedef struct cycx { spinlock_t lock; char in_isr; /* interrupt-in-service flag */ char buff_int_mode_unbusy; /* flag for carrying out dev_tint */ -#if (LINUX_VERSION_CODE >= 0x20300) wait_queue_head_t wait_stats; /* to wait for the STATS indication */ -#else - struct wait_queue* wait_stats; /* to wait for the STATS indication */ -#endif u32 mbox; /* -> mailbox */ void (*isr)(struct cycx* card); /* interrupt service routine */ int (*exec)(struct cycx* card, void* u_cmd, void* u_data); diff --git a/include/linux/mtd/doc2000.h b/include/linux/mtd/doc2000.h index c10a1778e..0ed87cdb4 100644 --- a/include/linux/mtd/doc2000.h +++ b/include/linux/mtd/doc2000.h @@ -2,42 +2,41 @@ /* Linux driver for Disk-On-Chip 2000 */ /* (c) 1999 Machine Vision Holdings, Inc. */ /* Author: David Woodhouse <dwmw2@mvhi.com> */ -/* $Id: doc2000.h,v 1.7 2000/06/26 20:40:53 dwmw2 Exp $ */ +/* $Id: doc2000.h,v 1.8 2000/07/10 15:46:29 dwmw2 Exp $ */ #ifndef __MTD_DOC2000_H__ #define __MTD_DOC2000_H__ #include <linux/mtd/mtd.h> - -#define DoC_M_CDSN_IO 0x800 #define DoC_Sig1 0 #define DoC_Sig2 1 -#define DoC_ChipID 0x1000 -#define DoC_DOCStatus 0x1001 -#define DoC_DOCControl 0x1002 -#define DoC_FloorSelect 0x1003 -#define DoC_CDSNControl 0x1004 -#define DoC_CDSNDeviceSelect 0x1005 -#define DoC_ECCConf 0x1006 -#define DoC_2k_ECCStatus 0x1007 - -#define DoC_CDSNSlowIO 0x100d -#define DoC_ECCSyndrome0 0x1010 -#define DoC_ECCSyndrome1 0x1011 -#define DoC_ECCSyndrome2 0x1012 -#define DoC_ECCSyndrome3 0x1013 -#define DoC_ECCSyndrome4 0x1014 -#define DoC_ECCSyndrome5 0x1015 -#define DoC_AliasResolution 0x101b -#define DoC_ConfigInput 0x101c -#define DoC_ReadPipeInit 0x101d -#define DoC_WritePipeTerm 0x101e -#define DoC_LastDataRead 0x101f -#define DoC_NOP 0x1020 - -#define DoC_2k_CDSN_IO 0x1800 +#define DoC_ChipID 0x1000 +#define DoC_DOCStatus 0x1001 +#define DoC_DOCControl 0x1002 +#define DoC_FloorSelect 0x1003 +#define DoC_CDSNControl 0x1004 +#define DoC_CDSNDeviceSelect 0x1005 +#define DoC_ECCConf 0x1006 +#define DoC_2k_ECCStatus 0x1007 + +#define DoC_CDSNSlowIO 0x100d +#define DoC_ECCSyndrome0 0x1010 +#define DoC_ECCSyndrome1 0x1011 +#define DoC_ECCSyndrome2 0x1012 +#define DoC_ECCSyndrome3 0x1013 +#define DoC_ECCSyndrome4 0x1014 +#define DoC_ECCSyndrome5 0x1015 +#define DoC_AliasResolution 0x101b +#define DoC_ConfigInput 0x101c +#define DoC_ReadPipeInit 0x101d +#define DoC_WritePipeTerm 0x101e +#define DoC_LastDataRead 0x101f +#define DoC_NOP 0x1020 + +#define DoC_Mil_CDSN_IO 0x0800 +#define DoC_2k_CDSN_IO 0x1800 /* How to access the device? * On ARM, it'll be mmap'd directly with 32-bit wide accesses. @@ -54,33 +53,36 @@ #define ReadDOC(adr, reg) readb(((unsigned long)adr) + DoC_##reg) #define WriteDOC(d, adr, reg) writeb(d, ((unsigned long)adr) + DoC_##reg) #endif -#define DOC_MODE_RESET 0 -#define DOC_MODE_NORMAL 1 -#define DOC_MODE_RESERVED1 2 -#define DOC_MODE_RESERVED2 3 - -#define DOC_MODE_MDWREN 4 -#define DOC_MODE_CLR_ERR 0x80 - -#define DOC_ChipID_Doc2k 0x20 -#define DOC_ChipID_DocMil 0x30 - -#define CDSN_CTRL_FR_B 0x80 -#define CDSN_CTRL_ECC_IO 0x20 -#define CDSN_CTRL_FLASH_IO 0x10 -#define CDSN_CTRL_WP 8 -#define CDSN_CTRL_ALE 4 -#define CDSN_CTRL_CLE 2 -#define CDSN_CTRL_CE 1 - -#define DOC_ECC_RESET 0 -#define DOC_ECC_ERROR 0x80 -#define DOC_ECC_RW 0x20 -#define DOC_ECC__EN 0x08 -#define DOC_TOGGLE_BIT 0x04 -#define DOC_ECC_RESV 0x02 + +#define DOC_MODE_RESET 0 +#define DOC_MODE_NORMAL 1 +#define DOC_MODE_RESERVED1 2 +#define DOC_MODE_RESERVED2 3 + +#define DOC_MODE_MDWREN 4 +#define DOC_MODE_CLR_ERR 0x80 + +#define DOC_ChipID_Doc2k 0x20 +#define DOC_ChipID_DocMil 0x30 + +#define CDSN_CTRL_FR_B 0x80 +#define CDSN_CTRL_ECC_IO 0x20 +#define CDSN_CTRL_FLASH_IO 0x10 +#define CDSN_CTRL_WP 0x08 +#define CDSN_CTRL_ALE 0x04 +#define CDSN_CTRL_CLE 0x02 +#define CDSN_CTRL_CE 0x01 + +#define DOC_ECC_RESET 0 +#define DOC_ECC_ERROR 0x80 +#define DOC_ECC_RW 0x20 +#define DOC_ECC__EN 0x08 +#define DOC_TOGGLE_BIT 0x04 +#define DOC_ECC_RESV 0x02 +#define DOC_ECC_IGNORE 0x01 /* We have to also set the reserved bit 1 for enable */ #define DOC_ECC_EN (DOC_ECC__EN | DOC_ECC_RESV) +#define DOC_ECC_DIS (DOC_ECC_IGNORE | DOC_ECC_RESV) struct Nand { char floor, chip; @@ -92,6 +94,9 @@ struct Nand { #define MAX_FLOORS 4 #define MAX_CHIPS 4 +#define MAX_FLOORS_MIL 4 +#define MAX_CHIPS_MIL 1 + struct DiskOnChip { unsigned long physadr; unsigned long virtadr; diff --git a/include/linux/netfilter_ipv4/ip_nat_core.h b/include/linux/netfilter_ipv4/ip_nat_core.h index 28735e0c1..e34e08331 100644 --- a/include/linux/netfilter_ipv4/ip_nat_core.h +++ b/include/linux/netfilter_ipv4/ip_nat_core.h @@ -16,10 +16,10 @@ extern unsigned int do_bindings(struct ip_conntrack *ct, extern struct list_head protos; -extern void icmp_reply_translation(struct sk_buff *skb, - struct ip_conntrack *conntrack, - unsigned int hooknum, - int dir); +extern unsigned int icmp_reply_translation(struct sk_buff *skb, + struct ip_conntrack *conntrack, + unsigned int hooknum, + int dir); extern void replace_in_hashes(struct ip_conntrack *conntrack, struct ip_nat_info *info); diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h index c1d6ff312..362f07bee 100644 --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h @@ -280,7 +280,7 @@ struct ipt_get_entries unsigned int size; /* The entries. */ - unsigned char entries[0]; + struct ipt_entry entrytable[0]; }; /* Standard return verdict, or do jump. */ diff --git a/include/linux/netfilter_ipv4/ipt_REJECT.h b/include/linux/netfilter_ipv4/ipt_REJECT.h index eeafdf468..ad195e435 100644 --- a/include/linux/netfilter_ipv4/ipt_REJECT.h +++ b/include/linux/netfilter_ipv4/ipt_REJECT.h @@ -6,7 +6,10 @@ enum ipt_reject_with { IPT_ICMP_HOST_UNREACHABLE, IPT_ICMP_PROT_UNREACHABLE, IPT_ICMP_PORT_UNREACHABLE, - IPT_ICMP_ECHOREPLY + IPT_ICMP_ECHOREPLY, + IPT_ICMP_NET_PROHIBITED, + IPT_ICMP_HOST_PROHIBITED, + IPT_TCP_RESET }; struct ipt_reject_info { diff --git a/include/linux/netfilter_ipv6/ip6_tables.h b/include/linux/netfilter_ipv6/ip6_tables.h index f3617397c..0716ae947 100644 --- a/include/linux/netfilter_ipv6/ip6_tables.h +++ b/include/linux/netfilter_ipv6/ip6_tables.h @@ -286,7 +286,7 @@ struct ip6t_get_entries unsigned int size; /* The entries. */ - unsigned char entries[0]; + struct ip6t_entry entrytable[0]; }; /* Standard return verdict, or do jump. */ diff --git a/include/linux/parport.h b/include/linux/parport.h index 294464b65..27d813e9d 100644 --- a/include/linux/parport.h +++ b/include/linux/parport.h @@ -309,6 +309,7 @@ struct parport { rwlock_t cad_lock; int spintime; + atomic_t ref_count; }; #define DEFAULT_SPIN_TIME 500 /* us */ @@ -337,12 +338,9 @@ void parport_announce_port (struct parport *port); /* Unregister a port. */ extern void parport_unregister_port(struct parport *port); -/* parport_in_use returns nonzero if there are devices attached to a - port. */ -#define parport_in_use(x) ((x)->devices != NULL) - /* parport_enumerate returns a pointer to the linked list of all the - ports in this machine. */ + ports in this machine. DON'T USE THIS. Use + parport_register_driver instead. */ struct parport *parport_enumerate(void); /* Register a new high-level driver. */ @@ -351,6 +349,15 @@ extern int parport_register_driver (struct parport_driver *); /* Unregister a high-level driver. */ extern void parport_unregister_driver (struct parport_driver *); +/* If parport_register_driver doesn't fit your needs, perhaps + * parport_find_xxx does. */ +extern struct parport *parport_find_number (int); +extern struct parport *parport_find_base (unsigned long); + +/* Reference counting for ports. */ +extern struct parport *parport_get_port (struct parport *); +extern void parport_put_port (struct parport *); + /* parport_register_device declares that a device is connected to a port, and tells the kernel all it needs to know. - pf is the preemption function (may be NULL for no callback) diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 04ae938be..a53a165b1 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h @@ -1061,6 +1061,10 @@ #define PCI_DEVICE_ID_LAVA_SSERIAL 0x0500 /* 1x 16550 */ #define PCI_DEVICE_ID_LAVA_PORT_650 0x0600 /* 1x 16650 */ +#define PCI_VENDOR_ID_SYBA 0x1592 +#define PCI_DEVICE_ID_SYBA_2P_EPP 0x0782 +#define PCI_DEVICE_ID_SYBA_1P_ECP 0x0783 + #define PCI_DEVICE_ID_LAVA_PARALLEL 0x8000 #define PCI_DEVICE_ID_LAVA_DUAL_PAR_A 0x8002 /* The Lava Dual Parallel is */ #define PCI_DEVICE_ID_LAVA_DUAL_PAR_B 0x8003 /* two PCI devices on a card */ diff --git a/include/linux/poll.h b/include/linux/poll.h index bc0fcde22..64b5df671 100644 --- a/include/linux/poll.h +++ b/include/linux/poll.h @@ -38,22 +38,13 @@ extern inline void poll_wait(struct file * filp, wait_queue_head_t * wait_addres __pollwait(filp, wait_address, p); } -/* - * For the kernel fd_set we use a fixed set-size for allocation purposes. - * This set-size doesn't necessarily bear any relation to the size the user - * uses, but should preferably obviously be larger than any possible user - * size (NR_OPEN bits). - * - * We need 6 bitmaps (in/out/ex for both incoming and outgoing), and we - * allocate one page for all the bitmaps. Thus we have 8*PAGE_SIZE bits, - * to be divided by 6. And we'd better make sure we round to a full - * long-word (in fact, we'll round to 64 bytes). - */ - +static inline void poll_initwait(poll_table* pt) +{ + pt->error = 0; + pt->table = NULL; +} +extern void poll_freewait(poll_table* pt); -#define KFDS_64BLOCK ((PAGE_SIZE/(6*64))*64) -#define KFDS_NR (KFDS_64BLOCK*8 > NR_OPEN ? NR_OPEN : KFDS_64BLOCK*8) -typedef unsigned long kernel_fd_set[KFDS_NR/__NFDBITS]; /* * Scaleable version of the fd_set. diff --git a/include/linux/usb.h b/include/linux/usb.h index 1b1d3f902..885687193 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h @@ -551,6 +551,7 @@ extern struct usb_interface *usb_ifnum_to_if(struct usb_device *dev, unsigned if extern int usb_register(struct usb_driver *); extern void usb_deregister(struct usb_driver *); +extern void usb_scan_devices(void); /* used these for multi-interface device registration */ extern void usb_driver_claim_interface(struct usb_driver *driver, struct usb_interface *iface, void* priv); |