patch-2.1.51 linux/arch/ppc/kernel/pmac_support.c

• Lines: 84
• Date: Sat Aug 16 09:51:08 1997
• Orig file: v2.1.50/linux/arch/ppc/kernel/pmac_support.c
• Orig date: Mon Aug 4 16:25:36 1997

diff -u --recursive --new-file v2.1.50/linux/arch/ppc/kernel/pmac_support.c linux/arch/ppc/kernel/pmac_support.c
@@ -3,30 +3,14 @@
  */
 #include <linux/kernel.h>
 #include <linux/stddef.h>
+#include <linux/reboot.h>
+#include <linux/nvram.h>
 #include <asm/ptrace.h>
 #include <asm/io.h>
 #include <asm/cuda.h>
 #include <asm/system.h>
 #include <asm/prom.h>
 
-void hard_reset_now(void)
-{
-	struct cuda_request req;
-
-	cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_RESET_SYSTEM);
-	for (;;)
-		cuda_poll();
-}
-
-void poweroff_now(void)
-{
-	struct cuda_request req;
-
-	cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_POWERDOWN);
-	for (;;)
-		cuda_poll();
-}
-
 /*
  * Read and write the non-volatile RAM on PowerMacs.
  */
@@ -34,26 +18,29 @@
 static volatile unsigned char *nvram_addr;
 static volatile unsigned char *nvram_data;
 
-void nvram_init(void)
+void pmac_nvram_init(void)
 {
 	struct device_node *dp;
 
 	dp = find_devices("nvram");
-	if (dp == NULL)
-		panic("Can't find NVRAM device");
+	if (dp == NULL) {
+		printk(KERN_ERR "Can't find NVRAM device\n");
+		nvram_naddrs = 0;
+		return;
+	}
 	nvram_naddrs = dp->n_addrs;
-	if (nvram_naddrs == 1)
+	if (nvram_naddrs == 1) {
 		nvram_data = ioremap(dp->addrs[0].address, dp->addrs[0].size);
-	else if (nvram_naddrs == 2) {
+	} else if (nvram_naddrs == 2) {
 		nvram_addr = ioremap(dp->addrs[0].address, dp->addrs[0].size);
 		nvram_data = ioremap(dp->addrs[1].address, dp->addrs[1].size);
 	} else {
-		printk("Found %d addresses for NVRAM\n", nvram_naddrs);
-		panic("don't understand NVRAM");
+		printk(KERN_ERR "Don't know how to access NVRAM with %d addresses\n",
+		       nvram_naddrs);
 	}
 }
 
-int nvram_readb(int addr)
+unsigned char nvram_read_byte(int addr)
 {
 	switch (nvram_naddrs) {
 	case 1:
@@ -63,10 +50,10 @@
 		eieio();
 		return nvram_data[(addr & 0x1f) << 4];
 	}
-	return -1;
+	return 0;
 }
 
-void nvram_writeb(int addr, int val)
+void nvram_write_byte(unsigned char val, int addr)
 {
 	switch (nvram_naddrs) {
 	case 1: