From: asterix <asterix@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Tue, 30 Oct 2007 10:57:29 +0000 (+0000)
Subject: Make static the global variable. Remove doxygen brackect from some comment. Change... 
X-Git-Tag: 1.0.0~279
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=6b03e5a1d04f119f778b19d9754e5e1d5e78deec;p=bertos.git

Make static the global variable. Remove doxygen brackect from some comment. Change enable/disable macros with toggle macro.


git-svn-id: https://src.develer.com/svnoss/bertos/trunk@963 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/drv/dataflash.c b/drv/dataflash.c
index dbea08f7..9089fa97 100644
--- a/drv/dataflash.c
+++ b/drv/dataflash.c
@@ -55,8 +55,8 @@
  * Global variable for store current and previous data
  * flash memory page address during operation of writing.
  */
-dataflash_t previous_page = 0;
-bool page_modified = false;
+static dataflash_t previous_page = 0;
+static bool page_modified = false;
 
 
 /**
@@ -88,7 +88,6 @@ static void send_cmd(dataflash_t page_addr, dataflash_t byte_addr, DataFlashOpco
 	 *  hight part of address byte in third byte togheter low par of page
 	 *  address.
 	 *
-	 * \{
 	 */
 
 	/*
@@ -98,18 +97,15 @@ static void send_cmd(dataflash_t page_addr, dataflash_t byte_addr, DataFlashOpco
 
 	/*
 	 *  Send page address.
-	 * \{
 	 */
 	spi_sendRecv((uint8_t)(page_addr >> (16 - DATAFLASH_PAGE_ADDRESS_BIT)));
 	spi_sendRecv((uint8_t)((page_addr << (DATAFLASH_PAGE_ADDRESS_BIT - 8)) + (byte_addr >> 8)));
-	/*\}*/
 
 	/*
 	 * Send byte page address.
 	 */
 	spi_sendRecv((uint8_t)byte_addr);
 
-	/* \} */
 
 }
 
@@ -181,7 +177,6 @@ static uint8_t dataflash_stat(void)
 	/*
 	 * Make sure to toggle CS signal in order,
 	 * and reset dataflash command decoder.
-	 * \{
 	 */
 	CS_TOGGLE();
 
@@ -202,8 +197,7 @@ static uint8_t dataflash_cmd(dataflash_t page_addr, dataflash_t byte_addr, DataF
 
 	send_cmd(page_addr, byte_addr, opcode);
 
-	CS_DISABLE();
-	CS_ENABLE();
+	CS_TOGGLE();
 
 	/*
 	 * We chech data flash memory state, and wait until busy-flag
@@ -230,12 +224,10 @@ static uint8_t dataflash_read_byte(dataflash_t page_addr, dataflash_t byte_addr,
 	{
 		/*
 		 * Send 24 don't care bit.
-		 * \{
 		 */
 		spi_sendRecv(0x00);
 		spi_sendRecv(0x00);
 		spi_sendRecv(0x00);
-		/* \} */
 
 	}
 #endif
@@ -260,12 +252,11 @@ static void dataflash_read_block(dataflash_t page_addr, dataflash_t byte_addr, D
 	{
 		/*
 		 * Send 24 don't care bit.
-		 * \{
 		 */
 		spi_sendRecv(0x00);
 		spi_sendRecv(0x00);
 		spi_sendRecv(0x00);
-		/* \} */
+
 	}
 
 	spi_sendRecv(0x00);   //Send 8 don't care bit.
@@ -411,11 +402,10 @@ static size_t dataflash_read(struct _KFile *fd, void *buf, size_t size)
 	/*
 	 * We select from absolute address page address
 	 * and byte address in page.
-	 * \{
 	 */
 	page_addr = fd->seek_pos / (dataflashAddr_t)DATAFLASH_PAGE_SIZE;
 	byte_addr = fd->seek_pos % (dataflashAddr_t)DATAFLASH_PAGE_SIZE;
-	/* \} */
+
 
 	kprintf(" [page-<%ld>, byte-<%ld>]", page_addr, byte_addr);
 
@@ -459,11 +449,10 @@ static size_t dataflash_write(struct _KFile *fd, const void *_buf, size_t size)
 		/*
 		* We select from absolute address page address
 		* and byte address in page.
-		* \{
 		*/
 		current_page = fd->seek_pos / (dataflashAddr_t)DATAFLASH_PAGE_SIZE;
 		byte_addr = fd->seek_pos % (dataflashAddr_t)DATAFLASH_PAGE_SIZE;
-		/* \} */
+
 
 		size_t wr_len = MIN(size, DATAFLASH_PAGE_SIZE - byte_addr);
 
@@ -482,11 +471,10 @@ static size_t dataflash_write(struct _KFile *fd, const void *_buf, size_t size)
 		/*
 		* Write byte in current page, and set true
 		* page_modified flag.
-		*\{
 		*/
 		dataflash_write_byte(byte_addr, DFO_WRITE_BUFF1, data);
 		page_modified = true;
-		/* \} */
+
 
 		data += wr_len;
 		fd->seek_pos += wr_len;