sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update DS label retrieve calls

Browse source
This commit is contained in:
David van Moolenbroek 2010-01-25 23:23:43 +00:00
parent 71fe2852f4
commit 1ff4a7dbc6
7 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/atl2/atl2.c
View file

@ -1257,11 +1257,12 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
atl2_init(devind); atl2_init(devind);
/* Notify Inet of our presence, if it has already been started. */ /* Notify Inet of our presence, if it has already been started. */
r = ds_retrieve_u32("inet", &inet_endpt); r = ds_retrieve_label_num("inet", &inet_endpt);
if (r == OK) if (r == OK)
notify(inet_endpt); notify(inet_endpt);
else if (r != ESRCH) else if (r != ESRCH)
printf("ATL2: ds_retrieve_u32 failed for 'inet': %d\n", r); printf("ATL2: ds_retrieve_label_num failed for 'inet': %d\n",
r);
#if ATL2_FKEY #if ATL2_FKEY
/* Register debug dump function key. */ /* Register debug dump function key. */

4
drivers/e1000/e1000.c
View file

@ -162,13 +162,13 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
panic("e1000", "tsc_calibrate failed", r); panic("e1000", "tsc_calibrate failed", r);
} }
/* Try to notify inet that we are present (again) */ /* Try to notify inet that we are present (again) */
if ((r = ds_retrieve_u32("inet", &tasknr)) == OK) if ((r = ds_retrieve_label_num("inet", &tasknr)) == OK)
{ {
notify(tasknr); notify(tasknr);
} }
else if (r != ESRCH) else if (r != ESRCH)
{ {
printf("e1000: ds_retrieve_u32 failed for 'inet': %d\n", r); printf("e1000: ds_retrieve_label_num failed for 'inet': %d\n", r);
} }
return(OK); return(OK);

9
drivers/filter/driver.c
View file

@ -156,7 +156,7 @@ void driver_init(void)
driver[DRIVER_MAIN].label = MAIN_LABEL; driver[DRIVER_MAIN].label = MAIN_LABEL;
driver[DRIVER_MAIN].minor = MAIN_MINOR; driver[DRIVER_MAIN].minor = MAIN_MINOR;
r = ds_retrieve_u32(driver[DRIVER_MAIN].label, r = ds_retrieve_label_num(driver[DRIVER_MAIN].label,
(u32_t *) &driver[DRIVER_MAIN].endpt); (u32_t *) &driver[DRIVER_MAIN].endpt);
if (r != OK) { if (r != OK) {
printf("Filter: failed to get main disk driver's endpoint: " printf("Filter: failed to get main disk driver's endpoint: "
@ -177,7 +177,7 @@ void driver_init(void)
panic(__FILE__, "same driver: not tested", NO_NUM); panic(__FILE__, "same driver: not tested", NO_NUM);
} }
r = ds_retrieve_u32(driver[DRIVER_BACKUP].label, r = ds_retrieve_label_num(driver[DRIVER_BACKUP].label,
(u32_t *) &driver[DRIVER_BACKUP].endpt); (u32_t *) &driver[DRIVER_BACKUP].endpt);
if (r != OK) { if (r != OK) {
printf("Filter: failed to get backup disk driver's " printf("Filter: failed to get backup disk driver's "
@ -263,7 +263,7 @@ static int new_driver_ep(int which)
int r; int r;
endpoint_t endpt; endpoint_t endpt;
r = ds_retrieve_u32(driver[which].label, (u32_t *) &endpt); r = ds_retrieve_label_num(driver[which].label, (u32_t *) &endpt);
if (r != OK) { if (r != OK) {
printf("Filter: DS query for %s failed\n", printf("Filter: DS query for %s failed\n",
@ -458,7 +458,8 @@ static void restart_driver(int which, int tell_rs)
if(w) flt_sleep(1); if(w) flt_sleep(1);
w = 1; w = 1;
r = ds_retrieve_u32(driver[which].label, (u32_t *) &endpt); r = ds_retrieve_label_num(driver[which].label,
(u32_t *) &endpt);
#if DEBUG2 #if DEBUG2
if (r != OK) if (r != OK)

4
drivers/lance/lance.c
View file

@ -410,11 +410,11 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
eth_ign_proto= htons((u16_t) v); eth_ign_proto= htons((u16_t) v);
/* Try to notify inet that we are present (again) */ /* Try to notify inet that we are present (again) */
r= ds_retrieve_u32("inet", &tasknr); r= ds_retrieve_label_num("inet", &tasknr);
if (r == OK) if (r == OK)
notify(tasknr); notify(tasknr);
else if (r != ESRCH) else if (r != ESRCH)
printf("lance: ds_retrieve_u32 failed for 'inet': %d\n", r); printf("lance: ds_retrieve_label_num failed for 'inet': %d\n", r);
return(OK); return(OK);
} }

3
drivers/rtl8139/rtl8139.c
View file

@ -346,7 +346,8 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
if (r == OK) if (r == OK)
notify(inet_proc_nr); notify(inet_proc_nr);
else if (r != ESRCH) else if (r != ESRCH)
printf("rtl8139: ds_retrieve_label_num failed for 'inet': %d\n", r); printf("rtl8139: ds_retrieve_label_num failed for 'inet': %d\n",
r);
return(OK); return(OK);
} }

5
drivers/rtl8169/rtl8169.c
View file

@ -406,11 +406,12 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
* not yet alive. * not yet alive.
*/ */
#if 0 #if 0
r = ds_retrieve_u32("inet", &inet_proc_nr); r = ds_retrieve_label_num("inet", &inet_proc_nr);
if (r == OK) if (r == OK)
notify(inet_proc_nr); notify(inet_proc_nr);
else if (r != ESRCH) else if (r != ESRCH)
printf("rtl8169: ds_retrieve_u32 failed for 'inet': %d\n", r); printf("rtl8169: ds_retrieve_label_num failed for 'inet': %d\n",
r);
#endif #endif
return(OK); return(OK);

4
servers/iso9660fs/mount.c
View file

@ -35,9 +35,9 @@ PUBLIC int fs_readsuper() {
return(EINVAL); return(EINVAL);
} }
r = ds_retrieve_u32(fs_dev_label, &tasknr); r = ds_retrieve_label_num(fs_dev_label, &tasknr);
if (r != OK) { if (r != OK) {
printf("ISOFS %s:%d ds_retrieve_u32 failed for '%s': %d\n", printf("ISOFS %s:%d ds_retrieve_label_num failed for '%s': %d\n",
__FILE__, __LINE__, fs_dev_label, r); __FILE__, __LINE__, fs_dev_label, r);
return(EINVAL); return(EINVAL);
} }