Changes in uspace/app/init/init.c [ffa2c8ef:53d6ac3d] in mainline
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/app/init/init.c
rffa2c8ef r53d6ac3d 46 46 #include <macros.h> 47 47 #include <str.h> 48 #include < devmap.h>48 #include <loc.h> 49 49 #include <str_error.h> 50 50 #include "init.h" … … 53 53 #define ROOT_MOUNT_POINT "/" 54 54 55 #define DEVFS_FS_TYPE "devfs"56 #define DEVFS_MOUNT_POINT "/dev"55 #define LOCFS_FS_TYPE "locfs" 56 #define LOCFS_MOUNT_POINT "/loc" 57 57 58 58 #define TMPFS_FS_TYPE "tmpfs" … … 66 66 #define APP_GETTERM "/app/getterm" 67 67 68 /** Print banner */ 68 69 static void info_print(void) 69 70 { … … 71 72 } 72 73 74 /** Report mount operation success */ 73 75 static bool mount_report(const char *desc, const char *mntpt, 74 76 const char *fstype, const char *dev, int rc) … … 100 102 } 101 103 104 /** Mount root filesystem 105 * 106 * The operation blocks until the root filesystem 107 * server is ready for mounting. 108 * 109 * @param[in] fstype Root filesystem type. 110 * 111 * @return True on success. 112 * @return False on failure. 113 * 114 */ 102 115 static bool mount_root(const char *fstype) 103 116 { … … 113 126 } 114 127 115 static bool mount_devfs(void) 116 { 117 int rc = mount(DEVFS_FS_TYPE, DEVFS_MOUNT_POINT, "", "", 128 /** Mount locfs filesystem 129 * 130 * The operation blocks until the locfs filesystem 131 * server is ready for mounting. 132 * 133 * @return True on success. 134 * @return False on failure. 135 * 136 */ 137 static bool mount_locfs(void) 138 { 139 int rc = mount(LOCFS_FS_TYPE, LOCFS_MOUNT_POINT, "", "", 118 140 IPC_FLAG_BLOCKING); 119 return mount_report(" Device filesystem", DEVFS_MOUNT_POINT, DEVFS_FS_TYPE,120 NULL, rc);141 return mount_report("Location service filesystem", LOCFS_MOUNT_POINT, 142 LOCFS_FS_TYPE, NULL, rc); 121 143 } 122 144 … … 157 179 rc = task_wait(id, &texit, &retval); 158 180 if (rc != EOK) { 159 printf("%s: Error waiting for %s (%s (\n", NAME, fname,181 printf("%s: Error waiting for %s (%s)\n", NAME, fname, 160 182 str_error(rc)); 161 183 return; … … 174 196 } 175 197 176 static void console(const char *dev) 177 { 178 char hid_in[DEVMAP_NAME_MAXLEN]; 198 static void console(const char *svc) 199 { 200 printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, svc); 201 202 /* Wait for the input service to be ready */ 203 service_id_t service_id; 204 int rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING); 205 if (rc != EOK) { 206 printf("%s: Error waiting on %s (%s)\n", NAME, svc, 207 str_error(rc)); 208 return; 209 } 210 211 rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, svc, NULL); 212 if (rc != EOK) { 213 printf("%s: Error spawning %s %s (%s)\n", NAME, SRV_CONSOLE, 214 svc, str_error(rc)); 215 } 216 } 217 218 static void getterm(const char *svc, const char *app, bool wmsg) 219 { 220 char term[LOC_NAME_MAXLEN]; 179 221 int rc; 180 222 181 snprintf(hid_in, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev); 182 183 printf("%s: Spawning %s %s\n", NAME, SRV_CONSOLE, hid_in); 184 185 /* Wait for the input device to be ready */ 186 devmap_handle_t handle; 187 rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING); 188 if (rc != EOK) { 189 printf("%s: Error waiting on %s (%s)\n", NAME, hid_in, 190 str_error(rc)); 191 return; 192 } 193 194 rc = task_spawnl(NULL, SRV_CONSOLE, SRV_CONSOLE, hid_in, NULL); 195 if (rc != EOK) { 196 printf("%s: Error spawning %s %s (%s)\n", NAME, SRV_CONSOLE, 197 hid_in, str_error(rc)); 198 } 199 } 200 201 static void getterm(const char *dev, const char *app, bool wmsg) 202 { 203 char term[DEVMAP_NAME_MAXLEN]; 204 int rc; 205 206 snprintf(term, DEVMAP_NAME_MAXLEN, "%s/%s", DEVFS_MOUNT_POINT, dev); 223 snprintf(term, LOC_NAME_MAXLEN, "%s/%s", LOCFS_MOUNT_POINT, svc); 207 224 208 225 printf("%s: Spawning %s %s %s\n", NAME, APP_GETTERM, term, app); 209 226 210 /* Wait for the terminal device to be ready */211 devmap_handle_t handle;212 rc = devmap_device_get_handle(dev, &handle, IPC_FLAG_BLOCKING);227 /* Wait for the terminal service to be ready */ 228 service_id_t service_id; 229 rc = loc_service_get_id(svc, &service_id, IPC_FLAG_BLOCKING); 213 230 if (rc != EOK) { 214 231 printf("%s: Error waiting on %s (%s)\n", NAME, term, … … 262 279 } 263 280 264 spawn("/srv/ devfs");281 spawn("/srv/locfs"); 265 282 spawn("/srv/taskmon"); 266 283 267 if (!mount_ devfs()) {284 if (!mount_locfs()) { 268 285 printf("%s: Exiting\n", NAME); 269 286 return -2; … … 272 289 mount_tmpfs(); 273 290 291 spawn("/srv/devman"); 274 292 spawn("/srv/apic"); 275 293 spawn("/srv/i8259"); 276 spawn("/srv/fhc");277 294 spawn("/srv/obio"); 278 295 srv_start("/srv/cuda_adb"); 279 296 srv_start("/srv/i8042"); 280 297 srv_start("/srv/s3c24ser"); 281 srv_start("/srv/adb_ms");282 srv_start("/srv/char_ms");283 298 srv_start("/srv/s3c24ts"); 284 299 285 300 spawn("/srv/fb"); 286 spawn("/srv/ kbd");287 console("hid _in/kbd");301 spawn("/srv/input"); 302 console("hid/input"); 288 303 289 304 spawn("/srv/clip"); … … 301 316 302 317 #ifdef CONFIG_MOUNT_DATA 318 /* Make sure fat is running. */ 319 if (str_cmp(STRING(RDFMT), "fat") != 0) { 320 srv_start("/srv/fat"); 321 } 303 322 mount_data(); 304 323 #else
Note:
See TracChangeset
for help on using the changeset viewer.