len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-08 20:55:17 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use STORAGE_ALIGN_ATTR for instead of hardwired alignment in the Nano2G FTL and NAND driver

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26983 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sparmann 2010-06-20 12:29:18 +00:00
parent 3b97fbd91e
commit 7caf78848e
2 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

11
firmware/target/arm/s5l8700/ipodnano2g/ftl-nano2g.c
View file

@ -26,6 +26,7 @@
#include <nand-target.h> #include <nand-target.h>
#include <ftl-target.h> #include <ftl-target.h>
#include <string.h> #include <string.h>
#include "system.h"
#include "kernel.h" #include "kernel.h"
#include "panic.h" #include "panic.h"
@ -371,10 +372,10 @@ struct ftl_vfl_cxt_type ftl_vfl_cxt[4];
struct ftl_cxt_type ftl_cxt; struct ftl_cxt_type ftl_cxt;
/* Temporary data buffers for internal use by the FTL */ /* 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 */ /* 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 #ifndef FTL_READONLY
@ -404,12 +405,12 @@ uint8_t ftl_erasectr_dirt[8];
/* Buffer needed for copying pages around while moving or committing blocks. /* 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 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. */ during the copying operation in order to e.g. commit a CXT. */
uint8_t ftl_copybuffer[FTL_COPYBUF_SIZE][0x800] __attribute__((aligned(16))); uint8_t ftl_copybuffer[FTL_COPYBUF_SIZE][0x800] STORAGE_ALIGN_ATTR;
union ftl_spare_data_type ftl_copyspare[FTL_COPYBUF_SIZE] __attribute__((aligned(16))); 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 /* 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. */ 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 #endif

8
firmware/target/arm/s5l8700/ipodnano2g/nand-nano2g.c
View file

@ -99,10 +99,10 @@ static struct wakeup nand_wakeup;
static struct mutex ecc_mtx; static struct mutex ecc_mtx;
static struct wakeup ecc_wakeup; static struct wakeup ecc_wakeup;
static uint8_t nand_data[0x800] __attribute__((aligned(16))); static uint8_t nand_data[0x800] STORAGE_ALIGN_ATTR;
static uint8_t nand_ctrl[0x200] __attribute__((aligned(16))); static uint8_t nand_ctrl[0x200] STORAGE_ALIGN_ATTR;
static uint8_t nand_spare[0x40] __attribute__((aligned(16))); static uint8_t nand_spare[0x40] STORAGE_ALIGN_ATTR;
static uint8_t nand_ecc[0x30] __attribute__((aligned(16))); static uint8_t nand_ecc[0x30] STORAGE_ALIGN_ATTR;
uint32_t nand_unlock(uint32_t rc) uint32_t nand_unlock(uint32_t rc)