From: David van Moolenbroek <david@minix3.org>
Date: Mon, 25 Jan 2010 23:23:43 +0000 (+0000)
Subject: update DS label retrieve calls
X-Git-Tag: v3.1.6~30
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zpipe.c?a=commitdiff_plain;h=1ff4a7dbc686f8c83bef55192e91047d0835ea4b;p=minix.git

update DS label retrieve calls
---

diff --git a/drivers/atl2/atl2.c b/drivers/atl2/atl2.c
index 144380f02..33963d56b 100644
--- 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 26901bae0..75ad79c5a 100644
--- 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 c4e9899c4..284f8a91b 100644
--- 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 df8abcc5c..4d8b62c98 100644
--- 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 d6022294a..d1dc60e13 100644
--- 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 70586301c..d165eac00 100644
--- 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 636fe1112..6cb4ee463 100644
--- 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);
   }