diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/scsi/gdth_ioctl.h | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/scsi/gdth_ioctl.h')
| -rw-r--r-- | drivers/scsi/gdth_ioctl.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/scsi/gdth_ioctl.h b/drivers/scsi/gdth_ioctl.h index 01f5db4c5..683956160 100644 --- a/drivers/scsi/gdth_ioctl.h +++ b/drivers/scsi/gdth_ioctl.h @@ -2,7 +2,7 @@ #define _GDTH_IOCTL_H /* gdth_ioctl.h - * $Id: gdth_ioctl.h,v 1.1 1997/02/21 08:07:27 achim Exp $ + * $Id: gdth_ioctl.h,v 1.2 1998/12/17 15:42:49 achim Exp $ */ /* IOCTLs */ @@ -16,12 +16,12 @@ #define GDTIOCTL_LOCKCHN (GDTIOCTL_MASK | 7) /* lock channel */ #define GDTIOCTL_EVENT (GDTIOCTL_MASK | 8) /* read controller events */ -#define GDTIOCTL_MAGIC 0x06030f07UL +#define GDTIOCTL_MAGIC 0xaffe0001UL /* IOCTL structure (write) */ typedef struct { - ulong magic; /* IOCTL magic */ + ulong32 magic; /* IOCTL magic */ ushort ioctl; /* IOCTL */ ushort ionode; /* controller number */ ushort service; /* controller service */ @@ -43,14 +43,15 @@ typedef struct { struct { int erase; /* erase event ? */ int handle; + unchar evt[34]; /* event structure */ } event; } iu; } gdth_iowr_str; /* IOCTL structure (read) */ typedef struct { - ulong size; /* buffer size */ - ulong status; /* IOCTL error code */ + ulong32 size; /* buffer size */ + ulong32 status; /* IOCTL error code */ union { struct { unchar data[1]; /* data */ @@ -76,7 +77,7 @@ typedef struct { } ctrcnt; struct { int handle; - unchar evt[32]; /* event structure */ + unchar evt[34]; /* event structure */ } event; } iu; } gdth_iord_str; |