More NAND logic (still not complete)

This commit is contained in:
Gregory Nutt 2013-11-16 18:26:07 -06:00
parent 28a1a5e428
commit c11cfd3368

View File

@ -58,6 +58,7 @@
#include <nuttx/fs/ioctl.h> #include <nuttx/fs/ioctl.h>
#include <nuttx/mtd/mtd.h> #include <nuttx/mtd/mtd.h>
#include <nuttx/mtd/nand.h> #include <nuttx/mtd/nand.h>
#include <nuttx/mtd/nand_model.h>
#include <arch/board/board.h> #include <arch/board/board.h>
@ -71,15 +72,16 @@
* Private Types * Private Types
****************************************************************************/ ****************************************************************************/
/* This type represents the state of the NAND MTD device. The struct /* This type represents the state of the raw NAND MTD device. The struct
* mtd_dev_s must appear at the beginning of the definition so that you can * mtd_dev_s must appear at the beginning of the definition so that you can
* freely cast between pointers to struct mtd_dev_s and struct nand_dev_s. * freely cast between pointers to struct mtd_dev_s and struct nand_raw_s.
*/ */
struct nand_dev_s struct nand_raw_s
{ {
struct mtd_dev_s mtd; /* Externally visible part of the driver */ struct mtd_dev_s mtd; /* Externally visible part of the driver */
uint8_t cs; /* Chip select number (0..3) */ uint8_t cs; /* Chip select number (0..3) */
struct nand_model_s model; /* The NAND model */
uintptr_t cmdaddr; /* NAND command address base */ uintptr_t cmdaddr; /* NAND command address base */
uintptr_t addraddr; /* NAND address address base */ uintptr_t addraddr; /* NAND address address base */
uintptr_t dataaddr; /* NAND data address */ uintptr_t dataaddr; /* NAND data address */
@ -108,16 +110,16 @@ static int nand_ioctl(struct mtd_dev_s *dev, int cmd,
*/ */
#ifdef CONFIG_SAMA5_EBICS0_NAND #ifdef CONFIG_SAMA5_EBICS0_NAND
static struct nand_dev_s g_cs0nand; static struct nand_raw_s g_cs0nand;
#endif #endif
#ifdef CONFIG_SAMA5_EBICS1_NAND #ifdef CONFIG_SAMA5_EBICS1_NAND
static struct nand_dev_s g_cs1nand; static struct nand_raw_s g_cs1nand;
#endif #endif
#ifdef CONFIG_SAMA5_EBICS2_NAND #ifdef CONFIG_SAMA5_EBICS2_NAND
static struct nand_dev_s g_cs2nand; static struct nand_raw_s g_cs2nand;
#endif #endif
#ifdef CONFIG_SAMA5_EBICS3_NAND #ifdef CONFIG_SAMA5_EBICS3_NAND
static struct nand_dev_s g_cs3nand; static struct nand_raw_s g_cs3nand;
#endif #endif
/**************************************************************************** /****************************************************************************
@ -135,7 +137,7 @@ static struct nand_dev_s g_cs3nand;
static int nand_erase(struct mtd_dev_s *dev, off_t startblock, static int nand_erase(struct mtd_dev_s *dev, off_t startblock,
size_t nblocks) size_t nblocks)
{ {
struct nand_dev_s *priv = (struct nand_dev_s *)dev; struct nand_raw_s *priv = (struct nand_raw_s *)dev;
/* The interface definition assumes that all erase blocks are the same size. /* The interface definition assumes that all erase blocks are the same size.
* If that is not true for this particular device, then transform the * If that is not true for this particular device, then transform the
@ -159,7 +161,7 @@ static int nand_erase(struct mtd_dev_s *dev, off_t startblock,
static ssize_t nand_bread(struct mtd_dev_s *dev, off_t startblock, static ssize_t nand_bread(struct mtd_dev_s *dev, off_t startblock,
size_t nblocks, uint8_t *buf) size_t nblocks, uint8_t *buf)
{ {
struct nand_dev_s *priv = (struct nand_dev_s *)dev; struct nand_raw_s *priv = (struct nand_raw_s *)dev;
/* The interface definition assumes that all read/write blocks are the same size. /* The interface definition assumes that all read/write blocks are the same size.
* If that is not true for this particular device, then transform the * If that is not true for this particular device, then transform the
@ -185,7 +187,7 @@ static ssize_t nand_bread(struct mtd_dev_s *dev, off_t startblock,
static ssize_t nand_bwrite(struct mtd_dev_s *dev, off_t startblock, static ssize_t nand_bwrite(struct mtd_dev_s *dev, off_t startblock,
size_t nblocks, const uint8_t *buf) size_t nblocks, const uint8_t *buf)
{ {
struct nand_dev_s *priv = (struct nand_dev_s *)dev; struct nand_raw_s *priv = (struct nand_raw_s *)dev;
/* The interface definition assumes that all read/write blocks are the same size. /* The interface definition assumes that all read/write blocks are the same size.
* If that is not true for this particular device, then transform the * If that is not true for this particular device, then transform the
@ -206,7 +208,7 @@ static ssize_t nand_bwrite(struct mtd_dev_s *dev, off_t startblock,
static int nand_ioctl(struct mtd_dev_s *dev, int cmd, unsigned long arg) static int nand_ioctl(struct mtd_dev_s *dev, int cmd, unsigned long arg)
{ {
struct nand_dev_s *priv = (struct nand_dev_s *)dev; struct nand_raw_s *priv = (struct nand_raw_s *)dev;
int ret = -EINVAL; /* Assume good command with bad parameters */ int ret = -EINVAL; /* Assume good command with bad parameters */
switch (cmd) switch (cmd)
@ -279,7 +281,8 @@ static int nand_ioctl(struct mtd_dev_s *dev, int cmd, unsigned long arg)
struct mtd_dev_s *sam_nand_initialize(int cs) struct mtd_dev_s *sam_nand_initialize(int cs)
{ {
struct nand_dev_s *priv; struct nand_raw_s *priv;
struct mtd_s *mtd;
uintptr_t cmdaddr; uintptr_t cmdaddr;
uintptr_t addraddr; uintptr_t addraddr;
uintptr_t dataaddr; uintptr_t dataaddr;
@ -363,7 +366,7 @@ struct mtd_dev_s *sam_nand_initialize(int cs)
/* Initialize the device structure */ /* Initialize the device structure */
memset(priv, 0, sizeof(struct nand_dev_s)); memset(priv, 0, sizeof(struct nand_raw_s));
priv->mtd.erase = nand_erase; priv->mtd.erase = nand_erase;
priv->mtd.bread = nand_bread; priv->mtd.bread = nand_bread;
priv->mtd.bwrite = nand_bwrite; priv->mtd.bwrite = nand_bwrite;
@ -384,20 +387,21 @@ struct mtd_dev_s *sam_nand_initialize(int cs)
return NULL; return NULL;
} }
/* Probe the NAND part */ /* Probe the NAND part. On success, an MTD interface that wraps
* our raw NAND interface is returned.
*/
ret = nand_initialize(&priv->mtd, cmdaddr, addraddr, dataaddr); mtd = nand_initialize(&priv->mtd, cmdaddr, addraddr, dataaddr, &priv->model);
if (ret < 0) if (!mtd)
{ {
fdbg("ERROR: CS%d nand_initialize failed: %d at (%p, %p, %p)\n", fdbg("ERROR: CS%d nand_initialize failed: %d at (%p, %p, %p)\n",
cs, ret, cs, (FAR void *)cmdaddr, (FAR void *)addraddr, (FAR void *)dataaddr);
(FAR void *)cmdaddr, (FAR void *)addraddr, (FAR void *)dataaddr);
return NULL; return NULL;
} }
#warning Missing logic #warning Missing logic
/* Return the implementation-specific state structure as the MTD device */ /* Return the MTD wrapper interface as the MTD device */
return &priv->mtd; return mtd;
} }