summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/ac97_codec.h10
-rw-r--r--include/linux/cdrom.h21
-rw-r--r--include/linux/devfs_fs_kernel.h36
-rw-r--r--include/linux/fs.h7
-rw-r--r--include/linux/i2c-id.h1
-rw-r--r--include/linux/ide.h3
-rw-r--r--include/linux/linkage.h12
-rw-r--r--include/linux/netfilter.h1
-rw-r--r--include/linux/skbuff.h28
-rw-r--r--include/linux/zorro.h1
10 files changed, 75 insertions, 45 deletions
diff --git a/include/linux/ac97_codec.h b/include/linux/ac97_codec.h
index 7090e0625..50c75c3a8 100644
--- a/include/linux/ac97_codec.h
+++ b/include/linux/ac97_codec.h
@@ -54,14 +54,13 @@
/* record mux defines */
#define AC97_RECMUX_MIC 0x0000
#define AC97_RECMUX_CD 0x0101
-#define AC97_RECMUX_VIDEO 0x0202 /* not used */
-#define AC97_RECMUX_AUX 0x0303
-#define AC97_RECMUX_LINE 0x0404
+#define AC97_RECMUX_VIDEO 0x0202
+#define AC97_RECMUX_AUX 0x0303
+#define AC97_RECMUX_LINE 0x0404
#define AC97_RECMUX_STEREO_MIX 0x0505
#define AC97_RECMUX_MONO_MIX 0x0606
#define AC97_RECMUX_PHONE 0x0707
-
/* general purpose register bit defines */
#define AC97_GP_LPBK 0x0080 /* Loopback mode */
#define AC97_GP_MS 0x0100 /* Mic Select 0=Mic1, 1=Mic2 */
@@ -73,7 +72,6 @@
#define AC97_GP_ST 0x4000 /* Stereo Enhancement 1=on */
#define AC97_GP_POP 0x8000 /* Pcm Out Path, 0=pre 3D, 1=post 3D */
-
/* powerdown control and status bit defines */
/* status */
@@ -116,7 +114,7 @@
SOUND_MASK_PHONEIN|SOUND_MASK_PHONEOUT)
#define AC97_RECORD_MASK (SOUND_MASK_MIC|\
- SOUND_MASK_CD|SOUND_MASK_VIDEO|\
+ SOUND_MASK_CD|SOUND_MASK_IGAIN|SOUND_MASK_VIDEO|\
SOUND_MASK_LINE1| SOUND_MASK_LINE|\
SOUND_MASK_PHONEIN)
diff --git a/include/linux/cdrom.h b/include/linux/cdrom.h
index 3f15c3063..a1d9b2939 100644
--- a/include/linux/cdrom.h
+++ b/include/linux/cdrom.h
@@ -5,13 +5,12 @@
* 1994, 1995 Eberhard Moenkeberg, emoenke@gwdg.de
* 1996 David van Leeuwen, david@tm.tno.nl
* 1997, 1998 Erik Andersen, andersee@debian.org
- * 1998, 1999 Jens Axboe, axboe@image.dk
+ * 1998-2000 Jens Axboe, axboe@suse.de
*/
#ifndef _LINUX_CDROM_H
#define _LINUX_CDROM_H
-#include <linux/types.h>
#include <asm/byteorder.h>
/*******************************************************
@@ -225,7 +224,7 @@ struct cdrom_tocentry
struct cdrom_read
{
int cdread_lba;
- caddr_t cdread_bufaddr;
+ char *cdread_bufaddr;
int cdread_buflen;
};
@@ -267,6 +266,11 @@ struct cdrom_blk
#define CDROM_PACKET_SIZE 12
+#define CGC_DATA_UNKNOWN 0
+#define CGC_DATA_WRITE 1
+#define CGC_DATA_READ 2
+#define CGC_DATA_NONE 3
+
/* for CDROM_PACKET_COMMAND ioctl */
struct cdrom_generic_command
{
@@ -275,6 +279,7 @@ struct cdrom_generic_command
unsigned int buflen;
int stat;
struct request_sense *sense;
+ unsigned char data_direction;
void *reserved[3];
};
@@ -790,7 +795,8 @@ extern int cdrom_mode_sense(struct cdrom_device_info *cdi,
struct cdrom_generic_command *cgc,
int page_code, int page_control);
extern void init_cdrom_command(struct cdrom_generic_command *cgc,
- void *buffer, int len);
+ void *buffer, int len, int type);
+extern struct cdrom_device_info *cdrom_find_device(kdev_t dev);
typedef struct {
__u16 disc_information_length;
@@ -798,9 +804,9 @@ typedef struct {
__u8 reserved1 : 3;
__u8 erasable : 1;
__u8 border_status : 2;
- __u8 disc_border : 2;
+ __u8 disc_status : 2;
#elif defined(__LITTLE_ENDIAN_BITFIELD)
- __u8 disc_border : 2;
+ __u8 disc_status : 2;
__u8 border_status : 2;
__u8 erasable : 1;
__u8 reserved1 : 3;
@@ -938,7 +944,6 @@ struct mode_page_header {
};
typedef struct {
- struct mode_page_header header;
#if defined(__BIG_ENDIAN_BITFIELD)
__u8 ps : 1;
__u8 reserved1 : 1;
@@ -991,7 +996,7 @@ typedef struct {
__u8 subhdr1;
__u8 subhdr2;
__u8 subhdr3;
-} write_param_page __attribute__((packed));
+} __attribute__((packed)) write_param_page;
#endif /* End of kernel only stuff */
diff --git a/include/linux/devfs_fs_kernel.h b/include/linux/devfs_fs_kernel.h
index b3abeacd4..b35fbe6e1 100644
--- a/include/linux/devfs_fs_kernel.h
+++ b/include/linux/devfs_fs_kernel.h
@@ -16,22 +16,26 @@
) ? m : MINOR((inode)->r_dev); })
-#define DEVFS_FL_NONE 0x000 /* This helps making code more readable */
-#define DEVFS_FL_AUTO_OWNER 0x001 /* When a closed inode is opened the
- ownerships are set to the opening
- process and the protection is set to
- that given in <<mode>>. When the inode
- is closed, ownership reverts back to
- <<uid>> and <<gid>> and the protection
- is set to read-write for all */
-#define DEVFS_FL_SHOW_UNREG 0x002 /* Show unregistered entries in
- directory listings */
-#define DEVFS_FL_HIDE 0x004 /* Do not show entry in directory list */
-#define DEVFS_FL_AUTO_DEVNUM 0x008 /* Automatically generate device number */
-#define DEVFS_FL_AOPEN_NOTIFY 0x010 /* Asynchronously notify devfsd on open */
-#define DEVFS_FL_REMOVABLE 0x020 /* This is a removable media device */
-#define DEVFS_FL_WAIT 0x040 /* Wait for devfsd to finish */
-#define DEVFS_FL_DEFAULT DEVFS_FL_NONE
+#define DEVFS_FL_NONE 0x000 /* This helps to make code more readable
+ */
+#define DEVFS_FL_AUTO_OWNER 0x001 /* When a closed inode is opened the
+ ownerships are set to the opening
+ process and the protection is set to
+ that given in <<mode>>. When the inode
+ is closed, ownership reverts back to
+ <<uid>> and <<gid>> and the protection
+ is set to read-write for all */
+#define DEVFS_FL_SHOW_UNREG 0x002 /* Show unregistered entries in
+ directory listings */
+#define DEVFS_FL_HIDE 0x004 /* Do not show entry in directory list */
+#define DEVFS_FL_AUTO_DEVNUM 0x008 /* Automatically generate device number
+ */
+#define DEVFS_FL_AOPEN_NOTIFY 0x010 /* Asynchronously notify devfsd on open
+ */
+#define DEVFS_FL_REMOVABLE 0x020 /* This is a removable media device */
+#define DEVFS_FL_WAIT 0x040 /* Wait for devfsd to finish */
+#define DEVFS_FL_NO_PERSISTENCE 0x080 /* Forget changes after unregister */
+#define DEVFS_FL_DEFAULT DEVFS_FL_NONE
#define DEVFS_SPECIAL_CHR 0
diff --git a/include/linux/fs.h b/include/linux/fs.h
index e33bdfa72..45ec949e1 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -630,6 +630,11 @@ struct super_block {
/*
* VFS helper functions..
*/
+extern int vfs_create(struct inode *, struct dentry *, int);
+extern int vfs_mkdir(struct inode *, struct dentry *, int);
+extern int vfs_mknod(struct inode *, struct dentry *, int, dev_t);
+extern int vfs_symlink(struct inode *, struct dentry *, const char *);
+extern int vfs_link(struct dentry *, struct inode *, struct dentry *);
extern int vfs_rmdir(struct inode *, struct dentry *);
extern int vfs_unlink(struct inode *, struct dentry *);
extern int vfs_rename(struct inode *, struct dentry *, struct inode *, struct dentry *);
@@ -1028,6 +1033,8 @@ extern int page_readlink(struct dentry *, char *, int);
extern struct dentry *page_follow_link(struct dentry *, struct dentry *, unsigned);
extern struct inode_operations page_symlink_inode_operations;
+extern int vfs_readdir(struct file *, filldir_t, void *);
+
extern struct super_block *get_super(kdev_t);
struct super_block *get_empty_super(void);
void remove_vfsmnt(kdev_t dev);
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h
index 22a5ed28a..ed98106ed 100644
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
@@ -69,6 +69,7 @@
#define I2C_DRIVERID_MGATVO 23 /* Matrox TVOut */
#define I2C_DRIVERID_SAA5249 24 /* SAA5249 and compatibles */
#define I2C_DRIVERID_PCF8583 25 /* real time clock */
+#define I2C_DRIVERID_SAB3036 26 /* SAB3036 tuner */
#define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */
#define I2C_DRIVERID_EXP1 0xF1
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 3672f2789..64136c732 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -358,7 +358,8 @@ typedef enum { ide_unknown, ide_generic, ide_pci,
ide_cmd640, ide_dtc2278, ide_ali14xx,
ide_qd6580, ide_umc8672, ide_ht6560b,
ide_pdc4030, ide_rz1000, ide_trm290,
- ide_cmd646, ide_cy82c693, ide_4drives
+ ide_cmd646, ide_cy82c693, ide_4drives,
+ ide_pmac
} hwif_chipset_t;
#ifdef CONFIG_BLK_DEV_IDEPCI
diff --git a/include/linux/linkage.h b/include/linux/linkage.h
index c5c834d97..c2619da50 100644
--- a/include/linux/linkage.h
+++ b/include/linux/linkage.h
@@ -15,17 +15,6 @@
#define asmlinkage CPP_ASMLINKAGE
#endif
-#ifdef __sh__
-#define STRINGIFY(X) #X
-#define SYMBOL_NAME_STR(X) STRINGIFY(SYMBOL_NAME(X))
-#ifdef __STDC__
-#define SYMBOL_NAME(X) _##X
-#define SYMBOL_NAME_LABEL(X) _##X##:
-#else
-#define SYMBOL_NAME(X) _/**/X
-#define SYMBOL_NAME_LABEL(X) _/**/X/**/:
-#endif
-#else
#define SYMBOL_NAME_STR(X) #X
#define SYMBOL_NAME(X) X
#ifdef __STDC__
@@ -33,7 +22,6 @@
#else
#define SYMBOL_NAME_LABEL(X) X/**/:
#endif
-#endif
#ifdef __arm__
#define __ALIGN .align 0
diff --git a/include/linux/netfilter.h b/include/linux/netfilter.h
index 954229d6c..9b72c14de 100644
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
@@ -179,7 +179,6 @@ enum nf_reason {
NF_REASON_SET_BY_IPCHAINS,
NF_REASON_FOR_ROUTING,
NF_REASON_FOR_CLS_FW,
- NF_REASON_MIN_RESERVED_FOR_CONNTRACK = 1024,
};
#endif /*__LINUX_NETFILTER_H*/
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 015855fa0..6081b0890 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -37,6 +37,17 @@
#define NET_CALLER(arg) __builtin_return_address(0)
#endif
+#ifdef CONFIG_NETFILTER
+struct nf_conntrack {
+ atomic_t use;
+ void (*destroy)(struct nf_conntrack *);
+};
+
+struct nf_ct_info {
+ struct nf_conntrack *master;
+};
+#endif
+
struct sk_buff_head {
/* These two members must be first. */
struct sk_buff * next;
@@ -115,6 +126,8 @@ struct sk_buff {
__u32 nfreason;
/* Cache info */
__u32 nfcache;
+ /* Associated connection, if any */
+ struct nf_ct_info *nfct;
#ifdef CONFIG_NETFILTER_DEBUG
unsigned int nf_debug;
#endif
@@ -635,5 +648,20 @@ extern void skb_free_datagram(struct sock * sk, struct sk_buff *skb);
extern void skb_init(void);
extern void skb_add_mtu(int mtu);
+#ifdef CONFIG_NETFILTER
+extern __inline__ void
+nf_conntrack_put(struct nf_ct_info *nfct)
+{
+ if (nfct && atomic_dec_and_test(&nfct->master->use))
+ nfct->master->destroy(nfct->master);
+}
+extern __inline__ void
+nf_conntrack_get(struct nf_ct_info *nfct)
+{
+ if (nfct)
+ atomic_inc(&nfct->master->use);
+}
+#endif
+
#endif /* __KERNEL__ */
#endif /* _LINUX_SKBUFF_H */
diff --git a/include/linux/zorro.h b/include/linux/zorro.h
index 26c7a460e..9e7c07889 100644
--- a/include/linux/zorro.h
+++ b/include/linux/zorro.h
@@ -717,7 +717,6 @@ extern struct zorro_dev zorro_autocon[ZORRO_NUM_AUTO];
*/
extern void zorro_init(void);
-extern void zorro_proc_init(void);
extern struct zorro_dev *zorro_find_device(zorro_id id,
struct zorro_dev *from);
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-20 17:31:07 +0000