mirror of
https://github.com/libretro/PUAE.git
synced 2024-11-23 07:49:45 +00:00
2.7.1b9
This commit is contained in:
Mustafa Tufan
parent
9ad9fc0baa
commit
8713b5a5ce
@ -49,6 +49,7 @@ bool mmu_restart;
|
||||
static bool locked_rmw_cycle;
|
||||
static bool ismoves;
|
||||
bool mmu_ttr_enabled;
|
||||
int mmu_atc_ways;
|
||||
|
||||
int mmu040_movem;
|
||||
uaecptr mmu040_movem_ea;
|
||||
|
||||
20
src/custom.c
20
src/custom.c
@ -4459,12 +4459,12 @@ STATIC_INLINE int use_eventmode (uae_u16 v)
|
||||
{
|
||||
if (!currprefs.cpu_cycle_exact)
|
||||
return 0;
|
||||
if (currprefs.cachesize || currprefs.m68k_speed < 0)
|
||||
return 0;
|
||||
if (currprefs.cpu_cycle_exact && currprefs.cpu_model <= 68020)
|
||||
return 1;
|
||||
if (v & 0x8000)
|
||||
return 1;
|
||||
if (currprefs.cachesize || currprefs.m68k_speed < 0)
|
||||
return 0;
|
||||
if (event2_count)
|
||||
return 1;
|
||||
return 0;
|
||||
@ -4514,18 +4514,15 @@ static void send_intena_do (uae_u32 v)
|
||||
{
|
||||
setclr (&intena_internal, v);
|
||||
doint ();
|
||||
int_recursive++;
|
||||
rethink_intreq ();
|
||||
int_recursive--;
|
||||
}
|
||||
|
||||
static void send_intreq_do (uae_u32 v)
|
||||
{
|
||||
setclr (&intreq_internal, v);
|
||||
doint ();
|
||||
int_recursive++;
|
||||
rethink_intreq ();
|
||||
int_recursive--;
|
||||
doint ();
|
||||
}
|
||||
|
||||
static void INTENA (uae_u16 v)
|
||||
@ -4533,9 +4530,11 @@ static void INTENA (uae_u16 v)
|
||||
uae_u16 old = intena;
|
||||
setclr (&intena, v);
|
||||
|
||||
if (!(v & 0x8000) && old == intena)
|
||||
if (!(v & 0x8000) && old == intena && intena == intena_internal)
|
||||
return;
|
||||
if (use_eventmode (v)) {
|
||||
if (old == intena && intena == intena_internal)
|
||||
return;
|
||||
event2_newevent_xx (-1, INT_PROCESSING_DELAY, v, send_intena_do);
|
||||
} else {
|
||||
intena_internal = intena;
|
||||
@ -4591,7 +4590,7 @@ bool INTREQ_0 (uae_u16 v)
|
||||
intreq_internal = intreq;
|
||||
if (old == intreq && old2 == intreq_internal)
|
||||
return false;
|
||||
if ((v & 0x8000) || currprefs.cpu_cycle_exact)
|
||||
if (v & 0x8000)
|
||||
doint ();
|
||||
return true;
|
||||
}
|
||||
@ -4661,6 +4660,9 @@ void set_picasso_hack_rate (int hz)
|
||||
|
||||
#endif
|
||||
|
||||
/* "Dangerous" blitter D-channel: Writing to memory which is also currently
|
||||
* read by bitplane DMA
|
||||
*/
|
||||
static void dcheck_is_blit_dangerous (void)
|
||||
{
|
||||
check_is_blit_dangerous (bplpt, bplcon0_planes, 50 << bplcon0_res);
|
||||
@ -7673,7 +7675,7 @@ void custom_reset (bool hardreset, bool keyboardreset)
|
||||
|
||||
if (hardreset) {
|
||||
if (!aga_mode) {
|
||||
uae_u16 c = (currprefs.chipset_mask & CSMASK_ECS_DENISE) ? 0xfff : 0x000;
|
||||
uae_u16 c = ((currprefs.chipset_mask & CSMASK_ECS_DENISE) && !(currprefs.chipset_mask & CSMASK_AGA)) ? 0xfff : 0x000;
|
||||
for (i = 0; i < 32; i++) {
|
||||
current_colors.color_regs_ecs[i] = c;
|
||||
current_colors.acolors[i] = getxcolor (c);
|
||||
|
||||
@ -2512,12 +2512,14 @@ static void center_image (void)
|
||||
visible_left_border = max_diwstop - w - (max_diwstop - min_diwstart - w) / 2;
|
||||
visible_left_border &= ~((xshift (1, lores_shift)) - 1);
|
||||
|
||||
#if 0
|
||||
/* Would the old value be good enough? If so, leave it as it is if we want to
|
||||
* be clever. */
|
||||
if (currprefs.gfx_xcenter == 2) {
|
||||
if (center_reset || (visible_left_border < prev_x_adjust && prev_x_adjust < min_diwstart && min_diwstart - visible_left_border <= 32))
|
||||
visible_left_border = prev_x_adjust;
|
||||
}
|
||||
#endif
|
||||
} else if (gfxvidinfo.extrawidth) {
|
||||
visible_left_border = max_diwlastword - w;
|
||||
if (gfxvidinfo.extrawidth > 0)
|
||||
@ -2552,12 +2554,14 @@ static void center_image (void)
|
||||
else
|
||||
thisframe_y_adjust = thisframe_first_drawn_line + ((thisframe_last_drawn_line - thisframe_first_drawn_line) - max_drawn_amiga_line) / 2;
|
||||
|
||||
#if 0
|
||||
/* Would the old value be good enough? If so, leave it as it is if we want to
|
||||
* be clever. */
|
||||
if (currprefs.gfx_ycenter == 2 && thisframe_y_adjust != prev_y_adjust) {
|
||||
if (center_reset || (prev_y_adjust <= thisframe_first_drawn_line && prev_y_adjust + max_drawn_amiga_line > thisframe_last_drawn_line))
|
||||
thisframe_y_adjust = prev_y_adjust;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
/* Make sure the value makes sense */
|
||||
|
||||
@ -7354,7 +7354,7 @@ static uae_u32 REGPARAM2 filesys_dev_storeinfo (TrapContext *context)
|
||||
if (ci->dostype) { // forced dostype?
|
||||
put_long (parmpacket + 80, ci->dostype); /* dostype */
|
||||
} else if (hdf_read (&uip[unit_no].hf, buf, 0, sizeof buf)) {
|
||||
uae_u32 dt = get_long (rl (buf));
|
||||
uae_u32 dt = rl (buf);
|
||||
if (dt != 0x00000000 && dt != 0xffffffff)
|
||||
put_long (parmpacket + 80, dt);
|
||||
}
|
||||
|
||||
20
src/gayle.c
20
src/gayle.c
@ -198,7 +198,8 @@ struct ide_hdf
|
||||
int data_multi;
|
||||
int direction; // 0 = read, 1 = write
|
||||
bool intdrq;
|
||||
int lba48;
|
||||
bool lba48;
|
||||
bool lba48cmd;
|
||||
uae_u8 multiple_mode;
|
||||
int irq_delay;
|
||||
int irq;
|
||||
@ -655,7 +656,7 @@ static void ide_set_features (struct ide_hdf *ide)
|
||||
|
||||
static void get_lbachs (struct ide_hdf *ide, uae_u64 *lbap, unsigned int *cyl, unsigned int *head, unsigned int *sec)
|
||||
{
|
||||
if (ide->lba48 && (ide->regs.ide_select & 0x40)) {
|
||||
if (ide->lba48 && ide->lba48cmd && (ide->regs.ide_select & 0x40)) {
|
||||
uae_u64 lba;
|
||||
lba = (ide->regs.ide_hcyl << 16) | (ide->regs.ide_lcyl << 8) | ide->regs.ide_sector;
|
||||
lba |= ((ide->regs.ide_hcyl2 << 16) | (ide->regs.ide_lcyl2 << 8) | ide->regs.ide_sector2) << 24;
|
||||
@ -674,14 +675,14 @@ static void get_lbachs (struct ide_hdf *ide, uae_u64 *lbap, unsigned int *cyl, u
|
||||
|
||||
static int get_nsec (struct ide_hdf *ide)
|
||||
{
|
||||
if (ide->lba48)
|
||||
if (ide->lba48 && ide->lba48cmd)
|
||||
return (ide->regs.ide_nsector == 0 && ide->regs.ide_nsector2 == 0) ? 65536 : (ide->regs.ide_nsector2 * 256 + ide->regs.ide_nsector);
|
||||
else
|
||||
return ide->regs.ide_nsector == 0 ? 256 : ide->regs.ide_nsector;
|
||||
}
|
||||
static int dec_nsec (struct ide_hdf *ide, int v)
|
||||
{
|
||||
if (ide->lba48) {
|
||||
if (ide->lba48 && ide->lba48cmd) {
|
||||
uae_u16 nsec;
|
||||
nsec = ide->regs.ide_nsector2 * 256 + ide->regs.ide_nsector;
|
||||
ide->regs.ide_nsector -= v;
|
||||
@ -696,7 +697,7 @@ static int dec_nsec (struct ide_hdf *ide, int v)
|
||||
|
||||
static void put_lbachs (struct ide_hdf *ide, uae_u64 lba, unsigned int cyl, unsigned int head, unsigned int sec, unsigned int inc)
|
||||
{
|
||||
if (ide->lba48) {
|
||||
if (ide->lba48 && ide->lba48cmd) {
|
||||
lba += inc;
|
||||
ide->regs.ide_hcyl = (lba >> 16) & 0xff;
|
||||
ide->regs.ide_lcyl = (lba >> 8) & 0xff;
|
||||
@ -907,7 +908,7 @@ static void do_process_rw_command (struct ide_hdf *ide)
|
||||
get_lbachs (ide, &lba, &cyl, &head, &sec);
|
||||
nsec = get_nsec (ide);
|
||||
if (IDE_LOG > 1)
|
||||
write_log (_T("IDE%d off=%d, nsec=%d (%d) lba%d\n"), ide->num, (uae_u32)lba, nsec, ide->multiple_mode, ide->lba48 ? 48 : 28);
|
||||
write_log (_T("IDE%d off=%d, nsec=%d (%d) lba48=%d\n"), ide->num, (uae_u32)lba, nsec, ide->multiple_mode, ide->lba48 + ide->lba48cmd);
|
||||
if (nsec * ide->blocksize > ide->hdhfd.size - lba * ide->blocksize) {
|
||||
nsec = (ide->hdhfd.size - lba * ide->blocksize) / ide->blocksize;
|
||||
if (IDE_LOG > 1)
|
||||
@ -947,6 +948,7 @@ static void ide_read_sectors (struct ide_hdf *ide, int flags)
|
||||
uae_u64 lba;
|
||||
int multi = flags & 1;
|
||||
|
||||
ide->lba48cmd = (flags & 2) != 0;
|
||||
if (multi && ide->multiple_mode == 0) {
|
||||
ide_fail (ide);
|
||||
return;
|
||||
@ -961,7 +963,7 @@ static void ide_read_sectors (struct ide_hdf *ide, int flags)
|
||||
return;
|
||||
}
|
||||
if (IDE_LOG > 0)
|
||||
write_log (_T("IDE%d read off=%d, sec=%d (%d) lba%d\n"), ide->num, (uae_u32)lba, nsec, ide->multiple_mode, ide->lba48 ? 48 : 28);
|
||||
write_log (_T("IDE%d read off=%d, sec=%d (%d) lba48=%d\n"), ide->num, (uae_u32)lba, nsec, ide->multiple_mode, ide->lba48 + ide->lba48cmd);
|
||||
ide->data_multi = multi ? ide->multiple_mode : 1;
|
||||
ide->data_offset = 0;
|
||||
ide->data_size = nsec * ide->blocksize;
|
||||
@ -976,6 +978,7 @@ static void ide_write_sectors (struct ide_hdf *ide, int flags)
|
||||
uae_u64 lba;
|
||||
int multi = flags & 1;
|
||||
|
||||
ide->lba48cmd = (flags & 2) != 0;
|
||||
if (multi && ide->multiple_mode == 0) {
|
||||
ide_fail (ide);
|
||||
return;
|
||||
@ -990,7 +993,7 @@ static void ide_write_sectors (struct ide_hdf *ide, int flags)
|
||||
return;
|
||||
}
|
||||
if (IDE_LOG > 0)
|
||||
write_log (_T("IDE%d write off=%d, sec=%d (%d) lba%d\n"), ide->num, (uae_u32)lba, nsec, ide->multiple_mode, ide->lba48 ? 48 : 28);
|
||||
write_log (_T("IDE%d write off=%d, sec=%d (%d) lba48=%d\n"), ide->num, (uae_u32)lba, nsec, ide->multiple_mode, ide->lba48 + ide->lba48cmd);
|
||||
if (nsec * ide->blocksize > ide->hdhfd.size - lba * ide->blocksize)
|
||||
nsec = (ide->hdhfd.size - lba * ide->blocksize) / ide->blocksize;
|
||||
if (nsec <= 0) {
|
||||
@ -1015,6 +1018,7 @@ static void ide_do_command (struct ide_hdf *ide, uae_u8 cmd)
|
||||
write_log (_T("**** IDE%d command %02X\n"), ide->num, cmd);
|
||||
ide->regs.ide_status &= ~ (IDE_STATUS_DRDY | IDE_STATUS_DRQ | IDE_STATUS_ERR);
|
||||
ide->regs.ide_error = 0;
|
||||
ide->lba48cmd = false;
|
||||
|
||||
if (ide->atapi) {
|
||||
|
||||
|
||||
@ -189,6 +189,9 @@ extern uae_u32 mmu_is_super;
|
||||
extern uae_u32 mmu_tagmask, mmu_pagemask;
|
||||
extern struct mmu_atc_line mmu_atc_array[ATC_TYPE][ATC_WAYS][ATC_SLOTS];
|
||||
|
||||
/* Last matched ATC index, next lookup starts from this index as an optimization */
|
||||
extern int mmu_atc_ways;
|
||||
|
||||
/*
|
||||
* mmu access is a 4 step process:
|
||||
* if mmu is not enabled just read physical
|
||||
@ -199,7 +202,7 @@ extern struct mmu_atc_line mmu_atc_array[ATC_TYPE][ATC_WAYS][ATC_SLOTS];
|
||||
static ALWAYS_INLINE bool mmu_lookup(uaecptr addr, bool data, bool write,
|
||||
struct mmu_atc_line **cl)
|
||||
{
|
||||
int way,index;
|
||||
int way, i, index;
|
||||
static int way_miss=0;
|
||||
|
||||
uae_u32 tag = (mmu_is_super | (addr >> 1)) & mmu_tagmask;
|
||||
@ -207,7 +210,8 @@ static ALWAYS_INLINE bool mmu_lookup(uaecptr addr, bool data, bool write,
|
||||
index=(addr & 0x0001E000)>>13;
|
||||
else
|
||||
index=(addr & 0x0000F000)>>12;
|
||||
for (way=0;way<ATC_WAYS;way++) {
|
||||
for (i = 0; i < ATC_WAYS; i++) {
|
||||
way = mmu_atc_ways;
|
||||
// if we have this
|
||||
if ((tag == mmu_atc_array[data][way][index].tag) && (mmu_atc_array[data][way][index].valid)) {
|
||||
*cl=&mmu_atc_array[data][way][index];
|
||||
@ -216,6 +220,8 @@ static ALWAYS_INLINE bool mmu_lookup(uaecptr addr, bool data, bool write,
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
mmu_atc_ways++;
|
||||
mmu_atc_ways &= (ATC_WAYS - 1);
|
||||
}
|
||||
// we select a random way to void
|
||||
*cl=&mmu_atc_array[data][way_miss%ATC_WAYS][index];
|
||||
@ -229,7 +235,7 @@ static ALWAYS_INLINE bool mmu_lookup(uaecptr addr, bool data, bool write,
|
||||
static ALWAYS_INLINE bool mmu_user_lookup(uaecptr addr, bool super, bool data,
|
||||
bool write, struct mmu_atc_line **cl)
|
||||
{
|
||||
int way,index;
|
||||
int way, i, index;
|
||||
static int way_miss=0;
|
||||
|
||||
uae_u32 tag = ((super ? 0x80000000 : 0x00000000) | (addr >> 1)) & mmu_tagmask;
|
||||
@ -237,7 +243,8 @@ static ALWAYS_INLINE bool mmu_user_lookup(uaecptr addr, bool super, bool data,
|
||||
index=(addr & 0x0001E000)>>13;
|
||||
else
|
||||
index=(addr & 0x0000F000)>>12;
|
||||
for (way=0;way<ATC_WAYS;way++) {
|
||||
for (i = 0; i < ATC_WAYS; i++) {
|
||||
way = mmu_atc_ways;
|
||||
// if we have this
|
||||
if ((tag == mmu_atc_array[data][way][index].tag) && (mmu_atc_array[data][way][index].valid)) {
|
||||
*cl=&mmu_atc_array[data][way][index];
|
||||
@ -246,6 +253,8 @@ static ALWAYS_INLINE bool mmu_user_lookup(uaecptr addr, bool super, bool data,
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
mmu_atc_ways++;
|
||||
mmu_atc_ways &= (ATC_WAYS - 1);
|
||||
}
|
||||
// we select a random way to void
|
||||
*cl=&mmu_atc_array[data][way_miss%ATC_WAYS][index];
|
||||
|
||||
@ -43,8 +43,8 @@ struct fs_filehandle
|
||||
};
|
||||
|
||||
extern struct zfile *zfile_fopen (const TCHAR *, const TCHAR *, int mask);
|
||||
extern struct zfile *zfile_fopen2 (const TCHAR *, const TCHAR *);
|
||||
extern struct zfile *zfile_fopen4 (const TCHAR *, const TCHAR *, int mask, int index);
|
||||
//extern struct zfile *zfile_fopen2 (const TCHAR *, const TCHAR *);
|
||||
extern struct zfile *zfile_fopen_nmmi (const TCHAR *, const TCHAR *, int mask, int index);
|
||||
extern struct zfile *zfile_fopen_empty (struct zfile*, const TCHAR *name, uae_u64 size);
|
||||
extern struct zfile *zfile_fopen_empty2 (struct zfile*, const TCHAR *name);
|
||||
//extern struct zfile *zfile_fopen_data (const TCHAR *name, uae_u64 size, const uae_u8 *data);
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
/*
|
||||
* UAE - The Un*x Amiga Emulator
|
||||
*
|
||||
* A4000T / A4091 NCR 53C710 SCSI (not much to see here)
|
||||
* A4000T / A4091 NCR 53C710 SCSI
|
||||
*
|
||||
* (c) 2007-2014 Toni Wilen
|
||||
*/
|
||||
@ -187,7 +187,7 @@ static uae_u32 ncr_bget2 (uaecptr addr)
|
||||
return ncr_io_bget (addr);
|
||||
}
|
||||
|
||||
extern addrbank ncr_bank;
|
||||
static addrbank ncr_bank;
|
||||
|
||||
static uae_u32 REGPARAM2 ncr_lget (uaecptr addr)
|
||||
{
|
||||
@ -292,6 +292,8 @@ static void REGPARAM2 ncr_wput (uaecptr addr, uae_u32 w)
|
||||
if (value < z3fastmem2_bank.start + currprefs.z3fastmem2_size)
|
||||
value = z3fastmem2_bank.start + currprefs.z3fastmem2_size;
|
||||
}
|
||||
if (value < 0x40000000 && max_z3fastmem >= 0x41000000)
|
||||
value = 0x40000000;
|
||||
value >>= 16;
|
||||
chipmem_wput (regs.regs[11] + 0x20, value);
|
||||
chipmem_wput (regs.regs[11] + 0x28, value);
|
||||
@ -336,7 +338,7 @@ static void REGPARAM2 ncr_bput (uaecptr addr, uae_u32 b)
|
||||
ncr_bput2 (addr, b);
|
||||
}
|
||||
|
||||
addrbank ncr_bank = {
|
||||
static addrbank ncr_bank = {
|
||||
ncr_lget, ncr_wget, ncr_bget,
|
||||
ncr_lput, ncr_wput, ncr_bput,
|
||||
default_xlate, default_check, NULL, _T("A4091"),
|
||||
|
||||
@ -381,6 +381,8 @@ bool preinit_shm (void)
|
||||
if (os_64bit) {
|
||||
max_allowed_mman = 2048;
|
||||
}
|
||||
if (maxmem > max_allowed_mman)
|
||||
max_allowed_mman = maxmem;
|
||||
|
||||
#ifdef __APPLE__
|
||||
//xaind
|
||||
|
||||
@ -161,6 +161,15 @@ do { write_log("lsi_scsi: error: " fmt , ## __VA_ARGS__);} while (0)
|
||||
#define LSI_CCNTL1_DDAC 0x08
|
||||
#define LSI_CCNTL1_ZMOD 0x80
|
||||
|
||||
#define LSI_SBCL_IO 0x01
|
||||
#define LSI_SBCL_CD 0x02
|
||||
#define LSI_SBCL_MSG 0x04
|
||||
#define LSI_SBCL_ATN 0x08
|
||||
#define LSI_SBCL_SEL 0x10
|
||||
#define LSI_SBCL_BSY 0x20
|
||||
#define LSI_SBCL_ACK 0x40
|
||||
#define LSI_SBCL_REQ 0x80
|
||||
|
||||
/* Enable Response to Reselection */
|
||||
#define LSI_SCID_RRE 0x60
|
||||
|
||||
@ -258,6 +267,7 @@ typedef struct {
|
||||
uint8_t lcrc;
|
||||
uint8_t sstat2;
|
||||
uint8_t dwt;
|
||||
uint8_t sbcl;
|
||||
uint8_t script_active;
|
||||
} LSIState;
|
||||
|
||||
@ -442,6 +452,7 @@ static inline void lsi_set_phase(LSIState *s, int phase)
|
||||
s->ctest0 &= ~1;
|
||||
if (phase == PHASE_DI)
|
||||
s->ctest0 |= 1;
|
||||
s->sbcl &= ~LSI_SBCL_REQ;
|
||||
}
|
||||
|
||||
static void lsi_bad_phase(LSIState *s, int out, int new_phase)
|
||||
@ -451,6 +462,7 @@ static void lsi_bad_phase(LSIState *s, int out, int new_phase)
|
||||
lsi_script_scsi_interrupt(s, LSI_SSTAT0_MA);
|
||||
lsi_stop_script(s);
|
||||
lsi_set_phase(s, new_phase);
|
||||
s->sbcl |= LSI_SBCL_REQ;
|
||||
}
|
||||
|
||||
|
||||
@ -735,8 +747,8 @@ static void lsi_do_command(LSIState *s)
|
||||
s->sfbr = buf[0];
|
||||
s->command_complete = 0;
|
||||
|
||||
id = (s->select_tag >> 8) & 0xf;
|
||||
s->lcrc = 1 << (id & 0x7);
|
||||
id = (s->select_tag >> 8) & 0xff;
|
||||
s->lcrc = id; //1 << (id & 0x7);
|
||||
dev = scsi_device_find(&s->bus, 0, idbitstonum(id), s->current_lun);
|
||||
if (!dev) {
|
||||
lsi_bad_selection(s, id);
|
||||
@ -1109,7 +1121,8 @@ again:
|
||||
if ((s->sstat2 & PHASE_MASK) != ((insn >> 24) & 7)) {
|
||||
DPRINTF("Wrong phase got %d expected %d\n",
|
||||
s->sstat2 & PHASE_MASK, (insn >> 24) & 7);
|
||||
lsi_script_scsi_interrupt(s, LSI_SSTAT0_SGE);
|
||||
lsi_script_scsi_interrupt(s, LSI_SSTAT0_MA);
|
||||
s->sbcl |= LSI_SBCL_REQ;
|
||||
break;
|
||||
}
|
||||
s->dnad = addr;
|
||||
@ -1160,7 +1173,6 @@ again:
|
||||
if (insn & (1 << 26)) {
|
||||
addr = s->dsp + sextract32(addr, 0, 24);
|
||||
}
|
||||
id &= ~s->scid;
|
||||
s->dnad = addr;
|
||||
switch (opcode) {
|
||||
case 0: /* Select */
|
||||
@ -1650,11 +1662,18 @@ static uint8_t lsi_reg_readb2(LSIState *s, int offset)
|
||||
return s->sien0;
|
||||
case 0x05: /* SXFER */
|
||||
return s->sxfer;
|
||||
|
||||
case 0x09: /* SIDL */
|
||||
/* This is needed by the linux drivers. We currently only update it
|
||||
during the MSG IN phase. */
|
||||
return s->sidl;
|
||||
case 0xb: /* SBCL */
|
||||
/* ??? This is not correct. However it's (hopefully) only
|
||||
used for diagnostics, so should be ok. */
|
||||
return 0;
|
||||
/* NetBSD 1.x checks for REQ */
|
||||
tmp = s->sstat2 & PHASE_MASK;
|
||||
/* if phase mismatch, REQ is also active */
|
||||
tmp |= s->sbcl;
|
||||
if (s->socl & LSI_SOCL_ATN)
|
||||
tmp |= LSI_SBCL_ATN;
|
||||
return tmp;
|
||||
case 0xc: /* DSTAT */
|
||||
tmp = s->dstat | LSI_DSTAT_DFE;
|
||||
s->dstat = 0;
|
||||
@ -1779,6 +1798,7 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8_t val)
|
||||
s->sxfer = val;
|
||||
break;
|
||||
case 0x0b: /* SBCL */
|
||||
lsi_set_phase (s, val & PHASE_MASK);
|
||||
break;
|
||||
case 0x0c: case 0x0d: case 0x0e: case 0x0f:
|
||||
/* Linux writes to these readonly registers on startup. */
|
||||
|
||||
@ -73,8 +73,7 @@ static void tape_init (int unit, struct scsi_data_tape *tape, const TCHAR *tape_
|
||||
if (my_existsdir (tape->tape_dir)) {
|
||||
tape->realdir = true;
|
||||
} else {
|
||||
tape->zd = zfile_opendir_archive (tape_directory);
|
||||
//tape->zd = zfile_opendir_archive (tape_directory, ZFD_ARCHIVE | ZFD_NORECURSE);
|
||||
tape->zd = zfile_opendir_archive_flags (tape_directory, ZFD_ARCHIVE | ZFD_NORECURSE);
|
||||
if (!tape->zd)
|
||||
tape->nomedia = true;
|
||||
}
|
||||
|
||||
@ -1752,12 +1752,12 @@ struct zfile *zfile_fopen (const TCHAR *name, const TCHAR *mode, int mask)
|
||||
{
|
||||
return zfile_fopenx (name, mode, mask, 0);
|
||||
}
|
||||
struct zfile *zfile_fopen2 (const TCHAR *name, const TCHAR *mode)
|
||||
/*struct zfile *zfile_fopen_mode (const TCHAR *name, const TCHAR *mode)
|
||||
{
|
||||
return zfile_fopenx (name, mode, 0, 0);
|
||||
}
|
||||
}*/
|
||||
|
||||
struct zfile *zfile_fopen4 (const TCHAR *name, const TCHAR *mode, int mask, int index)
|
||||
struct zfile *zfile_fopen_nmmi (const TCHAR *name, const TCHAR *mode, int mask, int index)
|
||||
{
|
||||
return zfile_fopenx (name, mode, mask, index);
|
||||
}
|
||||
|
||||
@ -748,7 +748,7 @@ static struct zfile *archive_access_plain (struct znode *zn)
|
||||
if (zn->offset) {
|
||||
struct zfile *zf;
|
||||
z = zfile_fopen_empty (zn->volume->archive, zn->fullname, zn->size);
|
||||
zf = zfile_fopen4 (zfile_getname (zn->volume->archive), _T("rb"), zn->volume->archive->zfdmask & ~ZFD_ADF, zn->offset - 1);
|
||||
zf = zfile_fopen_nmmi (zfile_getname (zn->volume->archive), _T("rb"), zn->volume->archive->zfdmask & ~ZFD_ADF, zn->offset - 1);
|
||||
if (zf) {
|
||||
zfile_fread (z->data, zn->size, 1, zf);
|
||||
zfile_fclose (zf);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user