commit - 7f6f093b057288deacfdb1fcd892e1cd5405f106
commit + 6cd113d2fa95f4cc72f387cef4415f4953435611
blob - fdd36d5952bd9730c048591174e713af1a23fdb2
blob + 9b5ef791cf8d2edf8a072c9d0c3bd20d77c3ecb0
--- dev/apm.c
+++ dev/apm.c
@@ -82,7 +82,7 @@ struct cfdriver apm_cd = {
 #define APMDEV_CTL	8
 
 void filt_apmrdetach(struct knote *kn);
-int filt_apmread(struct knote *kn, int32_t hint);
+int filt_apmread(struct knote *kn, long hint);
 int apmkqfilter(dev_t dev, struct knote *kn);
 
 struct filterops apmread_filtops =
@@ -305,7 +305,7 @@ filt_apmrdetach(struct knote *kn)
 }
 
 int
-filt_apmread(struct knote *kn, int32_t hint)
+filt_apmread(struct knote *kn, long hint)
 {
 	/* XXX weird kqueue_scan() semantics */
 	if (hint && !kn->kn_data)
blob - c92725f5bcec41f490a10b79c5b988c28854f9e9
blob + c32fe2ef97e99c3cc2c4be5a418f823f6931b588
--- dev/dfs.c
+++ dev/dfs.c
@@ -25,7 +25,7 @@
 #include <machine/cpu.h>
 #include <machine/autoconf.h>
 #include <macppc/pci/macobio.h>
-#include <powerpc/hid.h>
+#include <powerpc64/hid.h>
 
 extern int perflevel;
 
@@ -57,8 +57,10 @@ dfs_match(struct device *parent, void *arg, void *aux)
 		return (0);
 
 	cpu = ppc_mfpvr() >> 16;
+#if 0
 	if (cpu == PPC_CPU_MPC7447A || cpu == PPC_CPU_MPC7448)
 			return (1);
+#endif
 
 	return (0);
 }
@@ -96,8 +98,10 @@ dfs_attach(struct device *parent, struct device *self,
 	printf(": speeds: %d, %d", ppc_maxfreq, ppc_maxfreq / 2);
 
 	cpu = ppc_mfpvr() >> 16;
+#if 0
 	if (cpu == PPC_CPU_MPC7448)
 		printf(", %d", ppc_maxfreq / 4);
+#endif
 	printf(" MHz\n");
 }
 
@@ -116,6 +120,7 @@ dfs_setperf(int perflevel)
 		uint16_t cpu;
 
 		cpu = ppc_mfpvr() >> 16;
+#if 0
 		if (cpu == PPC_CPU_MPC7448 && perflevel <= 25)  {
 			if (ppc_curfreq != ppc_maxfreq / 4) {
 				dfs_scale_frequency(FREQ_QUARTER);
@@ -124,13 +129,16 @@ dfs_setperf(int perflevel)
 				delay(1000);
 			}
 		} else {
+#endif
 			if (ppc_curfreq != ppc_maxfreq / 2) {
 				dfs_scale_frequency(FREQ_HALF);
 				macobio_write(sc->sc_voltage,
 				    GPIO_DDR_OUTPUT | 0);
 				delay(1000);
 			}
+#if 0
 		}
+#endif
 	}
 }
 
blob - 962a0a559e57cd746fc63d438efcc2cc784d6e50
blob + 85dd74ba4cbbe91e1fd284bb3e4e7bf289562d42
--- dev/pm_direct.c
+++ dev/pm_direct.c
@@ -155,7 +155,7 @@ void	pm_printerr(char *, int, int, char *);
 int	pm_wait_busy(int);
 int	pm_wait_free(int);
 int	pm_receive(u_char *);
-int	pm_send(u_char);
+int	pm_send(uint32_t);
 
 /* these functions also use the variables of adb_direct.c */
 void	pm_adb_get_TALK_result(PMData *);
@@ -288,7 +288,7 @@ pm_receive(u_char *data)
  */
 int
 pm_send(data)
-	u_char data;
+	uint32_t data;
 {
 	int rval;
 
@@ -642,9 +642,9 @@ pm_adb_get_TALK_result(PMData *pmdata)
 	adb_polling = 0;
 
 	adbWaiting = 0;
-	adbBuffer = (long)0;
-	adbCompRout = (long)0;
-	adbCompData = (long)0;
+	adbBuffer = NULL;
+	adbCompRout = NULL;
+	adbCompData = NULL;
 }