Changeset 1efc42c in buchla-emu for emu

Timestamp:

07/30/2017 06:18:21 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

c5b6c90

Parents:

caff491

Message:

Load floppy disk image file.

Location:

emu

Files:

• all.h (modified) (1 diff)
• cpu.c (modified) (2 diffs)
• fdd.c (modified) (1 diff)
• main.c (modified) (3 diffs)

emu/all.h

@@ -62 +62 @@
 extern int32_t kbd_verbose;
 
+extern const char *bios;
+extern const char *disk;
+
 extern void sdl_init(void);
 extern void sdl_quit(void);
 
-extern void cpu_loop(const char *bios);
+extern void cpu_loop(void);
 
 extern void fpu_init(void);

emu/cpu.c

@@ -131 +131 @@
 }
 
-static void bios_init(const char *bios)
+static void bios_init(void)
 {
         inf("loading BIOS file %s", bios);
@@ -611 +611 @@
 }
 
-void cpu_loop(const char *bios)
+void cpu_loop(void)
 {
         hw_init();
-        bios_init(bios);
+        bios_init();
 
         inf("entering CPU loop");

emu/fdd.c

@@ -24 +24 @@
 int32_t fdd_verbose = 0;
 
+#define N_CYL 80
+#define N_SID 2
+#define N_SEC 18
+#define SZ_SEC 512
+
+#define SZ_DISK (N_CYL * N_SID * N_SEC * SZ_SEC)
+
+static uint8_t image[SZ_DISK];
+
 void fdd_init(void)
 {
         ver("fdd init");
+        inf("loading disk image file %s", disk);
+
+        SDL_RWops *ops = SDL_RWFromFile(disk, "rb");
+
+        if (ops == NULL) {
+                fail("error while opening disk image file %s", disk);
+        }
+
+        size_t loaded = 0;
+
+        while (loaded < SZ_DISK) {
+                size_t n_rd = SDL_RWread(ops, image + loaded, 1, SZ_DISK - loaded);
+
+                if (n_rd == 0) {
+                        fail("error while reading disk image file %s", disk);
+                }
+
+                loaded += n_rd;
+        }
+
+        SDL_RWclose(ops);
 }
 

emu/main.c

@@ -38 +38 @@
 };
 
-static const char *bios = "bios.abs";
+const char *bios = "bios.abs";
+const char *disk = "buchla.disk";
 
 static void usage(FILE *fh)
 {
-        fprintf(fh, "usage: buchla [-h] [-v comp [-v comp [...]]] [-b bios]\n");
+        fprintf(fh, "usage: buchla [-h] [-v comp [-v comp [...]]] [-b bios] [-d disk]\n");
         fprintf(fh, "where comp is one of: ");
 
@@ -68 +69 @@
 
                         bios = argv[i];
+                        continue;
+                }
+
+                if (strcmp(argv[i], "-d") == 0) {
+                        if (++i == argc) {
+                                usage(stderr);
+                                fprintf(stderr, "missing argument to -d\n");
+                                exit(1);
+                        }
+
+                        disk = argv[i];
                         continue;
                 }
@@ -111 +123 @@
         sdl_init();
 
-        cpu_loop(bios);
+        cpu_loop();
 
         sdl_quit();