From aba4e552a2f2c1492441acbccedd8e0a4c53f916 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 18 Feb 2000 22:06:10 +0000 Subject: Merge with Linux 2.3.43. --- include/linux/agp_backend.h | 1 + include/linux/agpgart.h | 8 +++ include/linux/auto_fs.h | 8 ++- include/linux/i2c-dev.h | 127 +++++++++++++++++++++++--------------------- include/linux/i2c-elektor.h | 10 ++-- include/linux/mmzone.h | 6 --- include/linux/nfsd/export.h | 3 +- include/linux/nfsd/nfsd.h | 5 +- include/linux/proc_fs.h | 3 -- include/linux/qnx4_fs.h | 7 +-- include/linux/serial.h | 15 ++++++ include/linux/serialP.h | 10 +--- 12 files changed, 112 insertions(+), 91 deletions(-) (limited to 'include/linux') diff --git a/include/linux/agp_backend.h b/include/linux/agp_backend.h index d2ae68864..eaa8bd1be 100644 --- a/include/linux/agp_backend.h +++ b/include/linux/agp_backend.h @@ -94,6 +94,7 @@ typedef struct _agp_memory { unsigned long *memory; off_t pg_start; u32 type; + u32 physical; u8 is_bound; u8 is_flushed; } agp_memory; diff --git a/include/linux/agpgart.h b/include/linux/agpgart.h index 86617386e..7457cd114 100644 --- a/include/linux/agpgart.h +++ b/include/linux/agpgart.h @@ -92,6 +92,10 @@ typedef struct _agp_allocate { int key; /* tag of allocation */ size_t pg_count; /* number of pages */ __u32 type; /* 0 == normal, other devspec */ + __u32 physical; /* device specific (some devices + * need a phys address of the + * actual page behind the gatt + * table) */ } agp_allocate; typedef struct _agp_bind { @@ -160,6 +164,10 @@ typedef struct _agp_allocate { int key; /* tag of allocation */ size_t pg_count; /* number of pages */ u32 type; /* 0 == normal, other devspec */ + u32 physical; /* device specific (some devices + * need a phys address of the + * actual page behind the gatt + * table) */ } agp_allocate; typedef struct _agp_bind { diff --git a/include/linux/auto_fs.h b/include/linux/auto_fs.h index a8b313539..99f9784d3 100644 --- a/include/linux/auto_fs.h +++ b/include/linux/auto_fs.h @@ -20,8 +20,14 @@ #include #include +/* This header file describes a range of autofs interface versions; + the new implementation ("autofs4") supports them all, but the old + implementation only supports v3. */ #define AUTOFS_MIN_PROTO_VERSION 3 /* Min version we support */ -#define AUTOFS_PROTO_VERSION 4 /* Current version */ +#define AUTOFS_MAX_PROTO_VERSION 4 /* Max (current) version */ + +/* Backwards compat for autofs v3; it just implements a version */ +#define AUTOFS_PROTO_VERSION 3 /* v3 version */ /* * Architectures where both 32- and 64-bit binaries can be executed diff --git a/include/linux/i2c-dev.h b/include/linux/i2c-dev.h index 7d52e52bc..7588f626b 100644 --- a/include/linux/i2c-dev.h +++ b/include/linux/i2c-dev.h @@ -19,7 +19,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id: i2c-dev.h,v 1.3 1999/12/21 23:45:58 frodo Exp $ */ +/* $Id: i2c-dev.h,v 1.6 2000/01/24 21:56:58 frodo Exp $ */ #ifndef I2C_DEV_H #define I2C_DEV_H @@ -33,10 +33,10 @@ /* This is the structure as used in the I2C_SMBUS ioctl call */ struct i2c_smbus_ioctl_data { - char read_write; - __u8 command; - int size; - union i2c_smbus_data *data; + char read_write; + __u8 command; + int size; + union i2c_smbus_data *data; }; #ifndef __KERNEL__ @@ -46,79 +46,83 @@ struct i2c_smbus_ioctl_data { extern inline __s32 i2c_smbus_access(int file, char read_write, __u8 command, int size, union i2c_smbus_data *data) { - struct i2c_smbus_ioctl_data args; + struct i2c_smbus_ioctl_data args; - args.read_write = read_write; - args.command = command; - args.size = size; - args.data = data; - return ioctl(file,I2C_SMBUS,&args); + args.read_write = read_write; + args.command = command; + args.size = size; + args.data = data; + return ioctl(file,I2C_SMBUS,&args); } extern inline __s32 i2c_smbus_write_quick(int file, __u8 value) { - return i2c_smbus_access(file,value,0,I2C_SMBUS_QUICK,NULL); + return i2c_smbus_access(file,value,0,I2C_SMBUS_QUICK,NULL); } - + extern inline __s32 i2c_smbus_read_byte(int file) { - union i2c_smbus_data data; - if (i2c_smbus_access(file,I2C_SMBUS_READ,0,I2C_SMBUS_BYTE,&data)) - return -1; - else - return 0x0FF & data.byte; + union i2c_smbus_data data; + if (i2c_smbus_access(file,I2C_SMBUS_READ,0,I2C_SMBUS_BYTE,&data)) + return -1; + else + return 0x0FF & data.byte; } extern inline __s32 i2c_smbus_write_byte(int file, __u8 value) { - return i2c_smbus_access(file,I2C_SMBUS_WRITE,value, I2C_SMBUS_BYTE,NULL); + return i2c_smbus_access(file,I2C_SMBUS_WRITE,value, + I2C_SMBUS_BYTE,NULL); } extern inline __s32 i2c_smbus_read_byte_data(int file, __u8 command) { - union i2c_smbus_data data; - if (i2c_smbus_access(file,I2C_SMBUS_READ,command,I2C_SMBUS_BYTE_DATA,&data)) - return -1; - else - return 0x0FF & data.byte; + union i2c_smbus_data data; + if (i2c_smbus_access(file,I2C_SMBUS_READ,command, + I2C_SMBUS_BYTE_DATA,&data)) + return -1; + else + return 0x0FF & data.byte; } extern inline __s32 i2c_smbus_write_byte_data(int file, __u8 command, __u8 value) { - union i2c_smbus_data data; - data.byte = value; - return i2c_smbus_access(file,I2C_SMBUS_WRITE,command,I2C_SMBUS_BYTE_DATA, - &data); + union i2c_smbus_data data; + data.byte = value; + return i2c_smbus_access(file,I2C_SMBUS_WRITE,command, + I2C_SMBUS_BYTE_DATA, &data); } extern inline __s32 i2c_smbus_read_word_data(int file, __u8 command) { - union i2c_smbus_data data; - if (i2c_smbus_access(file,I2C_SMBUS_READ,command,I2C_SMBUS_WORD_DATA,&data)) - return -1; - else - return 0x0FFFF & data.word; + union i2c_smbus_data data; + if (i2c_smbus_access(file,I2C_SMBUS_READ,command, + I2C_SMBUS_WORD_DATA,&data)) + return -1; + else + return 0x0FFFF & data.word; } extern inline __s32 i2c_smbus_write_word_data(int file, __u8 command, __u16 value) { - union i2c_smbus_data data; - data.word = value; - return i2c_smbus_access(file,I2C_SMBUS_WRITE,command,I2C_SMBUS_WORD_DATA, - &data); + union i2c_smbus_data data; + data.word = value; + return i2c_smbus_access(file,I2C_SMBUS_WRITE,command, + I2C_SMBUS_WORD_DATA, &data); } extern inline __s32 i2c_smbus_process_call(int file, __u8 command, __u16 value) { - union i2c_smbus_data data; - data.word = value; - if (i2c_smbus_access(file,I2C_SMBUS_WRITE,command,I2C_SMBUS_PROC_CALL,&data)) - return -1; - else - return 0x0FFFF & data.word; + union i2c_smbus_data data; + data.word = value; + if (i2c_smbus_access(file,I2C_SMBUS_WRITE,command, + I2C_SMBUS_PROC_CALL,&data)) + return -1; + else + return 0x0FFFF & data.word; } @@ -126,29 +130,30 @@ extern inline __s32 i2c_smbus_process_call(int file, __u8 command, __u16 value) extern inline __s32 i2c_smbus_read_block_data(int file, __u8 command, __u8 *values) { - union i2c_smbus_data data; - int i; - if (i2c_smbus_access(file,I2C_SMBUS_READ,command,I2C_SMBUS_BLOCK_DATA,&data)) - return -1; - else { - for (i = 1; i <= data.block[0]; i++) - values[i-1] = data.block[i]; - return data.block[0]; - } + union i2c_smbus_data data; + int i; + if (i2c_smbus_access(file,I2C_SMBUS_READ,command, + I2C_SMBUS_BLOCK_DATA,&data)) + return -1; + else { + for (i = 1; i <= data.block[0]; i++) + values[i-1] = data.block[i]; + return data.block[0]; + } } extern inline __s32 i2c_smbus_write_block_data(int file, __u8 command, __u8 length, __u8 *values) { - union i2c_smbus_data data; - int i; - if (length > 32) - length = 32; - for (i = 1; i <= length; i++) - data.block[i] = values[i-1]; - data.block[0] = length; - return i2c_smbus_access(file,I2C_SMBUS_WRITE,command,I2C_SMBUS_BLOCK_DATA, - &data); + union i2c_smbus_data data; + int i; + if (length > 32) + length = 32; + for (i = 1; i <= length; i++) + data.block[i] = values[i-1]; + data.block[0] = length; + return i2c_smbus_access(file,I2C_SMBUS_WRITE,command, + I2C_SMBUS_BLOCK_DATA, &data); } #endif /* ndef __KERNEL__ */ diff --git a/include/linux/i2c-elektor.h b/include/linux/i2c-elektor.h index e10311f22..f2d8155b2 100644 --- a/include/linux/i2c-elektor.h +++ b/include/linux/i2c-elektor.h @@ -22,7 +22,7 @@ /* With some changes from Kyösti Mälkki and even Frodo Looijaard */ -/* $Id: i2c-elektor.h,v 1.3 1999/12/21 23:45:58 frodo Exp $ */ +/* $Id: i2c-elektor.h,v 1.4 2000/01/18 23:54:07 frodo Exp $ */ #ifndef I2C_PCF_ELEKTOR_H #define I2C_PCF_ELEKTOR_H 1 @@ -33,10 +33,10 @@ */ struct i2c_pcf_isa { - int pi_base; - int pi_irq; - int pi_clock; - int pi_own; + int pi_base; + int pi_irq; + int pi_clock; + int pi_own; }; diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 540bd8ada..e3d688acf 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -12,13 +12,7 @@ * Free memory management - zoned buddy allocator. */ -#if CONFIG_AP1000 -/* the AP+ needs to allocate 8MB contiguous, aligned chunks of ram - for the ring buffers */ -#define MAX_ORDER 12 -#else #define MAX_ORDER 10 -#endif typedef struct free_area_struct { struct list_head free_list; diff --git a/include/linux/nfsd/export.h b/include/linux/nfsd/export.h index febb7c741..0704c88e1 100644 --- a/include/linux/nfsd/export.h +++ b/include/linux/nfsd/export.h @@ -37,7 +37,8 @@ #define NFSEXP_SUNSECURE 0x0100 #define NFSEXP_CROSSMNT 0x0200 #define NFSEXP_NOSUBTREECHECK 0x0400 -#define NFSEXP_ALLFLAGS 0x07FF +#define NFSEXP_NOAUTHNLM 0x0800 /* Don't authenticate NLM requests - just trust */ +#define NFSEXP_ALLFLAGS 0x0FFF #ifdef __KERNEL__ diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h index 25b95ee44..67456e4d1 100644 --- a/include/linux/nfsd/nfsd.h +++ b/include/linux/nfsd/nfsd.h @@ -35,8 +35,9 @@ #define MAY_NOP 0 #define MAY_SATTR 8 #define MAY_TRUNC 16 -#if (MAY_SATTR | MAY_TRUNC) & (MAY_READ | MAY_WRITE | MAY_EXEC) -# error "please use a different value for MAY_SATTR or MAY_TRUNC." +#define MAY_LOCK 32 +#if (MAY_SATTR | MAY_TRUNC | MAY_LOCK) & (MAY_READ | MAY_WRITE | MAY_EXEC) +# error "please use a different value for MAY_SATTR or MAY_TRUNC or MAY_LOCK." #endif #define MAY_CREATE (MAY_EXEC|MAY_WRITE) #define MAY_REMOVE (MAY_EXEC|MAY_WRITE|MAY_TRUNC) diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index 1678b897c..30f86f49f 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h @@ -115,9 +115,6 @@ extern struct dentry *proc_lookup(struct inode *, struct dentry *); extern struct inode_operations proc_sys_inode_operations; extern struct inode_operations proc_kcore_inode_operations; extern struct inode_operations proc_kmsg_inode_operations; -#if CONFIG_AP1000 -extern struct inode_operations proc_ringbuf_inode_operations; -#endif extern struct inode_operations proc_omirr_inode_operations; extern struct inode_operations proc_ppc_htab_inode_operations; diff --git a/include/linux/qnx4_fs.h b/include/linux/qnx4_fs.h index 8cac77c3c..e340e3dfe 100644 --- a/include/linux/qnx4_fs.h +++ b/include/linux/qnx4_fs.h @@ -3,7 +3,7 @@ * Author : Richard Frowijn * Function : qnx4 global filesystem definitions * Version : 1.0.2 - * Last modified : 2000-01-06 + * Last modified : 2000-01-31 * * History : 23-03-1998 created */ @@ -29,7 +29,9 @@ #define QNX4_VALID_FS 0x0001 /* Clean fs. */ #define QNX4_ERROR_FS 0x0002 /* fs has errors. */ #define QNX4_BLOCK_SIZE 0x200 /* blocksize of 512 bytes */ -#define QNX4_DIR_ENTRY_SIZE 0x040 /* dir entry size */ +#define QNX4_BLOCK_SIZE_BITS 9 /* blocksize shift */ +#define QNX4_DIR_ENTRY_SIZE 0x040 /* dir entry size of 64 bytes */ +#define QNX4_DIR_ENTRY_SIZE_BITS 6 /* dir entry size shift */ #define QNX4_XBLK_ENTRY_SIZE 0x200 /* xblk entry size */ #define QNX4_INODES_PER_BLOCK 0x08 /* 512 / 64 */ @@ -96,7 +98,6 @@ struct qnx4_super_block { #endif extern struct dentry *qnx4_lookup(struct inode *dir, struct dentry *dentry); -extern unsigned long qnx4_count_free_inodes(struct super_block *sb); extern unsigned long qnx4_count_free_blocks(struct super_block *sb); extern unsigned long qnx4_block_map(struct inode *inode, long iblock); diff --git a/include/linux/serial.h b/include/linux/serial.h index ffc8d9d49..48db96051 100644 --- a/include/linux/serial.h +++ b/include/linux/serial.h @@ -10,6 +10,21 @@ #ifndef _LINUX_SERIAL_H #define _LINUX_SERIAL_H +/* + * Counters of the input lines (CTS, DSR, RI, CD) interrupts + */ + +struct async_icount { + __u32 cts, dsr, rng, dcd, tx, rx; + __u32 frame, parity, overrun, brk; + __u32 buf_overrun; +}; + +/* + * The size of the serial xmit buffer is 1 page, or 4096 bytes + */ +#define SERIAL_XMIT_SIZE 4096 + struct serial_struct { int type; int line; diff --git a/include/linux/serialP.h b/include/linux/serialP.h index ffd52dd86..6bb99d32f 100644 --- a/include/linux/serialP.h +++ b/include/linux/serialP.h @@ -19,19 +19,11 @@ * For definitions of the flags field, see tty.h */ +#include #include #include #include -/* - * Counters of the input lines (CTS, DSR, RI, CD) interrupts - */ -struct async_icount { - __u32 cts, dsr, rng, dcd, tx, rx; - __u32 frame, parity, overrun, brk; - __u32 buf_overrun; -}; - struct serial_state { int magic; int baud_base; -- cgit v1.2.3