git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into x86/urgent
[pandora-kernel.git]
/
drivers
/
scsi
/
osst.h
diff --git
a/drivers/scsi/osst.h
b/drivers/scsi/osst.h
index
1e426f5
..
5aa2274
100644
(file)
--- a/
drivers/scsi/osst.h
+++ b/
drivers/scsi/osst.h
@@
-4,6
+4,7
@@
#include <asm/byteorder.h>
#include <linux/completion.h>
#include <asm/byteorder.h>
#include <linux/completion.h>
+#include <linux/mutex.h>
/* FIXME - rename and use the following two types or delete them!
* and the types really should go to st.h anyway...
/* FIXME - rename and use the following two types or delete them!
* and the types really should go to st.h anyway...
@@
-288,11
+289,11
@@
typedef struct {
#else
#error "Please fix <asm/byteorder.h>"
#endif
#else
#error "Please fix <asm/byteorder.h>"
#endif
-
u16
max_speed; /* Maximum speed supported in KBps */
+
__be16
max_speed; /* Maximum speed supported in KBps */
u8 reserved10, reserved11;
u8 reserved10, reserved11;
-
u16
ctl; /* Continuous Transfer Limit in blocks */
-
u16
speed; /* Current Speed, in KBps */
-
u16
buffer_size; /* Buffer Size, in 512 bytes */
+
__be16
ctl; /* Continuous Transfer Limit in blocks */
+
__be16
speed; /* Current Speed, in KBps */
+
__be16
buffer_size; /* Buffer Size, in 512 bytes */
u8 reserved18, reserved19;
} osst_capabilities_page_t;
u8 reserved18, reserved19;
} osst_capabilities_page_t;
@@
-352,8
+353,8
@@
typedef struct {
u8 reserved2;
u8 density;
u8 reserved3,reserved4;
u8 reserved2;
u8 density;
u8 reserved3,reserved4;
-
u16
segtrk;
-
u16
trks;
+
__be16
segtrk;
+
__be16
trks;
u8 reserved5,reserved6,reserved7,reserved8,reserved9,reserved10;
} osst_tape_paramtr_page_t;
u8 reserved5,reserved6,reserved7,reserved8,reserved9,reserved10;
} osst_tape_paramtr_page_t;
@@
-369,18
+370,18
@@
typedef struct {
typedef struct os_partition_s {
__u8 partition_num;
__u8 par_desc_ver;
typedef struct os_partition_s {
__u8 partition_num;
__u8 par_desc_ver;
- __
u16
wrt_pass_cntr;
- __
u32
first_frame_ppos;
- __
u32
last_frame_ppos;
- __
u32
eod_frame_ppos;
+ __
be16
wrt_pass_cntr;
+ __
be32
first_frame_ppos;
+ __
be32
last_frame_ppos;
+ __
be32
eod_frame_ppos;
} os_partition_t;
/*
* DAT entry
*/
typedef struct os_dat_entry_s {
} os_partition_t;
/*
* DAT entry
*/
typedef struct os_dat_entry_s {
- __
u32
blk_sz;
- __
u16
blk_cnt;
+ __
be32
blk_sz;
+ __
be16
blk_cnt;
__u8 flags;
__u8 reserved;
} os_dat_entry_t;
__u8 flags;
__u8 reserved;
} os_dat_entry_t;
@@
-412,23
+413,23
@@
typedef struct os_dat_s {
* AUX
*/
typedef struct os_aux_s {
* AUX
*/
typedef struct os_aux_s {
- __
u32
format_id; /* hardware compability AUX is based on */
+ __
be32
format_id; /* hardware compability AUX is based on */
char application_sig[4]; /* driver used to write this media */
char application_sig[4]; /* driver used to write this media */
- __
u32
hdwr; /* reserved */
- __
u32
update_frame_cntr; /* for configuration frame */
+ __
be32
hdwr; /* reserved */
+ __
be32
update_frame_cntr; /* for configuration frame */
__u8 frame_type;
__u8 frame_type_reserved;
__u8 reserved_18_19[2];
os_partition_t partition;
__u8 reserved_36_43[8];
__u8 frame_type;
__u8 frame_type_reserved;
__u8 reserved_18_19[2];
os_partition_t partition;
__u8 reserved_36_43[8];
- __
u32
frame_seq_num;
- __
u32
logical_blk_num_high;
- __
u32
logical_blk_num;
+ __
be32
frame_seq_num;
+ __
be32
logical_blk_num_high;
+ __
be32
logical_blk_num;
os_dat_t dat;
__u8 reserved188_191[4];
os_dat_t dat;
__u8 reserved188_191[4];
- __
u32
filemark_cnt;
- __
u32
phys_fm;
- __
u32
last_mark_ppos;
+ __
be32
filemark_cnt;
+ __
be32
phys_fm;
+ __
be32
last_mark_ppos;
__u8 reserved204_223[20];
/*
__u8 reserved204_223[20];
/*
@@
-436,8
+437,8
@@
typedef struct os_aux_s {
*
* Linux specific fields:
*/
*
* Linux specific fields:
*/
- __
u32
next_mark_ppos; /* when known, points to next marker */
- __
u32
last_mark_lbn; /* storing log_blk_num of last mark is extends ADR spec */
+ __
be32
next_mark_ppos; /* when known, points to next marker */
+ __
be32
last_mark_lbn; /* storing log_blk_num of last mark is extends ADR spec */
__u8 linux_specific[24];
__u8 reserved_256_511[256];
__u8 linux_specific[24];
__u8 reserved_256_511[256];
@@
-450,19
+451,19
@@
typedef struct os_fm_tab_s {
__u8 reserved_1;
__u8 fm_tab_ent_sz;
__u8 reserved_3;
__u8 reserved_1;
__u8 fm_tab_ent_sz;
__u8 reserved_3;
- __
u16
fm_tab_ent_cnt;
+ __
be16
fm_tab_ent_cnt;
__u8 reserved6_15[10];
__u8 reserved6_15[10];
- __
u32
fm_tab_ent[OS_FM_TAB_MAX];
+ __
be32
fm_tab_ent[OS_FM_TAB_MAX];
} os_fm_tab_t;
typedef struct os_ext_trk_ey_s {
__u8 et_part_num;
__u8 fmt;
} os_fm_tab_t;
typedef struct os_ext_trk_ey_s {
__u8 et_part_num;
__u8 fmt;
- __
u16
fm_tab_off;
+ __
be16
fm_tab_off;
__u8 reserved4_7[4];
__u8 reserved4_7[4];
- __
u32
last_hlb_hi;
- __
u32
last_hlb;
- __
u32
last_pp;
+ __
be32
last_hlb_hi;
+ __
be32
last_hlb;
+ __
be32
last_pp;
__u8 reserved20_31[12];
} os_ext_trk_ey_t;
__u8 reserved20_31[12];
} os_ext_trk_ey_t;
@@
-479,17
+480,17
@@
typedef struct os_header_s {
char ident_str[8];
__u8 major_rev;
__u8 minor_rev;
char ident_str[8];
__u8 major_rev;
__u8 minor_rev;
- __
u16
ext_trk_tb_off;
+ __
be16
ext_trk_tb_off;
__u8 reserved12_15[4];
__u8 pt_par_num;
__u8 pt_reserved1_3[3];
os_partition_t partition[16];
__u8 reserved12_15[4];
__u8 pt_par_num;
__u8 pt_reserved1_3[3];
os_partition_t partition[16];
- __
u32
cfg_col_width;
- __
u32
dat_col_width;
- __
u32
qfa_col_width;
+ __
be32
cfg_col_width;
+ __
be32
dat_col_width;
+ __
be32
qfa_col_width;
__u8 cartridge[16];
__u8 reserved304_511[208];
__u8 cartridge[16];
__u8 reserved304_511[208];
- __
u32
old_filemark_list[16680/4]; /* in ADR 1.4 __u8 track_table[16680] */
+ __
be32
old_filemark_list[16680/4]; /* in ADR 1.4 __u8 track_table[16680] */
os_ext_trk_tb_t ext_track_tb;
__u8 reserved17272_17735[464];
os_fm_tab_t dat_fm_tab;
os_ext_trk_tb_t ext_track_tb;
__u8 reserved17272_17735[464];
os_fm_tab_t dat_fm_tab;
@@
-532,7
+533,7
@@
struct osst_tape {
struct scsi_driver *driver;
unsigned capacity;
struct scsi_device *device;
struct scsi_driver *driver;
unsigned capacity;
struct scsi_device *device;
- struct
semaphore lock;
/* for serialization */
+ struct
mutex lock;
/* for serialization */
struct completion wait; /* for SCSI commands */
struct osst_buffer * buffer;
struct completion wait; /* for SCSI commands */
struct osst_buffer * buffer;