diff options
Diffstat (limited to 'arch/mips/lasat/lasat_models.h')
| -rw-r--r-- | arch/mips/lasat/lasat_models.h | 76 |
1 files changed, 40 insertions, 36 deletions
diff --git a/arch/mips/lasat/lasat_models.h b/arch/mips/lasat/lasat_models.h index ae0c5d0bd40..e1cbd26ae1b 100644 --- a/arch/mips/lasat/lasat_models.h +++ b/arch/mips/lasat/lasat_models.h @@ -1,24 +1,26 @@ /* * Model description tables */ +#include <linux/kernel.h> -typedef struct product_info_t { +struct product_info { const char *pi_name; const char *pi_type; -} product_info_t; +}; -typedef struct vendor_info_t { +struct vendor_info { const char *vi_name; - const product_info_t *vi_product_info; -} vendor_info_t; + const struct product_info *vi_product_info; +}; /* * Base models */ static const char * const txt_base_models[] = { - "MQ 2", "MQ Pro", "SP 25", "SP 50", "SP 100", "SP 5000", "SP 7000", "SP 1000", "Unknown" + "MQ 2", "MQ Pro", "SP 25", "SP 50", "SP 100", "SP 5000", "SP 7000", + "SP 1000", "Unknown" }; -#define N_BASE_MODELS (sizeof(txt_base_models)/sizeof(char*)-1) +#define N_BASE_MODELS (ARRAY_SIZE(txt_base_models) - 1) /* * Eicon Networks @@ -26,38 +28,40 @@ static const char * const txt_base_models[] = { static const char txt_en_mq[] = "Masquerade"; static const char txt_en_sp[] = "Safepipe"; -static const product_info_t product_info_eicon[] = { - { txt_en_mq, "II" }, /* 0 */ - { txt_en_mq, "Pro" }, /* 1 */ - { txt_en_sp, "25" }, /* 2 */ - { txt_en_sp, "50" }, /* 3 */ - { txt_en_sp, "100" }, /* 4 */ - { txt_en_sp, "5000" }, /* 5 */ - { txt_en_sp, "7000" }, /* 6 */ - { txt_en_sp, "30" }, /* 7 */ - { txt_en_sp, "5100" }, /* 8 */ - { txt_en_sp, "7100" }, /* 9 */ - { txt_en_sp, "1110" }, /* 10 */ - { txt_en_sp, "3020" }, /* 11 */ - { txt_en_sp, "3030" }, /* 12 */ - { txt_en_sp, "5020" }, /* 13 */ - { txt_en_sp, "5030" }, /* 14 */ - { txt_en_sp, "1120" }, /* 15 */ - { txt_en_sp, "1130" }, /* 16 */ - { txt_en_sp, "6010" }, /* 17 */ - { txt_en_sp, "6110" }, /* 18 */ - { txt_en_sp, "6210" }, /* 19 */ - { txt_en_sp, "1020" }, /* 20 */ - { txt_en_sp, "1040" }, /* 21 */ - { txt_en_sp, "1050" }, /* 22 */ - { txt_en_sp, "1060" }, /* 23 */ +static const struct product_info product_info_eicon[] = { + { txt_en_mq, "II" }, /* 0 */ + { txt_en_mq, "Pro" }, /* 1 */ + { txt_en_sp, "25" }, /* 2 */ + { txt_en_sp, "50" }, /* 3 */ + { txt_en_sp, "100" }, /* 4 */ + { txt_en_sp, "5000" }, /* 5 */ + { txt_en_sp, "7000" }, /* 6 */ + { txt_en_sp, "30" }, /* 7 */ + { txt_en_sp, "5100" }, /* 8 */ + { txt_en_sp, "7100" }, /* 9 */ + { txt_en_sp, "1110" }, /* 10 */ + { txt_en_sp, "3020" }, /* 11 */ + { txt_en_sp, "3030" }, /* 12 */ + { txt_en_sp, "5020" }, /* 13 */ + { txt_en_sp, "5030" }, /* 14 */ + { txt_en_sp, "1120" }, /* 15 */ + { txt_en_sp, "1130" }, /* 16 */ + { txt_en_sp, "6010" }, /* 17 */ + { txt_en_sp, "6110" }, /* 18 */ + { txt_en_sp, "6210" }, /* 19 */ + { txt_en_sp, "1020" }, /* 20 */ + { txt_en_sp, "1040" }, /* 21 */ + { txt_en_sp, "1050" }, /* 22 */ + { txt_en_sp, "1060" }, /* 23 */ }; -#define N_PRIDS (sizeof(product_info_eicon)/sizeof(product_info_t)) + +#define N_PRIDS ARRAY_SIZE(product_info_eicon) /* * The vendor table */ -static vendor_info_t const vendor_info_table[] = { - { "Eicon Networks", product_info_eicon }, +static struct vendor_info const vendor_info_table[] = { + { "Eicon Networks", product_info_eicon }, }; -#define N_VENDORS (sizeof(vendor_info_table)/sizeof(vendor_info_t)) + +#define N_VENDORS ARRAY_SIZE(vendor_info_table) |