ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NVRAM fixes (Jocelyn Mayer) 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@815 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
bellard 2004-05-17 20:21:49 +00:00
parent ef792f9ddb
commit 13ab5daa86
1 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
hw/m48t59.c
View File

@ -24,9 +24,9 @@
#include "vl.h" #include "vl.h"
#include "m48t59.h" #include "m48t59.h"
//#define NVRAM_DEBUG //#define DEBUG_NVRAM
#if defined(NVRAM_DEBUG) #if defined(DEBUG_NVRAM)
#define NVRAM_PRINTF(fmt, args...) do { printf(fmt , ##args); } while (0) #define NVRAM_PRINTF(fmt, args...) do { printf(fmt , ##args); } while (0)
#else #else
#define NVRAM_PRINTF(fmt, args...) do { } while (0) #define NVRAM_PRINTF(fmt, args...) do { } while (0)
@ -45,6 +45,7 @@ struct m48t59_t {
struct QEMUTimer *alrm_timer; struct QEMUTimer *alrm_timer;
struct QEMUTimer *wd_timer; struct QEMUTimer *wd_timer;
/* NVRAM storage */ /* NVRAM storage */
uint8_t lock;
uint16_t addr; uint16_t addr;
uint8_t *buffer; uint8_t *buffer;
}; };
@ -152,7 +153,10 @@ static void watchdog_cb (void *opaque)
if (NVRAM->buffer[0x1FF7] & 0x80) { if (NVRAM->buffer[0x1FF7] & 0x80) {
NVRAM->buffer[0x1FF7] = 0x00; NVRAM->buffer[0x1FF7] = 0x00;
NVRAM->buffer[0x1FFC] &= ~0x40; NVRAM->buffer[0x1FFC] &= ~0x40;
// reset_CPU(); /* May it be a hw CPU Reset instead ? */
reset_requested = 1;
printf("Watchdog reset...\n");
cpu_interrupt(cpu_single_env, CPU_INTERRUPT_EXIT);
} else { } else {
pic_set_irq(NVRAM->IRQ, 1); pic_set_irq(NVRAM->IRQ, 1);
pic_set_irq(NVRAM->IRQ, 0); pic_set_irq(NVRAM->IRQ, 0);
@ -315,6 +319,11 @@ void m48t59_write (m48t59_t *NVRAM, uint32_t val)
} }
break; break;
default: default:
/* Check lock registers state */
if (NVRAM->addr >= 0x20 && NVRAM->addr <= 0x2F && (NVRAM->lock & 1))
break;
if (NVRAM->addr >= 0x30 && NVRAM->addr <= 0x3F && (NVRAM->lock & 2))
break;
if (NVRAM->addr < 0x1FF0 || if (NVRAM->addr < 0x1FF0 ||
(NVRAM->addr > 0x1FFF && NVRAM->addr < NVRAM->size)) { (NVRAM->addr > 0x1FFF && NVRAM->addr < NVRAM->size)) {
NVRAM->buffer[NVRAM->addr] = val & 0xFF; NVRAM->buffer[NVRAM->addr] = val & 0xFF;
@ -394,6 +403,11 @@ uint32_t m48t59_read (m48t59_t *NVRAM)
retval = toBCD(tm.tm_year); retval = toBCD(tm.tm_year);
break; break;
default: default:
/* Check lock registers state */
if (NVRAM->addr >= 0x20 && NVRAM->addr <= 0x2F && (NVRAM->lock & 1))
break;
if (NVRAM->addr >= 0x30 && NVRAM->addr <= 0x3F && (NVRAM->lock & 2))
break;
if (NVRAM->addr < 0x1FF0 || if (NVRAM->addr < 0x1FF0 ||
(NVRAM->addr > 0x1FFF && NVRAM->addr < NVRAM->size)) { (NVRAM->addr > 0x1FFF && NVRAM->addr < NVRAM->size)) {
do_read: do_read:
@ -412,12 +426,18 @@ void m48t59_set_addr (m48t59_t *NVRAM, uint32_t addr)
NVRAM->addr = addr; NVRAM->addr = addr;
} }
void m48t59_toggle_lock (m48t59_t *NVRAM, int lock)
{
NVRAM->lock ^= 1 << lock;
}
/* IO access to NVRAM */ /* IO access to NVRAM */
static void NVRAM_writeb (void *opaque, uint32_t addr, uint32_t val) static void NVRAM_writeb (void *opaque, uint32_t addr, uint32_t val)
{ {
m48t59_t *NVRAM = opaque; m48t59_t *NVRAM = opaque;
addr -= NVRAM->io_base; addr -= NVRAM->io_base;
NVRAM_PRINTF("0x%08x => 0x%08x\n", addr, val);
switch (addr) { switch (addr) {
case 0: case 0:
NVRAM->addr &= ~0x00FF; NVRAM->addr &= ~0x00FF;
@ -439,11 +459,20 @@ static void NVRAM_writeb (void *opaque, uint32_t addr, uint32_t val)
static uint32_t NVRAM_readb (void *opaque, uint32_t addr) static uint32_t NVRAM_readb (void *opaque, uint32_t addr)
{ {
m48t59_t *NVRAM = opaque; m48t59_t *NVRAM = opaque;
uint32_t retval;
if (addr == NVRAM->io_base + 3) addr -= NVRAM->io_base;
return m48t59_read(NVRAM); switch (addr) {
case 3:
retval = m48t59_read(NVRAM);
break;
default:
retval = -1;
break;
}
NVRAM_PRINTF("0x%08x <= 0x%08x\n", addr, retval);
return 0xFF; return retval;
} }
/* Initialisation routine */ /* Initialisation routine */
@ -467,5 +496,7 @@ m48t59_t *m48t59_init (int IRQ, uint32_t io_base, uint16_t size)
register_ioport_write(io_base, 0x04, 1, NVRAM_writeb, s); register_ioport_write(io_base, 0x04, 1, NVRAM_writeb, s);
s->alrm_timer = qemu_new_timer(vm_clock, &alarm_cb, s); s->alrm_timer = qemu_new_timer(vm_clock, &alarm_cb, s);
s->wd_timer = qemu_new_timer(vm_clock, &watchdog_cb, s); s->wd_timer = qemu_new_timer(vm_clock, &watchdog_cb, s);
s->lock = 0;
return s; return s;
} }