X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fflash%2Fnand.h;h=ea319479846586a8bed03b6ec2db2ead77070b55;hb=40273967bf535aefb3eaec9367c50e7799b079bb;hp=57076d54857880d7f404dab59e3b1d61342a06a8;hpb=670f999e7a1ec04cda599a5487de068379e36f0e;p=openocd

diff --git a/src/flash/nand.h b/src/flash/nand.h
index 57076d54..ea319479 100644
--- a/src/flash/nand.h
+++ b/src/flash/nand.h
@@ -32,7 +32,7 @@ struct nand_device_s;
 #define __NAND_DEVICE_COMMAND(name) \
 		COMMAND_HELPER(name, struct nand_device_s *nand)
 
-typedef struct nand_flash_controller_s
+struct nand_flash_controller
 {
 	char *name;
 	__NAND_DEVICE_COMMAND((*nand_device_command));
@@ -49,7 +49,7 @@ typedef struct nand_flash_controller_s
 	int (*read_page)(struct nand_device_s *nand, uint32_t page, uint8_t *data, uint32_t data_size, uint8_t *oob, uint32_t oob_size);
 	int (*controller_ready)(struct nand_device_s *nand, int timeout);
 	int (*nand_ready)(struct nand_device_s *nand, int timeout);
-} nand_flash_controller_t;
+};
 
 #define NAND_DEVICE_COMMAND_HANDLER(name) static __NAND_DEVICE_COMMAND(name)
 
@@ -66,19 +66,19 @@ struct nand_oobfree {
 	int length;
 };
 
-typedef struct nand_ecclayout_s {
+struct nand_ecclayout {
 	int eccbytes;
 	int eccpos[64];
 	int oobavail;
 	struct nand_oobfree oobfree[2];
-} nand_ecclayout_t;
+};
 
 typedef struct nand_device_s
 {
-	nand_flash_controller_t *controller;
+	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;
@@ -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
  */