Changeset a63d216 in mainline for uspace/app/init/init.c

Timestamp:

2014-03-16T21:39:14Z (10 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e1fc679a

Parents:

2e231aba

Message:

Remove support for CONFIG_START_BD and CONFIG_MOUNT_DATA.

• CONFIG_START_BD is obsoleted by by DDFied ata_bd driver.
• CONFIG_MOUNT_DATA depended on CONFIG_START_BD.

File:

• uspace/app/init/init.c (modified) (3 diffs)

uspace/app/init/init.c

@@ -59 +59 @@
 #define TMPFS_FS_TYPE      "tmpfs"
 #define TMPFS_MOUNT_POINT  "/tmp"
-
-#define DATA_FS_TYPE      "fat"
-#define DATA_DEVICE       "bd/ata1disk0"
-#define DATA_MOUNT_POINT  "/data"
 
 #define SRV_CONSOLE  "/srv/console"
@@ -316 +312 @@
 }
 
-static bool mount_data(void)
-{
-        int rc = mount(DATA_FS_TYPE, DATA_MOUNT_POINT, DATA_DEVICE, "wtcache", 0, 0);
-        return mount_report("Data filesystem", DATA_MOUNT_POINT, DATA_FS_TYPE,
-            DATA_DEVICE, rc);
-}
-
 int main(int argc, char *argv[])
 {
@@ -366 +355 @@
         srv_start("/srv/clipboard");
         srv_start("/srv/remcons");
-        
-        /*
-         * Start these synchronously so that mount_data() can be
-         * non-blocking.
-         */
-#ifdef CONFIG_START_BD
-        srv_start("/srv/ata_bd");
-#endif
-        
-#ifdef CONFIG_MOUNT_DATA
-        /* Make sure fat is running. */
-        if (str_cmp(STRING(RDFMT), "fat") != 0)
-                srv_start("/srv/fat");
-        
-        mount_data();
-#else
-        (void) mount_data;
-#endif
         
         srv_start("/srv/input", HID_INPUT);