Changeset 620:ac139e476a85

Timestamp:

06/22/08 20:36:43 (7 months ago)

Author:

Maxime Petazzoni <maxime.petazzoni@…>

Branch:

default

Message:

Refactor some EFC code

Files:

• nxos/base/drivers/_efc.c (modified) (3 diffs)

nxos/base/drivers/_efc.c

@@ -25 +25 @@
 }
 
-/* Write one page at the given page number in the flash.
- * Use interrupt-driven flash programming ?
- */
-bool nx__efc_write_page(U32 *data, U32 page) {
+static bool nx__efc_do_write(U32 page) {
   U32 ret;
-  U8 i;
 
   NX_ASSERT(page < EFC_PAGES);
-
-  /* Wait for the flash to be ready. */
-  while (!(*AT91C_MC_FSR & AT91C_MC_FRDY));
-
-  nx_systick_wait_ms(EFC_THROTTLE_TIMER);
-
-  /* Write the page data to the flash in-memory mapping. */
-  for (i=0 ; i<EFC_PAGE_WORDS ; i++) {
-      FLASH_BASE_PTR[i+page*EFC_PAGE_WORDS] = data[i];
-  }
 
   /* Trigger the flash write command. */
@@ -59 +45 @@
 
   return TRUE;
+}
+
+static inline void nx__efc_wait_for_flash(void) {
+  while (!(*AT91C_MC_FSR & AT91C_MC_FRDY));
+}
+
+/* Write one page at the given page number in the flash.
+ * Use interrupt-driven flash programming ?
+ */
+bool nx__efc_write_page(U32 *data, U32 page) {
+  U8 i;
+
+  NX_ASSERT(page < EFC_PAGES);
+
+  /* Wait for the flash to be ready. */
+  nx__efc_wait_for_flash();
+  nx_systick_wait_ms(EFC_THROTTLE_TIMER);
+
+  /* Write the page data to the flash in-memory mapping. */
+  for (i=0 ; i<EFC_PAGE_WORDS ; i++) {
+      FLASH_BASE_PTR[i+page*EFC_PAGE_WORDS] = data[i];
+  }
+
+  return nx__efc_do_write(page);
 }
 
@@ -78 +88 @@
 
 bool nx__efc_erase_page(U32 page, U32 value) {
-  U32 data[EFC_PAGE_WORDS] = {value};
-  return nx__efc_write_page(data, page);
+  U8 i;
+
+  NX_ASSERT(page < EFC_PAGES);
+
+  /* Wait for the flash to be ready. */
+  nx__efc_wait_for_flash();
+  nx_systick_wait_ms(EFC_THROTTLE_TIMER);
+
+  /* Write the page data to the flash in-memory mapping. */
+  for (i=0 ; i<EFC_PAGE_WORDS ; i++) {
+      FLASH_BASE_PTR[i+page*EFC_PAGE_WORDS] = value;
+  }
+
+  return nx__efc_do_write(page);
 }