--- uae/src/scsidev.c 2018/04/24 17:12:31 1.1.1.7 +++ uae/src/scsidev.c 2018/04/24 17:18:25 1.1.1.10 @@ -10,7 +10,6 @@ #include "sysconfig.h" #include "sysdeps.h" -#include "config.h" #include "threaddep/thread.h" #include "options.h" #include "memory.h" @@ -69,7 +68,7 @@ static int inquiry (SCSI *scgp, void *bp scmd->cdb.g0_cdb.cmd = SC_INQUIRY; scmd->cdb.g0_cdb.lun = scgp->lun; scmd->cdb.g0_cdb.count = cnt; - + scgp->cmdname = "inquiry"; if (scsicmd(scgp) < 0) @@ -115,7 +114,7 @@ static SCSI *openscsi (int scsibus, int return NULL; } else { return scgp; - } + } } static void closescsi (SCSI *scgp) @@ -205,13 +204,13 @@ static int start_thread (struct scsidevd return 1; #endif } - + /************* Exec device functions ****************/ static uae_u32 scsidev_open (void) { - uaecptr tmp1 = m68k_areg(regs, 1); /* IOReq */ + uaecptr tmp1 = m68k_areg (regs, 1); /* IOReq */ uae_u32 unit = m68k_dreg (regs, 0); struct scsidevdata *sdd; @@ -223,7 +222,7 @@ static uae_u32 scsidev_open (void) if ((sdd = get_scsidev_data (unit)) && start_thread (sdd)) { opencount++; - put_word (m68k_areg(regs, 6)+32, get_word (m68k_areg(regs, 6)+32) + 1); + put_word (m68k_areg (regs, 6)+32, get_word (m68k_areg (regs, 6)+32) + 1); put_long (tmp1 + 24, unit); /* io_Unit */ put_byte (tmp1 + 31, 0); /* io_Error */ put_byte (tmp1 + 8, 7); /* ln_type = NT_REPLYMSG */ @@ -242,7 +241,7 @@ static uae_u32 scsidev_close (void) #endif opencount--; - put_word (m68k_areg(regs, 6) + 32, get_word (m68k_areg(regs, 6) + 32) - 1); + put_word (m68k_areg (regs, 6) + 32, get_word (m68k_areg (regs, 6) + 32) - 1); return 0; } @@ -378,7 +377,7 @@ static void scsidev_do_scsi (struct scsi fflush (stdout); } #endif - + scgp->scsibus = sdd->bus; scgp->target = sdd->target; scgp->lun = sdd->lun; @@ -446,7 +445,7 @@ static void scsidev_do_scsi (struct scsi scmd->size = len; scmd->sense_count = 0; *(uae_u8 *)&scmd->scb = 0; - + scsicmd (scgp); if (cmd == MODE_SENSE_6 && @@ -454,7 +453,7 @@ static void scsidev_do_scsi (struct scsi !scmd->ux_errno && !*(uae_u8 *)&scmd->scb) { int req_len = len; - + /* compress result */ tmp = buffer; len = 0; @@ -475,7 +474,7 @@ static void scsidev_do_scsi (struct scsi } else { scsicmd (scgp); } - + put_word (acmd + 18, scmd->error == SCG_FATAL ? 0 : scsi_cmd_len); /* fake scsi_CmdActual */ put_byte (acmd + 21, *(uae_u8 *)&scmd->scb); /* scsi_Status */ if (*(uae_u8 *)&scmd->scb) { @@ -490,7 +489,7 @@ static void scsidev_do_scsi (struct scsi put_long (acmd + 8, 0); /* scsi_Actual */ } else { int i; - + for (i = 0; i < scsi_sense_len; i++) { put_byte (scsi_sense + i, 0); } @@ -522,7 +521,7 @@ static void scsidev_do_scsi (struct scsi static void scsidev_do_io (struct scsidevdata *sdd, uaecptr request) { uae_u32 tmp2, dataptr, offset; - + tmp2 = get_word (request+28); /* io_Command */ switch (tmp2) { case 28: @@ -537,21 +536,21 @@ static void scsidev_do_io (struct scside #ifdef DEBUGME printf ("scsidev: did io: sdd = 0x%x\n", sdd); printf ("scsidev: did io: request = %08lx\n", (unsigned long)request); - printf ("scsidev: did io: error = %d\n", (int)get_word(request+31)); + printf ("scsidev: did io: error = %d\n", (int)get_word (request+31)); #endif } static uae_u32 scsidev_beginio (void) { - uae_u32 request = m68k_areg(regs, 1); + uae_u32 request = m68k_areg (regs, 1); int unit = get_long (request + 24); struct scsidevdata *sdd = get_scsidev_data (unit); #ifdef DEBUGME printf ("scsidev_begin_io: sdd = 0x%x\n", sdd); printf ("scsidev_begin_io: request = %08lx\n", (unsigned long)request); - printf ("scsidev_begin_io: cmd = %d\n", (int)get_word(request+28)); + printf ("scsidev_begin_io: cmd = %d\n", (int)get_word (request+28)); #endif put_byte (request+8, NT_MESSAGE); @@ -581,7 +580,7 @@ static void *scsidev_thread (void *sddv) #ifdef DEBUGME printf ("scsidev_penguin: sdd = 0x%x ready\n", sdd); -#endif +#endif /* init SCSI */ if (!(sdd->scgp = openscsi (sdd->bus, sdd->target, sdd->lun)) || (sdd->max_dma = scsi_bufsize (sdd->scgp, 512 * 1024)) <= 0) { @@ -599,7 +598,7 @@ static void *scsidev_thread (void *sddv) #ifdef DEBUGME printf ("scsidev_penguin: sdd = 0x%x\n", sdd); printf ("scsidev_penguin: req = %08lx\n", (unsigned long)request); - printf ("scsidev_penguin: cmd = %d\n", (int)get_word(request+28)); + printf ("scsidev_penguin: cmd = %d\n", (int)get_word (request+28)); #endif if (!request) { printf ("scsidev_penguin: going down with 0x%x\n", sdd->sync_sem); @@ -628,12 +627,12 @@ static uae_u32 scsidev_init (void) #ifdef DEBUGME printf("scsidev_init()\n"); #endif - + if (scgp) { /* we still have everything in place */ return m68k_dreg (regs, 0); /* device base */ } - + /* init global SCSI */ if (!(scgp = openscsi (-1, -1, -1))) { return 0; @@ -656,7 +655,7 @@ static uae_u32 scsidev_init (void) if (!inquiry (scgp, &inq, sizeof(inq))) { int aunit = BTL2UNIT(scgp->scsibus, scgp->target, scgp->lun); struct scsidevdata *sdd; - + write_log (" %2.01d,%d (= %3.d): ", scgp->target, scgp->lun, aunit); print_product (&inq); sdd = add_scsidev_data (scgp->scsibus, scgp->target, scgp->lun, aunit); @@ -680,14 +679,14 @@ uaecptr scsidev_startup (uaecptr resaddr #endif /* Build a struct Resident. This will set up and initialize * the uaescsi.device */ - put_word(resaddr + 0x0, 0x4AFC); - put_long(resaddr + 0x2, resaddr); - put_long(resaddr + 0x6, resaddr + 0x1A); /* Continue scan here */ - put_word(resaddr + 0xA, 0x8101); /* RTF_AUTOINIT|RTF_COLDSTART; Version 1 */ - put_word(resaddr + 0xC, 0x0305); /* NT_DEVICE; pri 05 */ - put_long(resaddr + 0xE, ROM_scsidev_resname); - put_long(resaddr + 0x12, ROM_scsidev_resid); - put_long(resaddr + 0x16, ROM_scsidev_init); /* calls scsidev_init */ + put_word (resaddr + 0x0, 0x4AFC); + put_long (resaddr + 0x2, resaddr); + put_long (resaddr + 0x6, resaddr + 0x1A); /* Continue scan here */ + put_word (resaddr + 0xA, 0x8101); /* RTF_AUTOINIT|RTF_COLDSTART; Version 1 */ + put_word (resaddr + 0xC, 0x0305); /* NT_DEVICE; pri 05 */ + put_long (resaddr + 0xE, ROM_scsidev_resname); + put_long (resaddr + 0x12, ROM_scsidev_resid); + put_long (resaddr + 0x16, ROM_scsidev_init); /* calls scsidev_init */ resaddr += 0x1A; return resaddr; @@ -709,7 +708,7 @@ void scsidev_install (void) /* initcode */ initcode = here (); calltrap (deftrap (scsidev_init)); dw (RTS); - + /* Open */ openfunc = here (); calltrap (deftrap (scsidev_open)); dw (RTS); @@ -800,13 +799,13 @@ void scsidev_reset (void) num_drives = 0; } #endif - + if (scgp) { closescsi (scgp); scgp = NULL; } #endif - + opencount = 0; }