patch-2.2.16 linux/arch/alpha/boot/main.c

• Lines: 47
• Date: Wed Jun 7 14:26:42 2000
• Orig file: v2.2.15/linux/arch/alpha/boot/main.c
• Orig date: Mon Aug 9 12:04:38 1999

diff -urN v2.2.15/linux/arch/alpha/boot/main.c linux/arch/alpha/boot/main.c
@@ -107,15 +107,15 @@
 	char bootdev[256];
 	long result;
 
-	result = srm_dispatch(CCB_GET_ENV, ENV_BOOTED_DEV, bootdev, 255);
+	result = callback_getenv(ENV_BOOTED_DEV, bootdev, 255);
 	if (result < 0)
 		return result;
-	return srm_dispatch(CCB_OPEN, bootdev, result & 255);
+	return callback_open(bootdev, result & 255);
 }
 
 static inline long close(long dev)
 {
-	return srm_dispatch(CCB_CLOSE, dev);
+	return callback_close(dev);
 }
 
 static inline long load(long dev, unsigned long addr, unsigned long count)
@@ -124,7 +124,7 @@
 	extern char _end;
 	long result, boot_size = &_end - (char *) BOOT_ADDR;
 
-	result = srm_dispatch(CCB_GET_ENV, ENV_BOOTED_FILE, bootfile, 255);
+	result = callback_getenv(ENV_BOOTED_FILE, bootfile, 255);
 	if (result < 0)
 		return result;
 	result &= 255;
@@ -132,7 +132,7 @@
 	if (result)
 		srm_printk("Boot file specification (%s) not implemented\n",
 		       bootfile);
-	return srm_dispatch(CCB_READ, dev, count, addr, boot_size/512 + 1);
+	return callback_read(dev, count, addr, boot_size/512 + 1);
 }
 
 /*
@@ -176,8 +176,7 @@
 		return;
 	}
 
-	nbytes = srm_dispatch(CCB_GET_ENV, ENV_BOOTED_OSFLAGS,
-			  envval, sizeof(envval));
+	nbytes = callback_getenv(ENV_BOOTED_OSFLAGS, envval, sizeof(envval));
 	if (nbytes < 0) {
 		nbytes = 0;
 	}