Convert from DOS to UNIX format, no code change.

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

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