patch-2.2.18 linux/include/asm-ppc/nvram.h

• Lines: 33
• Date: Wed Nov 8 23:00:35 2000
• Orig file: v2.2.17/include/asm-ppc/nvram.h
• Orig date: Sat Sep 9 18:42:50 2000

diff -u --new-file --recursive --exclude-from /usr/src/exclude v2.2.17/include/asm-ppc/nvram.h linux/include/asm-ppc/nvram.h
@@ -38,6 +38,8 @@
 	pmac_nvram_NR		/* MacOS Name Registry partition */
 };
 
+#ifdef __KERNEL__
+
 /* Return partition offset in nvram */
 extern int	pmac_get_partition(int partition);
 
@@ -45,15 +47,20 @@
 extern u8	pmac_xpram_read(int xpaddr);
 extern void	pmac_xpram_write(int xpaddr, u8 data);
 
+#endif /* __KERNEL__ */
+
 /* Some offsets in XPRAM */
 #define PMAC_XPRAM_MACHINE_LOC	0xe4
 #define PMAC_XPRAM_SOUND_VOLUME	0x08
 
 /* Machine location structure in XPRAM */
 struct pmac_machine_location {
-	u32	latitude;	/* 2+30 bit Fractional number */
-	u32	longitude;	/* 2+30 bit Fractional number */
-	u32	delta;		/* mix of GMT delta and DLS */
+	unsigned int	latitude;	/* 2+30 bit Fractional number */
+	unsigned int	longitude;	/* 2+30 bit Fractional number */
+	unsigned int	delta;		/* mix of GMT delta and DLS */
 };
+
+/* /dev/nvram ioctls */
+#define PMAC_NVRAM_GET_OFFSET	_IOWR('p', 0x40, int) /* Get NVRAM partition offset */
 
 #endif