Changeset ee447bf in thomson

Timestamp:

Mar 10, 2012, 7:58:02 PM (12 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

99bc67a

Parents:

1b74fa2

Message:

More work on write support :

• Avoid using the same buffer over and over again for everything, when writing this creates some problems.
• Editing the configuration now works.

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

Location:

code/C/HxCHost

Files:

• main.c (modified) (6 diffs)
• pff/diskio.c (modified) (2 diffs)
• pff/pff.h (modified) (1 diff)

code/C/HxCHost/main.c

@@ -19 +19 @@
 unsigned char* secbuf = mark+16;
 
-const char* HXCSDFECFG = "HXCTEST.CFG";
+const char* HXCSDFECFG = "HXCSDFE.CFG";
 
 void printhex(unsigned char n)
@@ -114 +114 @@
 inline static void config()
 {
+        unsigned char* confbuf[29];
         // If it's HXCSDFE.CFG, enter config mode
         // Read the config part of the file
         WORD byteCount = 29;
-        FRESULT r = pf_read(secbuf, byteCount, &byteCount);
+        FRESULT r = pf_read(confbuf, byteCount, &byteCount);
         if (r != 0 || byteCount != 29) 
         {
@@ -132 +133 @@
                         mon_putc(selected == j ? 0x54: 0x50) // Blue
                         if(options[j].type)
-                                printhex(*(secbuf+options[j].off));
+                                printhex(*(confbuf+options[j].off));
                         else
-                                my_puts(*(secbuf+options[j].off) ? "ON":"OFF");
+                                my_puts(*(confbuf+options[j].off) ? "ON":"OFF");
                         mon_putc(0x1B); // Select back color
                         mon_putc(0x50); // Select back color
@@ -154 +155 @@
                         case 0x19: // SPACE
                                 // save configuration
-                                r = pf_open(HXCSDFECFG);
-                                if (r) {
-                                        my_puts("can't open cfg");
-                                        printhex(r);
-                                }
+                                pf_lseek(0);
                                 byteCount = 29;
-                                r = pf_write(secbuf, byteCount, &byteCount);
+                                r = pf_write(confbuf, byteCount, &byteCount);
                                 if (r || byteCount != 29) {
                                         my_puts("can't write cfg");
                                         printhex(r);
+                                        abort();
                                 }
                                 r = pf_write(0, 0, &byteCount); // flush sector
@@ -169 +167 @@
                                         my_puts("can't close cfg");
                                         printhex(r);
+                                        abort();
                                 }
                                 // fall through
+                do {
+                        asm("SWI \t    \t;\n"
+                                ".fcb \t0x0A\t;GETC\n");
+                } while(KEY == 0);
                         case 0x10: // LEFT
                                 // Quit (without saving)
                                 return;
-                                break;
 
                         case 0x18: // DOWN
@@ -184 +186 @@
                                 // decrease current option value
                                 if(options[selected].type)
-                                        --*(secbuf+options[selected].off);
+                                        --*(confbuf+options[selected].off);
                                 else
-                                        *(secbuf+options[selected].off) = 0;
+                                        *(confbuf+options[selected].off) = 0;
                                 break;
                         case 0x0B: // +
                                 if(options[selected].type)
-                                        ++*(secbuf+options[selected].off);
+                                        ++*(confbuf+options[selected].off);
                                 else
-                                        *(secbuf+options[selected].off) = 0xFF;
+                                        *(confbuf+options[selected].off) = 0xFF;
                                 break;
                 }

code/C/HxCHost/pff/diskio.c

@@ -106 +106 @@
         if (!buff) {
                 if (sc) {
-                        mon_putc('A');
                         // Initiate write process
                         prevsec = sc;
                         ptr = 0;
                 } else {
-                        mon_putc('C');
-                        mon_putc(' ');
-                        printhex(ptr);
                         // Called with both param = 0 - flush buffer to disk
                         // First make sure it's zero-filled
@@ -124 +120 @@
                         map_sector(prevsec, 0xA5);
 
-                        for(int j = 0; j < 40; j++)
-                                printhex(*(char*)(wrbuf + j));
-
                         write(255,1,wrbuf);
                 }
         } else {
-                mon_putc('B');
                 // Here SC is a bytecount. copy that much bytes to the buffer
                 for(int j = 0; j <sc;++j)

code/C/HxCHost/pff/pff.h

@@ -31 +31 @@
 #define _USE_DIR        1       /* 1:Enable pf_opendir() and pf_readdir() */
 
-#define _USE_LSEEK      0       /* 1:Enable pf_lseek() */
+#define _USE_LSEEK      1       /* 1:Enable pf_lseek() */
 
 #define _USE_WRITE      1       /* 1:Enable pf_write() */