From 84d404aba3faa8ee6b3c1b630eae05536b7977dd Mon Sep 17 00:00:00 2001
From: Erik van der Kouwe <erik@minix3.org>
Date: Wed, 28 Apr 2010 08:35:05 +0000
Subject: [PATCH] Fix types in debug register functions

---
 kernel/arch/i386/breakpoints.c |  2 +-
 kernel/arch/i386/debugreg.S    | 10 +++++++---
 kernel/arch/i386/debugreg.h    | 16 ++++++++--------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/kernel/arch/i386/breakpoints.c b/kernel/arch/i386/breakpoints.c
index 28c5a03c6..4a4af8d77 100644
--- a/kernel/arch/i386/breakpoints.c
+++ b/kernel/arch/i386/breakpoints.c
@@ -5,7 +5,7 @@
 
 PRIVATE int breakpoint_set(phys_bytes linaddr, int bp, const int flags)
 {
-	u32_t dr7, dr7flags;
+	unsigned long dr7, dr7flags;
 	
 	if (bp >= BREAKPOINT_COUNT)
 		return EINVAL;
diff --git a/kernel/arch/i386/debugreg.S b/kernel/arch/i386/debugreg.S
index 9d60c5bc0..1d220ab0f 100644
--- a/kernel/arch/i386/debugreg.S
+++ b/kernel/arch/i386/debugreg.S
@@ -14,13 +14,17 @@ st_##reg:								;\
 	ret
 
 /*
- * void ld_dr0(u32_t value)
- * u32_t st_dr0(void)
+ * void ld_dr0(phys_bytes value)
+ * phys_bytes st_dr0(void)
  */
 LD_ST_REG(dr0)
 LD_ST_REG(dr1)
 LD_ST_REG(dr2)
 LD_ST_REG(dr3)
+
+/*
+ * void ld_dr0(unsigned long value)
+ * unsigned long st_dr0(void)
+ */
 LD_ST_REG(dr6)
 LD_ST_REG(dr7)
-
diff --git a/kernel/arch/i386/debugreg.h b/kernel/arch/i386/debugreg.h
index e8f9f7897..56b8a48c3 100644
--- a/kernel/arch/i386/debugreg.h
+++ b/kernel/arch/i386/debugreg.h
@@ -31,14 +31,14 @@ void ld_dr0(phys_bytes value);
 void ld_dr1(phys_bytes value);
 void ld_dr2(phys_bytes value);
 void ld_dr3(phys_bytes value);
-void ld_dr6(phys_bytes value);
-void ld_dr7(phys_bytes value);
-u32_t st_dr0(void); 
-u32_t st_dr1(void); 
-u32_t st_dr2(void); 
-u32_t st_dr3(void); 
-u32_t st_dr6(void); 
-u32_t st_dr7(void); 
+void ld_dr6(unsigned long value);
+void ld_dr7(unsigned long value);
+phys_bytes st_dr0(void); 
+phys_bytes st_dr1(void); 
+phys_bytes st_dr2(void); 
+phys_bytes st_dr3(void); 
+unsigned long st_dr6(void); 
+unsigned long st_dr7(void); 
 
 #endif /* __DEBUGREG_H__ */