DS1225Y nvram device, by Herve Poussineau.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2460 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/Makefile.target b/Makefile.target
index b5cde5dc75c877540f6bee1bf8fb9f89578a2857..8eaa8dd7878ead7a9f17d542d4d34dee8e49f4a6 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -383,7 +383,7 @@ CPPFLAGS += -DHAS_AUDIO
 endif
 ifeq ($(TARGET_ARCH), mips)
 VL_OBJS+= mips_r4k.o mips_malta.o mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o
-VL_OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o
+VL_OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o
 VL_OBJS+= piix_pci.o parallel.o mixeng.o cirrus_vga.o $(SOUND_HW) $(AUDIODRV)
 DEFINES += -DHAS_AUDIO
 endif

diff --git a/hw/ds1225y.c b/hw/ds1225y.c
new file mode 100644 (file)
index 0000000..48d6636
--- /dev/null
+++ b/hw/ds1225y.c
@@ -0,0 +1,121 @@
+/*\r
+ * QEMU NVRAM emulation for DS1225Y chip\r
+ * \r
+ * Copyright (c) 2007 Hervé Poussineau\r
+ * \r
+ * Permission is hereby granted, free of charge, to any person obtaining a copy\r
+ * of this software and associated documentation files (the "Software"), to deal\r
+ * in the Software without restriction, including without limitation the rights\r
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell\r
+ * copies of the Software, and to permit persons to whom the Software is\r
+ * furnished to do so, subject to the following conditions:\r
+ *\r
+ * The above copyright notice and this permission notice shall be included in\r
+ * all copies or substantial portions of the Software.\r
+ *\r
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\r
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\r
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL\r
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\r
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\r
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\r
+ * THE SOFTWARE.\r
+ */\r
+\r
+#include "vl.h"\r
+\r
+typedef enum\r
+{\r
+    none = 0,\r
+    readmode,\r
+    writemode,\r
+} nvram_open_mode;\r
+\r
+struct ds1225y_t\r
+{\r
+    target_ulong mem_base;\r
+    uint32_t capacity;\r
+    const char *filename;\r
+    QEMUFile *file;\r
+    nvram_open_mode open_mode;\r
+};\r
+\r
+static int ds1225y_set_to_mode(ds1225y_t *NVRAM, nvram_open_mode mode, const char *filemode)\r
+{\r
+    if (NVRAM->open_mode != mode)\r
+    {\r
+        if (NVRAM->file)\r
+            qemu_fclose(NVRAM->file);\r
+        NVRAM->file = qemu_fopen(NVRAM->filename, filemode);\r
+        NVRAM->open_mode = mode;\r
+    }\r
+    return (NVRAM->file != NULL);\r
+}\r
+\r
+static uint32_t nvram_readb (void *opaque, target_phys_addr_t addr)\r
+{\r
+    ds1225y_t *NVRAM = opaque;\r
+    int64_t pos;\r
+\r
+    pos = addr - NVRAM->mem_base;\r
+    if (addr >= NVRAM->capacity)\r
+        addr -= NVRAM->capacity;\r
+\r
+    if (!ds1225y_set_to_mode(NVRAM, readmode, "rb"))\r
+        return 0;\r
+    qemu_fseek(NVRAM->file, pos, SEEK_SET);\r
+    return (uint32_t)qemu_get_byte(NVRAM->file);\r
+}\r
+\r
+static void nvram_writeb (void *opaque, target_phys_addr_t addr, uint32_t value)\r
+{\r
+    ds1225y_t *NVRAM = opaque;\r
+    int64_t pos;\r
+\r
+    pos = addr - NVRAM->mem_base;\r
+    if (ds1225y_set_to_mode(NVRAM, writemode, "wb"))\r
+    {\r
+        qemu_fseek(NVRAM->file, pos, SEEK_SET);\r
+        qemu_put_byte(NVRAM->file, (int)value);\r
+    }\r
+}\r
+\r
+static CPUReadMemoryFunc *nvram_read[] = {\r
+    &nvram_readb,\r
+    NULL,\r
+    NULL,\r
+};\r
+\r
+static CPUWriteMemoryFunc *nvram_write[] = {\r
+    &nvram_writeb,\r
+    NULL,\r
+    NULL,\r
+};\r
+\r
+static CPUWriteMemoryFunc *nvram_none[] = {\r
+    NULL,\r
+    NULL,\r
+    NULL,\r
+};\r
+\r
+/* Initialisation routine */\r
+ds1225y_t *ds1225y_init(target_ulong mem_base, const char *filename)\r
+{\r
+    ds1225y_t *s;\r
+    int mem_index1, mem_index2;\r
+\r
+    s = qemu_mallocz(sizeof(ds1225y_t));\r
+    if (!s)\r
+        return NULL;\r
+    s->mem_base = mem_base;\r
+    s->capacity = 0x2000; /* Fixed for ds1225y chip: 8K */\r
+    s->filename = filename;\r
+\r
+    /* Read/write memory */\r
+    mem_index1 = cpu_register_io_memory(0, nvram_read, nvram_write, s);\r
+    cpu_register_physical_memory(mem_base, s->capacity, mem_index1);\r
+    /* Read-only memory */\r
+    mem_index2 = cpu_register_io_memory(0, nvram_read, nvram_none, s);\r
+    cpu_register_physical_memory(mem_base + s->capacity, s->capacity, mem_index2);\r
+    return s;\r
+}\r

diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 63ad36720737d8c3fe09c2cb819ca886e02ddd17..b6054fd51732332dfe3ed7763e0d06886b2ac0cc 100644 (file)
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -215,6 +215,7 @@ void mips_r4k_init (int ram_size, int vga_ram_size, int boot_device,
                      bs_table[2 * i], bs_table[2 * i + 1]);
 
     kbd_init();
+    ds1225y_init(0x9000, "nvram");
 }
 
 QEMUMachine mips_machine = {

diff --git a/vl.h b/vl.h
index c6d305c1a162c91f46f50c807e458a00c1de8afe..ae501e24b6a366785e58a2a832e3674db9d6a1b0 100644 (file)
--- a/vl.h
+++ b/vl.h
@@ -941,6 +941,10 @@ int pmac_ide_init (BlockDriverState **hd_table,
 int cdrom_read_toc(int nb_sectors, uint8_t *buf, int msf, int start_track);
 int cdrom_read_toc_raw(int nb_sectors, uint8_t *buf, int msf, int session_num);
 
+/* ds1225y.c */
+typedef struct ds1225y_t ds1225y_t;
+ds1225y_t *ds1225y_init(target_ulong mem_base, const char *filename);
+
 /* es1370.c */
 int es1370_init (PCIBus *bus, AudioState *s);