diff --git a/components/drivers/include/drivers/mtd.h b/components/drivers/include/drivers/mtd.h index 64c24bca3a..9cc7c470d2 100644 --- a/components/drivers/include/drivers/mtd.h +++ b/components/drivers/include/drivers/mtd.h @@ -1,25 +1,16 @@ /* - * File : mtd.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2012, Shanghai Real-Thread Technology Co., Ltd + * Copyright (c) 2006-2018, RT-Thread Development Team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: Apache-2.0 + */ + +/* + * File : mtd.h * * Change Logs: - * Date Author Notes - * 2018-7-5 heyuanjie the first version + * Date Author Notes + 2018-09-10 heyuanjie87 first version + */ #ifndef __MTD_H__ diff --git a/components/drivers/include/drivers/mtdnand.h b/components/drivers/include/drivers/mtdnand.h index 5371cd1fb3..c767e4ac9c 100644 --- a/components/drivers/include/drivers/mtdnand.h +++ b/components/drivers/include/drivers/mtdnand.h @@ -1,29 +1,16 @@ /* - * File : nand.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2006 - 2012, RT-Thread Development Team + * Copyright (c) 2006-2018, RT-Thread Development Team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Change Logs: - * Date Author Notes - * 2018-7-8 heyuanjie the first version + * SPDX-License-Identifier: Apache-2.0 */ /* - * COPYRIGHT (C) 2012, Shanghai Real Thread + * File : mtdnand.h + * + * Change Logs: + * Date Author Notes + 2018-09-10 heyuanjie87 first version + */ #ifndef _MTDNAND_H_ @@ -113,6 +100,6 @@ struct nand_ops int(*markbad)(rt_nand_t *nand, uint32_t blk); /* if NULL OOB[0] used as bad mark(set to 0x00) */ }; -int rt_mtd_nand_init(rt_nand_t *nand, int blk_size, int page_size, int blks_pc, int oob_size); +int rt_mtd_nand_init(rt_nand_t *nand, int blk_size, int page_size, int oob_size); #endif /* MTD_NAND_H_ */ diff --git a/components/drivers/include/drivers/mtdnor.h b/components/drivers/include/drivers/mtdnor.h index de57c2d2d5..709efe29a4 100644 --- a/components/drivers/include/drivers/mtdnor.h +++ b/components/drivers/include/drivers/mtdnor.h @@ -1,25 +1,16 @@ /* - * File : mtdnor.h - * This file is part of RT-Thread RTOS - * COPYRIGHT (C) 2012, Shanghai Real-Thread Technology Co., Ltd + * Copyright (c) 2006-2018, RT-Thread Development Team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * SPDX-License-Identifier: Apache-2.0 + */ + +/* + * File : mtdnor.h * * Change Logs: - * Date Author Notes - * 2018-8-30 heyuanjie the first version + * Date Author Notes + 2018-09-10 heyuanjie87 first version + */ #ifndef __MTDNOR_H__ diff --git a/components/drivers/mtd/mtdnand.c b/components/drivers/mtd/mtdnand.c index 48d1870af1..c209ea3279 100644 --- a/components/drivers/mtd/mtdnand.c +++ b/components/drivers/mtd/mtdnand.c @@ -601,7 +601,7 @@ static const struct mtd_ops _ops = nand_block_markbad, }; -int rt_mtd_nand_init(rt_nand_t *nand, int blk_size, int page_size, int blks_pc, int oob_size) +int rt_mtd_nand_init(rt_nand_t *nand, int blk_size, int page_size, int oob_size) { uint8_t *buf; @@ -616,7 +616,6 @@ int rt_mtd_nand_init(rt_nand_t *nand, int blk_size, int page_size, int blks_pc, nand->buffers.ecccode = buf; nand->pagebuf = 0; /* alloc when unaligen access */ - nand->size = blk_size * blks_pc; nand->pages_pb = blk_size / page_size; nand->ecc._step = page_size / nand->ecc.stepsize; nand->page_size = page_size;