From 69ddfc2954d2d29861c84671c9856219a0d49951 Mon Sep 17 00:00:00 2001 From: sos Date: Sat, 9 Oct 1999 19:57:13 +0000 Subject: Add support for the HPT366 chip, this is used on the Abit boards and their HotRod controller and on SIIG PCI ultra DMA controller. These changes also made lots of the Promise code go away, its all much more generic this way. Get rid of atapi_immed_cmd, instead use the queue to move atapi commands from interrupt context if nessesary, the entire atapi layer has gotten an overhaul. Lots of fixes to utililize the new features in subr_disk.c etc, and get rid of the last biots of softc arrays in the drivers, the only one left is atadevices which cannot easily go away (yet). Use our own malloc names, its a lot easier to track memory usage this way. General cleanup overall. --- sys/dev/ata/atapi-tape.h | 98 ++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'sys/dev/ata/atapi-tape.h') diff --git a/sys/dev/ata/atapi-tape.h b/sys/dev/ata/atapi-tape.h index b2b7bd4..7f67460 100644 --- a/sys/dev/ata/atapi-tape.h +++ b/sys/dev/ata/atapi-tape.h @@ -31,49 +31,49 @@ /* ATAPI tape drive Capabilities and Mechanical Status Page */ struct ast_cappage { /* mode page data header */ - u_int8_t data_length; /* total length of data */ - u_int8_t medium_type; /* medium type (if any) */ + u_int8_t data_length; /* total length of data */ + u_int8_t medium_type; /* medium type (if any) */ u_int8_t reserved :4; - u_int8_t mode :3; /* buffering mode */ - u_int8_t write_protect :1; /* media is writeprotected */ - u_int8_t blk_desc_len; /* block Descriptor Length */ + u_int8_t mode :3; /* buffering mode */ + u_int8_t write_protect :1; /* media is writeprotected */ + u_int8_t blk_desc_len; /* block Descriptor Length */ /* capabilities page */ u_int8_t page_code :6; #define ATAPI_TAPE_CAP_PAGE 0x2a u_int8_t reserved0_6 :1; - u_int8_t ps :1; /* parameters saveable */ - u_int8_t page_length; /* page Length == 0x12 */ + u_int8_t ps :1; /* parameters saveable */ + u_int8_t page_length; /* page Length == 0x12 */ u_int8_t reserved2; u_int8_t reserved3; - u_int8_t readonly :1; /* read Only Mode */ + u_int8_t readonly :1; /* read Only Mode */ u_int8_t reserved4_1234 :4; - u_int8_t reverse :1; /* supports reverse direction */ + u_int8_t reverse :1; /* supports reverse direction */ u_int8_t reserved4_67 :2; u_int8_t reserved5_012 :3; - u_int8_t eformat :1; /* supports ERASE formatting */ + u_int8_t eformat :1; /* supports ERASE formatting */ u_int8_t reserved5_4 :1; - u_int8_t qfa :1; /* supports QFA formats */ + u_int8_t qfa :1; /* supports QFA formats */ u_int8_t reserved5_67 :2; - u_int8_t lock :1; /* supports locking media */ - u_int8_t locked :1; /* the media is locked */ - u_int8_t prevent :1; /* defaults to prevent state */ - u_int8_t eject :1; /* supports eject */ - u_int8_t disconnect :1; /* can break request > ctl */ + u_int8_t lock :1; /* supports locking media */ + u_int8_t locked :1; /* the media is locked */ + u_int8_t prevent :1; /* defaults to prevent state */ + u_int8_t eject :1; /* supports eject */ + u_int8_t disconnect :1; /* can break request > ctl */ u_int8_t reserved6_5 :1; - u_int8_t ecc :1; /* supports error correction */ - u_int8_t compress :1; /* supports data compression */ + u_int8_t ecc :1; /* supports error correction */ + u_int8_t compress :1; /* supports data compression */ u_int8_t reserved7_0 :1; - u_int8_t blk512 :1; /* supports 512b block size */ - u_int8_t blk1024 :1; /* supports 1024b block size */ + u_int8_t blk512 :1; /* supports 512b block size */ + u_int8_t blk1024 :1; /* supports 1024b block size */ u_int8_t reserved7_3456 :4; - u_int8_t blk32k :1; /* supports 32kb block size */ - u_int16_t max_speed; /* supported speed in KBps */ - u_int16_t max_defects; /* max stored defect entries */ - u_int16_t ctl; /* continuous transfer limit */ - u_int16_t speed; /* current Speed, in KBps */ - u_int16_t buffer_size; /* buffer Size, in 512 bytes */ + u_int8_t blk32k :1; /* supports 32kb block size */ + u_int16_t max_speed; /* supported speed in KBps */ + u_int16_t max_defects; /* max stored defect entries */ + u_int16_t ctl; /* continuous transfer limit */ + u_int16_t speed; /* current Speed, in KBps */ + u_int16_t buffer_size; /* buffer Size, in 512 bytes */ u_int8_t reserved18; u_int8_t reserved19; }; @@ -81,44 +81,44 @@ struct ast_cappage { /* ATAPI OnStream ADR data transfer mode page (ADR unique) */ struct ast_transferpage { /* mode page data header */ - u_int8_t data_length; /* total length of data */ - u_int8_t medium_type; /* medium type (if any) */ - u_int8_t dsp; /* device specific parameter */ - u_int8_t blk_desc_len; /* block Descriptor Length */ + u_int8_t data_length; /* total length of data */ + u_int8_t medium_type; /* medium type (if any) */ + u_int8_t dsp; /* device specific parameter */ + u_int8_t blk_desc_len; /* block Descriptor Length */ /* data transfer page */ u_int8_t page_code :6; #define ATAPI_TAPE_TRANSFER_PAGE 0x30 u_int8_t reserved0_6 :1; - u_int8_t ps :1; /* parameters saveable */ - u_int8_t page_length; /* page Length == 0x02 */ + u_int8_t ps :1; /* parameters saveable */ + u_int8_t page_length; /* page Length == 0x02 */ u_int8_t reserved2; - u_int8_t read32k :1; /* 32k block size (data only) */ - u_int8_t read32k5 :1; /* 32.5k block size (data & AUX) */ + u_int8_t read32k :1; /* 32k blk size (data only) */ + u_int8_t read32k5 :1; /* 32.5k blk size (data&AUX) */ u_int8_t reserved3_23 :2; - u_int8_t write32k :1; /* 32k block size (data only) */ - u_int8_t write32k5 :1; /* 32.5k block size (data & AUX) */ + u_int8_t write32k :1; /* 32k blk size (data only) */ + u_int8_t write32k5 :1; /* 32.5k blk size (data&AUX) */ u_int8_t reserved3_6 :1; - u_int8_t streaming :1; /* streaming mode enable */ + u_int8_t streaming :1; /* streaming mode enable */ }; /* ATAPI OnStream ADR vendor identification mode page (ADR unique) */ struct ast_identifypage { /* mode page data header */ - u_int8_t data_length; /* total length of data */ - u_int8_t medium_type; /* medium type (if any) */ - u_int8_t dsp; /* device specific parameter */ - u_int8_t blk_desc_len; /* block Descriptor Length */ + u_int8_t data_length; /* total length of data */ + u_int8_t medium_type; /* medium type (if any) */ + u_int8_t dsp; /* device specific parameter */ + u_int8_t blk_desc_len; /* block Descriptor Length */ /* data transfer page */ u_int8_t page_code :6; #define ATAPI_TAPE_IDENTIFY_PAGE 0x36 u_int8_t reserved0_6 :1; - u_int8_t ps :1; /* parameters saveable */ - u_int8_t page_length; /* page Length == 0x06 */ - u_int8_t ident[4]; /* host id string */ + u_int8_t ps :1; /* parameters saveable */ + u_int8_t page_length; /* page Length == 0x06 */ + u_int8_t ident[4]; /* host id string */ u_int8_t reserved6; u_int8_t reserved7; }; @@ -126,17 +126,17 @@ struct ast_identifypage { /* ATAPI read position structure */ struct ast_readposition { u_int8_t reserved0_05 :6; - u_int8_t eop :1; /* end of partition */ - u_int8_t bop :1; /* beginning of partition */ + u_int8_t eop :1; /* end of partition */ + u_int8_t bop :1; /* beginning of partition */ u_int8_t reserved1; u_int8_t reserved2; u_int8_t reserved3; - u_int32_t host; /* frame address in buffer */ - u_int32_t tape; /* frame address on tape */ + u_int32_t host; /* frame address in buffer */ + u_int32_t tape; /* frame address on tape */ u_int8_t reserved12; u_int8_t reserved13; u_int8_t reserved14; - u_int8_t blks_in_buf; /* blocks in buffer */ + u_int8_t blks_in_buf; /* blocks in buffer */ u_int8_t reserved16; u_int8_t reserved17; u_int8_t reserved18; -- cgit v1.1