From e3acbed840e263304f433bca2eda2227546b5657 Mon Sep 17 00:00:00 2001 From: Marcel Telka Date: Wed, 23 Oct 2002 22:01:18 +0000 Subject: [PATCH] Fixed syntax errors. git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@203 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- include/device/flash/cfi.h | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/include/device/flash/cfi.h b/include/device/flash/cfi.h index 3a3591d3..8affbd10 100644 --- a/include/device/flash/cfi.h +++ b/include/device/flash/cfi.h @@ -49,20 +49,6 @@ #include #endif -/* CFI Query Structure - see Table 3.3.1 in [1] */ - -#if LANGUAGE == C -typedef struct cfi_query_system_interface_information cfi_query_system_interface_information; -typedef struct cfi_device_geometry cfi_device_geometry; - -typedef struct cfi_query_structure { - cfi_query_system_interface_information system_interface_info; - cfi_device_geometry device_geometry; - void *pri_vendor_tbl; - void *alt_vendor_tbl; -} cfi_query_structure; -#endif /* LANGUAGE == C */ - /* CFI Query Identification String - see Table 3.3.2 in [1] */ #define CFI_QUERY_ID_OFFSET 0x10 @@ -125,13 +111,13 @@ typedef struct cfi_query_system_interface_information { #if LANGUAGE == C typedef struct cfi_erase_block_region cfi_erase_block_region; -struct cfi_device_geometry { +typedef struct cfi_device_geometry { uint32_t device_size; /* in B */ uint16_t device_interface; /* see Section 2. in [2] */ uint32_t max_bytes_write; /* in B */ uint8_t number_of_erase_regions; cfi_erase_block_region *erase_block_regions; -}; +} cfi_device_geometry; struct cfi_erase_block_region { uint32_t erase_block_size; /* in B */ @@ -147,4 +133,15 @@ struct cfi_erase_block_region { #define CFI_INTERFACE_X32 3 #define CFI_INTERFACE_X16_X32 5 +/* CFI Query Structure - see Table 3.3.1 in [1] */ + +#if LANGUAGE == C +typedef struct cfi_query_structure { + cfi_query_system_interface_information system_interface_info; + cfi_device_geometry device_geometry; + void *pri_vendor_tbl; + void *alt_vendor_tbl; +} cfi_query_structure; +#endif /* LANGUAGE == C */ + #endif /* FLASH_CFI_H */