diff options
| -rw-r--r-- | RedirectionConstants.h | 6 | ||||
| -rw-r--r-- | ider.c | 47 | ||||
| -rw-r--r-- | redir.h | 1 |
3 files changed, 50 insertions, 4 deletions
diff --git a/RedirectionConstants.h b/RedirectionConstants.h index fcced21..f677922 100644 --- a/RedirectionConstants.h +++ b/RedirectionConstants.h @@ -78,7 +78,7 @@ #define IDER_ERROR_MASK 0x02 #define IDER_SECTOR_COUNT_MASK 0x04 #define IDER_SECTOR_NUM_MASK 0x08 -#define IDER_BYTE_CNT_LSG_MASK 0x10 +#define IDER_BYTE_CNT_LSB_MASK 0x10 #define IDER_BYTE_CNT_MSB_MASK 0x20 #define IDER_DRIVE_SELECT_MASK 0x40 #define IDER_STATUS_MASK 0x80 @@ -88,8 +88,8 @@ #define IDER_STATUS_DRDY 0x40 #define IDER_STATUS_DF 0x20 #define IDER_STATUS_DSC 0x10 -#define IDER_STATUS_DRQ 0x80 -#define IDER_STATUS_CORR 0x40 +#define IDER_STATUS_DRQ 0x08 +#define IDER_STATUS_CORR 0x04 #define IDER_STATUS_IDX 0x02 #define IDER_STATUS_ERR 0x01 @@ -18,11 +18,46 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include <sys/types.h> +#include <stdio.h> +#include <stdlib.h> #include <string.h> +#include <sys/types.h> #include <scsi/scsi.h> #include "redir.h" +static int ider_data_to_host(struct redir *r, unsigned int seqno, + unsigned char *data, unsigned int data_len) +{ + unsigned char device = 0xb0; + unsigned char *request; + int ret; + unsigned char mask = IDER_STATUS_MASK | IDER_SECTOR_COUNT_MASK | + IDER_INTERRUPT_MASK; + struct ider_data_to_host_message msg = { + .type = IDER_DATA_TO_HOST, + .input.mask = mask | IDER_BYTE_CNT_LSB_MASK | IDER_BYTE_CNT_MSB_MASK, + .input.sector_count = IDER_INTERRUPT_IO, + .input.byte_count_lsb = (data_len & 0xff), + .input.byte_count_msb = (data_len >> 8) & 0xff, + .input.drive_select = device, + .input.status = IDER_STATUS_DRDY | IDER_STATUS_DSC | IDER_STATUS_DRQ, + .output.mask = mask, + .output.sector_count = IDER_INTERRUPT_CD | IDER_INTERRUPT_CD, + .output.drive_select = device, + .output.status = IDER_STATUS_DRDY | IDER_STATUS_DSC, + }; + + memcpy(&msg.transfer_bytes, &data_len, 2); + memcpy(&msg.sequence_number, &seqno, 4); + request = malloc(sizeof(msg) + data_len); + memcpy(request, &msg, sizeof(msg)); + memcpy(request + sizeof(msg), data, data_len); + + ret = redir_write(r, request, sizeof(msg) + data_len); + free(request); + return ret; +} + static int ider_packet_sense(struct redir *r, unsigned int seqno, unsigned char device, unsigned char sense, unsigned char asc, unsigned char asq) @@ -52,6 +87,7 @@ int ider_handle_command(struct redir *r, unsigned int seqno, unsigned char *cdb) { unsigned char device = 0xb0; + unsigned char resp[512]; if (!r->filename) /* NOT READY, MEDIUM NOT PRESENT */ @@ -60,9 +96,18 @@ int ider_handle_command(struct redir *r, unsigned int seqno, switch (cdb[0]) { case TEST_UNIT_READY: return ider_packet_sense(r, seqno, device, 0, 0, 0); + case MODE_SENSE_6: + if (cdb[2] != 0x3f || cdb[3] != 0x00) + return ider_packet_sense(r, seqno, device, 0x05, 0x24, 0x00); + resp[0] = 0; + resp[1] = 0x05; + resp[2] = 0x80; + resp[3] = 0; + return ider default: break; } + fprintf(stderr, "seqno %u: unhandled command %02x\n", seqno, cdb[0]); /* ILLEGAL REQUEST, CDB NOT SUPPORTED */ return ider_packet_sense(r, seqno, device, 0x05, 0x20, 0x00); } @@ -114,6 +114,7 @@ struct __attribute__ ((__packed__)) ider_data_to_host_message { unsigned char sense; unsigned char asc; unsigned char asq; + unsigned char rsvd2[3]; }; const char *redir_state_name(enum redir_state state); |