diff --git a/bootinfo.c b/bootinfo.c index 2f75744..48baad7 100644 --- a/bootinfo.c +++ b/bootinfo.c @@ -24,12 +24,7 @@ #include #include - -typedef unsigned char u8; -typedef unsigned char __u8; -typedef unsigned int u32; -typedef unsigned int __u32; -typedef signed int __s32; +#include "types.h" /* boot_file_head copied from mksunxiboot */ /* boot head definition from sun4i boot code */ diff --git a/include/types.h b/include/types.h new file mode 100644 index 0000000..ebf5f15 --- /dev/null +++ b/include/types.h @@ -0,0 +1,26 @@ +#ifndef SUNXI_TYPES_H +#define SUNXI_TYPES_H + +#include + +#define __s8 int8_t +#define __s16 int16_t +#define __s32 int32_t +#define __s64 int64_t + +#define s8 int8_t +#define s16 int16_t +#define s32 int32_t +#define s64 int64_t + +#define __u8 uint8_t +#define __u16 uint16_t +#define __u32 uint32_t +#define __u64 uint64_t + +#define u8 uint8_t +#define u16 uint16_t +#define u32 uint32_t +#define u64 uint64_t + +#endif diff --git a/nand-part.h b/nand-part.h index 600c895..2cac1bb 100644 --- a/nand-part.h +++ b/nand-part.h @@ -23,7 +23,7 @@ #ifndef __MBR_H__ #define __MBR_H__ -#include "type_def.h" +#include "types.h" #define MAX_PART_COUNT 15 //max part count #define MBR_COPY_NUM 4 //mbr backup count diff --git a/type_def.h b/type_def.h deleted file mode 100755 index 0580aa5..0000000 --- a/type_def.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * drivers/block/sun4i_nand/include/type_def.h - * - * (C) Copyright 2007-2012 - * Allwinner Technology Co., Ltd. - * - * 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., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA - */ - -#ifndef TYPE_DEF_H -#define TYPE_DEF_H - -//#include "sunii.h" -// #include - -//typedef signed char s8; -//typedef unsigned char u8; -// -//typedef signed short s16; -//typedef unsigned short u16; -// -//typedef signed int s32; -//typedef unsigned int u32; -// -//typedef signed long s64; -//typedef unsigned long u64; -// -typedef signed char __s8; -typedef unsigned char __u8; -// -typedef signed short __s16; -typedef unsigned short __u16; -// -typedef signed int __s32; -typedef unsigned int __u32; -// -typedef signed long __s64; -typedef unsigned long __u64; - - typedef unsigned int __hdle; - -#define EPDK_OK 0 -#define EPDK_FAIL -1 - - -#endif