Changeset 00fe6bb in mainline

Timestamp:

2009-06-27T09:41:55Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

6408be3

Parents:

1fbe064b

Message:

Automatically try to mount FAT from disk0 on /data upon boot. Save Tetris score there. Automatically create disk image in sample config files, if it does not already exist. This tentatively reaches the Milanstone (t.m.).

Files:

• contrib/conf/ia32-qe.sh (added)
• contrib/conf/mips32-gx.sh (modified) (1 diff)
• uspace/app/init/init.c (modified) (2 diffs)
• uspace/app/tetris/scores.c (modified) (2 diffs)

contrib/conf/mips32-gx.sh

@@ -1 +1 @@
 #!/bin/sh
 
-gxemul $@ -E testmips -C R4000 -X image.boot
+DISK_IMG=hdisk.img
+
+# Create a disk image if it does not exist
+if [ ! -f "$DISK_IMG" ]; then
+        tools/mkfat.py uspace/dist/data "$DISK_IMG"
+fi
+
+gxemul $@ -E testmips -C R4000 -X image.boot -d d0:"$DISK_IMG"

uspace/app/init/init.c

@@ -151 +151 @@
 }
 
+void mount_data(void)
+{
+        int rc;
+
+        printf("Trying to mount disk0 on /data... ");
+        fflush(stdout);
+
+        rc = mount("fat", "/data", "disk0", "wtcache", 0);
+        if (rc == EOK)
+                printf("OK\n");
+        else
+                printf("Failed\n");
+}
+
 int main(int argc, char *argv[])
 {
@@ -172 +186 @@
         spawn("/srv/fhc");
         spawn("/srv/obio");
-        
+        spawn("/srv/ata_bd");
+        spawn("/srv/gxe_bd");
+
+        usleep(250000);
+        mount_data();   
+
         getvc("vc0", "/app/bdsh");
         getvc("vc1", "/app/bdsh");

uspace/app/tetris/scores.c

@@ -203 +203 @@
         int rc;
 
-        f = fopen("/tetris.sco", "rb");
+        f = fopen("/data/tetris.sco", "rb");
         if (f == NULL)
                 return ENOENT;
@@ -222 +222 @@
         int rc;
 
-        f = fopen("/tetris.sco", "wb");
+        f = fopen("/data/tetris.sco", "wb");
         cnt = fwrite(scores, sizeof(struct highscore), NUMSPOTS, f);
         rc = fclose(f);