X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fflash%2Fnand.h;h=c6d4075187a4f3176dd15b27687c0257a1ce569a;hb=43483e5054c78e0fdfaebed5e14c14246af07c97;hp=922f08a9c19f5c4b9737488fb359a02424a3c953;hpb=8f4860d13f03c40b28bb32e9cb0f1d650e200ce9;p=openocd.git

diff --git a/src/flash/nand.h b/src/flash/nand.h
index 922f08a9c1..c6d4075187 100644
--- a/src/flash/nand.h
+++ b/src/flash/nand.h
@@ -53,13 +53,13 @@ struct nand_flash_controller
 
 #define NAND_DEVICE_COMMAND_HANDLER(name) static __NAND_DEVICE_COMMAND(name)
 
-typedef struct nand_block_s
+struct nand_block
 {
 	uint32_t offset;
 	uint32_t size;
 	int is_erased;
 	int is_bad;
-} nand_block_t;
+};
 
 struct nand_oobfree {
 	int offset;
@@ -77,15 +77,15 @@ typedef struct nand_device_s
 {
 	struct nand_flash_controller *controller;
 	void *controller_priv;
-	struct nand_manufacturer_s *manufacturer;
-	struct nand_info_s *device;
+	struct nand_manufacturer *manufacturer;
+	struct nand_info *device;
 	int bus_width;
 	int address_cycles;
 	int page_size;
 	int erase_size;
 	int use_raw;
 	int num_blocks;
-	nand_block_t *blocks;
+	struct nand_block *blocks;
 	struct nand_device_s *next;
 } nand_device_t;
 
@@ -103,13 +103,13 @@ enum
 	NAND_MFR_MICRON = 0x2c,
 };
 
-typedef struct nand_manufacturer_s
+struct nand_manufacturer
 {
 	int id;
 	char *name;
-} nand_manufacturer_t;
+};
 
-typedef struct nand_info_s
+struct nand_info
 {
 	char *name;
 	int id;
@@ -117,7 +117,7 @@ typedef struct nand_info_s
 	int chip_size;
 	int erase_size;
 	int options;
-} nand_info_t;
+};
 
 /* Option constants for bizarre disfunctionality and real features
  */