update DS label retrieve calls

diff --git a/drivers/atl2/atl2.c b/drivers/atl2/atl2.c
index 144380f027daa67d09c949dd2f97ebc21b0a027e..33963d56bed96a99a9cdf96570aea55efb5548a4 100644 (file)
--- a/drivers/atl2/atl2.c
+++ b/drivers/atl2/atl2.c
@@ -1257,11 +1257,12 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
        atl2_init(devind);
 
        /* 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)
                notify(inet_endpt);
        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
        /* Register debug dump function key. */

diff --git a/drivers/e1000/e1000.c b/drivers/e1000/e1000.c
index 26901bae0ae0482ae709928c74601732f4b40548..75ad79c5aef073636a2f1506ea88f9353bdf298a 100644 (file)
--- a/drivers/e1000/e1000.c
+++ b/drivers/e1000/e1000.c
@@ -162,13 +162,13 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
         panic("e1000", "tsc_calibrate failed", r);
     }
     /* 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);
     }
     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);

diff --git a/drivers/filter/driver.c b/drivers/filter/driver.c
index c4e9899c4176fc3028e6e0cc2c6e1c4d9038732d..284f8a91bc40dba530187ee7ec56d90c5dccd9ad 100644 (file)
--- a/drivers/filter/driver.c
+++ b/drivers/filter/driver.c
@@ -156,7 +156,7 @@ void driver_init(void)
        driver[DRIVER_MAIN].label = MAIN_LABEL;
        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);
        if (r != OK) {
                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);
                }
 
-               r = ds_retrieve_u32(driver[DRIVER_BACKUP].label,
+               r = ds_retrieve_label_num(driver[DRIVER_BACKUP].label,
                        (u32_t *) &driver[DRIVER_BACKUP].endpt);
                if (r != OK) {
                        printf("Filter: failed to get backup disk driver's "
@@ -263,7 +263,7 @@ static int new_driver_ep(int which)
        int r;
        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) {
                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);
                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 (r != OK)

diff --git a/drivers/lance/lance.c b/drivers/lance/lance.c
index df8abcc5c51c1fbb81b227cac307b958ed6c016b..4d8b62c98901f0ce91e33ba519dfe6b0a3388dc5 100644 (file)
--- a/drivers/lance/lance.c
+++ b/drivers/lance/lance.c
@@ -410,11 +410,11 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
    eth_ign_proto= htons((u16_t) v);
 
    /* 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)
       notify(tasknr);
    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);
 }

diff --git a/drivers/rtl8139/rtl8139.c b/drivers/rtl8139/rtl8139.c
index d6022294ac2506f1284ed895edc0cf9862b21425..d1dc60e135c4128d941f0e1567083ce2994e9986 100644 (file)
--- a/drivers/rtl8139/rtl8139.c
+++ b/drivers/rtl8139/rtl8139.c
@@ -346,7 +346,8 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
        if (r == OK)
                notify(inet_proc_nr);
        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);
 }

diff --git a/drivers/rtl8169/rtl8169.c b/drivers/rtl8169/rtl8169.c
index 70586301ca4f3b0ecbb10a090ab78c691a27d114..d165eac00cc8d23328e80575fda9638930456939 100644 (file)
--- a/drivers/rtl8169/rtl8169.c
+++ b/drivers/rtl8169/rtl8169.c
@@ -406,11 +406,12 @@ PRIVATE int sef_cb_init_fresh(int type, sef_init_info_t *info)
         * not yet alive.
         */
 #if 0
-       r = ds_retrieve_u32("inet", &inet_proc_nr);
+       r = ds_retrieve_label_num("inet", &inet_proc_nr);
        if (r == OK)
                notify(inet_proc_nr);
        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
 
        return(OK);

diff --git a/servers/iso9660fs/mount.c b/servers/iso9660fs/mount.c
index 636fe1112b4e69d1ace54a7fe378701d8fc0df28..6cb4ee4634856508f933811016604b1561139e10 100644 (file)
--- a/servers/iso9660fs/mount.c
+++ b/servers/iso9660fs/mount.c
@@ -35,9 +35,9 @@ PUBLIC int fs_readsuper() {
        return(EINVAL);
   }
 
-  r = ds_retrieve_u32(fs_dev_label, &tasknr);
+  r = ds_retrieve_label_num(fs_dev_label, &tasknr);
   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);
        return(EINVAL);
   }