Changeset 7cabd49 in thomson for code/C/HxCHost/main.c

Timestamp:

Mar 19, 2012, 7:51:49 AM (12 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

fe55aa5

Parents:

cc8f3af

Message:

HxC host software : work at Forever XIII party

• Switch to lwtools gcc toolchain
• Fix some bugs.
• Editing the HxC settings works
• Selecting a floppy image works (sometimes)

git-svn-id: ​svn://localhost/thomson@24 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

File:

• code/C/HxCHost/main.c (modified) (14 diffs)

code/C/HxCHost/main.c

@@ -9 +9 @@
 void asm_write();
 
-#if PLATFORM == 5
-        #define DIRECTORY_BUFFER (FILINFO*)0x3000
-#else
-        // Thomson TO8 code
-        #define DIRECTORY_BUFFER (FILINFO*)0xA000
-#endif
+FILINFO DIRECTORY_BUFFER[23];
 
 unsigned char mark[512 + 16] = "HxCFEDA";
@@ -102 +97 @@
         {"\x1B\x50\x0CHxC floppy emulator setup\r\n"
         "UP/DOWN move - +/- change\r\n"
-        "space save - left quit\r\n"
+        "space save - left quit\r\n\n"
                  "Step sound       ", 16, 0}, 
         {"\r\nGUI sound        ", 17, 0}, 
@@ -112 +107 @@
 };
 
+#define getcfg(off) *(char*)((int)confbuf+off)
+#define putcfg(off, val) *(char*)((int)confbuf+off) = val
+
 inline static void config()
 {
-        unsigned char* confbuf[29];
+        char confbuf[29];
         // If it's HXCSDFE.CFG, enter config mode
         // Read the config part of the file
@@ -121 +119 @@
         if (r != 0 || byteCount != 29) 
         {
-                my_puts("read error");
+                my_puts("read error ");
+                printhex(r);
                 abort();
         }
@@ -133 +132 @@
                         mon_putc(selected == j ? 0x54: 0x50) // Blue
                         if(options[j].type)
-                                printhex(*(confbuf+options[j].off));
+                                printhex(getcfg(options[j].off));
                         else
-                                my_puts(*(confbuf+options[j].off) ? "ON":"OFF");
+                                my_puts(getcfg(options[j].off) ? "ON":"OFF");
                         mon_putc(0x1B); // Select back color
                         mon_putc(0x50); // Select back color
@@ -141 +140 @@
 
                 do {
-                        asm("SWI \t    \t;\n"
-                                ".fcb \t0x0A\t;GETC\n");
+                        asm(" SWI\n"
+                                " FCB 0x0A\n");
                 } while(KEY == 0);
 
@@ -170 +169 @@
                                 }
                                 // fall through
-                do {
-                        asm("SWI \t    \t;\n"
-                                ".fcb \t0x0A\t;GETC\n");
-                } while(KEY == 0);
                         case 0x10: // LEFT
                                 // Quit (without saving)
@@ -180 +175 @@
                         case 0x18: // DOWN
                                 // select previous file
-                                if (++selected > 7) selected = 7;
+                                if (++selected > 6) selected = 6;
                                 // TODO previous page ?
                                 break;
@@ -186 +181 @@
                                 // decrease current option value
                                 if(options[selected].type)
-                                        --*(confbuf+options[selected].off);
+                                        --*(char*)((int)confbuf+options[selected].off);
                                 else
-                                        *(confbuf+options[selected].off) = 0;
+                                        putcfg(options[selected].off, 0);
                                 break;
                         case 0x0B: // +
                                 if(options[selected].type)
-                                        ++*(confbuf+options[selected].off);
+                                        ++*(char*)((int)confbuf+options[selected].off);
                                 else
-                                        *(confbuf+options[selected].off) = 0xFF;
+                                        putcfg(options[selected].off, 0xFF);
                                 break;
                 }
@@ -211 +206 @@
         FATFS fs;
         FRESULT r = pf_mount(&fs);
+
         if (r != 0) {
                 my_puts("mount error ");
@@ -265 +261 @@
                 // Allow the user to select a file
                 do {
-                        asm("SWI \t    \t;\n"
-                                ".fcb \t0x0A\t;GETC\n");
+                        asm(" SWI \n"
+                                " fcb 0x0A\n");
                 } while(KEY == 0);
 
@@ -300 +296 @@
                                 } else {
                                         const char* cmp = HXCSDFECFG;
-                                        FRESULT res = pf_open(cmp);
-                                        if (res) {
-                                                my_puts("Can't open CFG file: ");
-                                                printhex(res);
-                                                exit(0);
-                                        }
                                         if (*(long*)(fp->fname) == *(long*)(cmp)
                                                 && *(long*)(fp->fname + 4) == *(long*)(cmp+4)
@@ -311 +301 @@
                                         )
                                         {
+                                                FRESULT res = pf_open(cmp);
+                                                if (res) {
+                                                        my_puts("Can't open CFG file: ");
+                                                        printhex(res);
+                                                        exit(0);
+                                                }
                                                 config();
                                         } else {
@@ -316 +312 @@
                                                 // If it's an HFE file, load it in HxCSDFE.CFG, then reboot
                                                 
+                                                // We need to open the file to get the starting cluster.
+                                                // This is a PFF "limitation".
+                                                pf_open(fp->fname);
+                                                long off = LD_DWORD(&fs.org_clust);
+
+                                                FRESULT res = pf_open(cmp);
+                                                if (res) {
+                                                        my_puts("Can't open CFG file: ");
+                                                        printhex(res);
+                                                        exit(0);
+                                                }
+                                                pf_lseek(0x200);
+
+                                                int count = 12;
+                                                pf_write(fp->fname, count, &count);
+                                                count = 1;
+                                                pf_write(&fp->fattrib, count, &count);
+                                                count = 4;
+                                                pf_write(&off, count, &count);
+                                                off = LD_DWORD(&fp->fsize);
+                                                pf_write(&off, count, &count);
+                                                count = 17;
+                                                pf_write(fp->fname, count, &count);
+                                                pf_write(0,0,&count);
+
                                                 // reboot
-                                                exit(0);
+                                                asm(" SWI\n"
+                                                        " FCB 0");
                                         }
                                 }