From cef3e1d732f69c348714a0132bca89b40999a43e Mon Sep 17 00:00:00 2001
From: rmackay9 <rmackay9@yahoo.com>
Date: Sat, 18 Aug 2012 20:28:31 +0900
Subject: [PATCH] DataFlash: revert delay callbacks to use "unsigned long"

---
 libraries/DataFlash/DataFlash.cpp      | 2 +-
 libraries/DataFlash/DataFlash.h        | 4 ++--
 libraries/DataFlash/DataFlash_APM1.cpp | 2 +-
 libraries/DataFlash/DataFlash_APM1.h   | 2 +-
 libraries/DataFlash/DataFlash_APM2.cpp | 2 +-
 libraries/DataFlash/DataFlash_APM2.h   | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/DataFlash/DataFlash.cpp b/libraries/DataFlash/DataFlash.cpp
index 3c39ce946e..69895e5d11 100644
--- a/libraries/DataFlash/DataFlash.cpp
+++ b/libraries/DataFlash/DataFlash.cpp
@@ -187,7 +187,7 @@ uint16_t DataFlash_Class::GetFilePage()
 	return df_FilePage;
 }
 
-void DataFlash_Class::EraseAll(void (*delay_cb)(uint32_t))
+void DataFlash_Class::EraseAll(void (*delay_cb)(unsigned long))
 {
 	for(uint16_t j = 1; j <= (df_NumPages+1)/8; j++) {
 		BlockErase(j);
diff --git a/libraries/DataFlash/DataFlash.h b/libraries/DataFlash/DataFlash.h
index 60ff86c9ce..0d349e173a 100644
--- a/libraries/DataFlash/DataFlash.h
+++ b/libraries/DataFlash/DataFlash.h
@@ -36,7 +36,7 @@ class DataFlash_Class
 	virtual unsigned char BufferRead (unsigned char BufferNum, uint16_t IntPageAdr) = 0;
 	virtual void PageErase(uint16_t PageAdr) = 0;
 	virtual void BlockErase(uint16_t BlockAdr) = 0;
-	virtual void ChipErase(void (*delay_cb)(uint32_t)) = 0;
+	virtual void ChipErase(void (*delay_cb)(unsigned long)) = 0;
 
 	// internal high level functions
 	int16_t find_last_page(void);
@@ -58,7 +58,7 @@ class DataFlash_Class
 	int16_t GetWritePage(void);
 
 	// erase handling
-	void EraseAll(void (*delay_cb)(uint32_t));
+	void EraseAll(void (*delay_cb)(unsigned long));
 	bool NeedErase(void);
 
 	// Write methods
diff --git a/libraries/DataFlash/DataFlash_APM1.cpp b/libraries/DataFlash/DataFlash_APM1.cpp
index 7111e77a2d..d0c390825b 100644
--- a/libraries/DataFlash/DataFlash_APM1.cpp
+++ b/libraries/DataFlash/DataFlash_APM1.cpp
@@ -317,7 +317,7 @@ void DataFlash_APM1::BlockErase (uint16_t BlockAdr)
 
 
 
-void DataFlash_APM1::ChipErase(void (*delay_cb)(uint32_t))
+void DataFlash_APM1::ChipErase(void (*delay_cb)(unsigned long))
 {
 
   dataflash_CS_active();     // activate dataflash command decoder
diff --git a/libraries/DataFlash/DataFlash_APM1.h b/libraries/DataFlash/DataFlash_APM1.h
index ed70c36640..fb1aa3b34e 100644
--- a/libraries/DataFlash/DataFlash_APM1.h
+++ b/libraries/DataFlash/DataFlash_APM1.h
@@ -20,7 +20,7 @@ class DataFlash_APM1 : public DataFlash_Class
 	uint16_t PageSize();
 	void PageErase (uint16_t PageAdr);
 	void BlockErase (uint16_t BlockAdr);
-	void ChipErase(void (*delay_cb)(uint32_t));
+	void ChipErase(void (*delay_cb)(unsigned long));
 
   public:
 
diff --git a/libraries/DataFlash/DataFlash_APM2.cpp b/libraries/DataFlash/DataFlash_APM2.cpp
index e67b0ef749..174b39affa 100644
--- a/libraries/DataFlash/DataFlash_APM2.cpp
+++ b/libraries/DataFlash/DataFlash_APM2.cpp
@@ -394,7 +394,7 @@ void DataFlash_APM2::BlockErase(uint16_t BlockAdr)
 }
 
 
-void DataFlash_APM2::ChipErase(void (*delay_cb)(uint32_t))
+void DataFlash_APM2::ChipErase(void (*delay_cb)(unsigned long))
 {
 	//serialDebug("Chip Erase\n");
 
diff --git a/libraries/DataFlash/DataFlash_APM2.h b/libraries/DataFlash/DataFlash_APM2.h
index ded8f55e4f..b81246bf35 100644
--- a/libraries/DataFlash/DataFlash_APM2.h
+++ b/libraries/DataFlash/DataFlash_APM2.h
@@ -24,7 +24,7 @@ class DataFlash_APM2 : public DataFlash_Class
 	void CS_active();
 	void PageErase (uint16_t PageAdr);
 	void BlockErase (uint16_t BlockAdr);
-	void ChipErase(void (*delay_cb)(uint32_t));
+	void ChipErase(void (*delay_cb)(unsigned long));
 
   public:
 	DataFlash_APM2(); // Constructor