diff options
| author | Michael Sparmann <theseven@rockbox.org> | 2010-06-20 12:29:18 +0000 |
|---|---|---|
| committer | Michael Sparmann <theseven@rockbox.org> | 2010-06-20 12:29:18 +0000 |
| commit | 7caf78848e44e3c7865cfe1643e5c0d520d26dca (patch) | |
| tree | 3d8143f5d94fbc53caf9fb5ce9da37a6f3d519ec | |
| parent | 3b97fbd91e532fc5808babfa0960c81941f34696 (diff) | |
Use STORAGE_ALIGN_ATTR for instead of hardwired alignment in the Nano2G FTL and NAND driver
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26983 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c | 11 | ||||
| -rw-r--r-- | firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c | 8 |
2 files changed, 10 insertions, 9 deletions
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c index 9cb350d004..65a282fe37 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c @@ -26,6 +26,7 @@ #include <nand-target.h> #include <ftl-target.h> #include <string.h> +#include "system.h" #include "kernel.h" #include "panic.h" @@ -371,10 +372,10 @@ struct ftl_vfl_cxt_type ftl_vfl_cxt[4]; struct ftl_cxt_type ftl_cxt; /* Temporary data buffers for internal use by the FTL */ -uint8_t ftl_buffer[0x800] __attribute__((aligned(16))); +uint8_t ftl_buffer[0x800] STORAGE_ALIGN_ATTR; /* Temporary spare byte buffer for internal use by the FTL */ -union ftl_spare_data_type ftl_sparebuffer[FTL_WRITESPARE_SIZE] __attribute__((aligned(16))); +union ftl_spare_data_type ftl_sparebuffer[FTL_WRITESPARE_SIZE] STORAGE_ALIGN_ATTR; #ifndef FTL_READONLY @@ -404,12 +405,12 @@ uint8_t ftl_erasectr_dirt[8]; /* Buffer needed for copying pages around while moving or committing blocks. This can't be shared with ftl_buffer, because this one could be overwritten during the copying operation in order to e.g. commit a CXT. */ -uint8_t ftl_copybuffer[FTL_COPYBUF_SIZE][0x800] __attribute__((aligned(16))); -union ftl_spare_data_type ftl_copyspare[FTL_COPYBUF_SIZE] __attribute__((aligned(16))); +uint8_t ftl_copybuffer[FTL_COPYBUF_SIZE][0x800] STORAGE_ALIGN_ATTR; +union ftl_spare_data_type ftl_copyspare[FTL_COPYBUF_SIZE] STORAGE_ALIGN_ATTR; /* Needed to store the old scattered page offsets in order to be able to roll back if something fails while compacting a scattered page block. */ -uint16_t ftl_offsets_backup[0x200] __attribute__((aligned(16))); +uint16_t ftl_offsets_backup[0x200] STORAGE_ALIGN_ATTR; #endif diff --git a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c index 189dc4cafb..b7e1f8494b 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c +++ b/firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c @@ -99,10 +99,10 @@ static struct wakeup nand_wakeup; static struct mutex ecc_mtx; static struct wakeup ecc_wakeup; -static uint8_t nand_data[0x800] __attribute__((aligned(16))); -static uint8_t nand_ctrl[0x200] __attribute__((aligned(16))); -static uint8_t nand_spare[0x40] __attribute__((aligned(16))); -static uint8_t nand_ecc[0x30] __attribute__((aligned(16))); +static uint8_t nand_data[0x800] STORAGE_ALIGN_ATTR; +static uint8_t nand_ctrl[0x200] STORAGE_ALIGN_ATTR; +static uint8_t nand_spare[0x40] STORAGE_ALIGN_ATTR; +static uint8_t nand_ecc[0x30] STORAGE_ALIGN_ATTR; uint32_t nand_unlock(uint32_t rc) |