From mboxrd@z Thu Jan 1 00:00:00 1970 From: Lukasz Majewski Date: Tue, 10 Sep 2013 11:09:46 +0200 Subject: [U-Boot] [PATCH v2 1/3] dfu: unify mmc/nand read/write ops enum In-Reply-To: References: Message-ID: <20130910110946.4416cb91@amdc308.digital.local> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Afzal, > MMC and NAND independently defines same enumerators for read/write. > Unify them by defining enum in dfu header. RAM support that is being > added newly also can make use of it. > > Signed-off-by: Afzal Mohammed > Cc: Lukasz Majewski > Cc: Pantelis Antoniou > --- > > v2: new > > drivers/dfu/dfu_mmc.c | 9 ++------- > drivers/dfu/dfu_nand.c | 7 +------ > include/dfu.h | 5 +++++ > 3 files changed, 8 insertions(+), 13 deletions(-) > > diff --git a/drivers/dfu/dfu_mmc.c b/drivers/dfu/dfu_mmc.c > index 0871a77..f942758 100644 > --- a/drivers/dfu/dfu_mmc.c > +++ b/drivers/dfu/dfu_mmc.c > @@ -13,16 +13,11 @@ > #include > #include > > -enum dfu_mmc_op { > - DFU_OP_READ = 1, > - DFU_OP_WRITE, > -}; > - > static unsigned char __aligned(CONFIG_SYS_CACHELINE_SIZE) > dfu_file_buf[CONFIG_SYS_DFU_MAX_FILE_SIZE]; > static long dfu_file_buf_len; > > -static int mmc_block_op(enum dfu_mmc_op op, struct dfu_entity *dfu, > +static int mmc_block_op(enum dfu_op op, struct dfu_entity *dfu, > u64 offset, void *buf, long *len) > { > char cmd_buf[DFU_CMD_BUF_SIZE]; > @@ -65,7 +60,7 @@ static int mmc_file_buffer(struct dfu_entity *dfu, > void *buf, long *len) return 0; > } > > -static int mmc_file_op(enum dfu_mmc_op op, struct dfu_entity *dfu, > +static int mmc_file_op(enum dfu_op op, struct dfu_entity *dfu, > void *buf, long *len) > { > char cmd_buf[DFU_CMD_BUF_SIZE]; > diff --git a/drivers/dfu/dfu_nand.c b/drivers/dfu/dfu_nand.c > index 0ec12cf..edbf5a9 100644 > --- a/drivers/dfu/dfu_nand.c > +++ b/drivers/dfu/dfu_nand.c > @@ -19,12 +19,7 @@ > #include > #include > > -enum dfu_nand_op { > - DFU_OP_READ = 1, > - DFU_OP_WRITE, > -}; > - > -static int nand_block_op(enum dfu_nand_op op, struct dfu_entity *dfu, > +static int nand_block_op(enum dfu_op op, struct dfu_entity *dfu, > u64 offset, void *buf, long *len) > { > loff_t start, lim; > diff --git a/include/dfu.h b/include/dfu.h > index 47b9055..6115d90 100644 > --- a/include/dfu.h > +++ b/include/dfu.h > @@ -29,6 +29,11 @@ enum dfu_layout { > DFU_FS_EXT4, > }; > > +enum dfu_op { > + DFU_OP_READ = 1, > + DFU_OP_WRITE, > +}; > + > struct mmc_internal_data { > /* RAW programming */ > unsigned int lba_start; Acked-by: Lukasz Majewski -- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group