From 786f12a1cb4886cbdfd29400b6a8de6f59973d18 Mon Sep 17 00:00:00 2001 From: uch Date: Sat, 30 Oct 1999 10:58:33 +0000 Subject: [PATCH] regen. --- sys/arch/hpcmips/hpcmips/platid_mask.c | 42 ++++++++++++---- sys/arch/hpcmips/include/platid_generated.h | 55 +++++++++++++++------ sys/arch/hpcmips/include/platid_mask.h | 42 ++++++++++++---- 3 files changed, 105 insertions(+), 34 deletions(-) diff --git a/sys/arch/hpcmips/hpcmips/platid_mask.c b/sys/arch/hpcmips/hpcmips/platid_mask.c index 3c335abf5cff..51414aa1557a 100644 --- a/sys/arch/hpcmips/hpcmips/platid_mask.c +++ b/sys/arch/hpcmips/hpcmips/platid_mask.c @@ -1,4 +1,4 @@ -/* $Id: platid_mask.c,v 1.2 1999/09/25 10:52:50 uch Exp $ */ +/* $Id: platid_mask.c,v 1.3 1999/10/30 10:58:36 uch Exp $ */ /*- * Copyright (c) 1999 @@ -66,12 +66,8 @@ platid_t platid_mask_CPU_MIPS_TX = {{ PLATID_CPU_MIPS_TX, PLATID_WILD }}; -platid_t platid_mask_CPU_MIPS_TX_391X = {{ - PLATID_CPU_MIPS_TX_391X, - PLATID_WILD -}}; -platid_t platid_mask_CPU_MIPS_TX_3910 = {{ - PLATID_CPU_MIPS_TX_3910, +platid_t platid_mask_CPU_MIPS_TX_3900 = {{ + PLATID_CPU_MIPS_TX_3900, PLATID_WILD }}; platid_t platid_mask_CPU_MIPS_TX_3911 = {{ @@ -82,8 +78,8 @@ platid_t platid_mask_CPU_MIPS_TX_3912 = {{ PLATID_CPU_MIPS_TX_3912, PLATID_WILD }}; -platid_t platid_mask_CPU_MIPS_TX_392X = {{ - PLATID_CPU_MIPS_TX_392X, +platid_t platid_mask_CPU_MIPS_TX_3920 = {{ + PLATID_CPU_MIPS_TX_3920, PLATID_WILD }}; platid_t platid_mask_CPU_MIPS_TX_3922 = {{ @@ -242,6 +238,18 @@ platid_t platid_mask_MACH_SHARP_TRIPAD_PV6000 = {{ PLATID_CPU_MIPS_VR_4111, PLATID_MACH_SHARP_TRIPAD_PV6000 }}; +platid_t platid_mask_MACH_SHARP_TELIOS = {{ + PLATID_WILD, + PLATID_MACH_SHARP_TELIOS +}}; +platid_t platid_mask_MACH_SHARP_TELIOS_HC = {{ + PLATID_WILD, + PLATID_MACH_SHARP_TELIOS_HC +}}; +platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ1 = {{ + PLATID_CPU_MIPS_TX_3922, + PLATID_MACH_SHARP_TELIOS_HCAJ1 +}}; platid_t platid_mask_MACH_FUJITSU = {{ PLATID_WILD, PLATID_MACH_FUJITSU @@ -322,3 +330,19 @@ platid_t platid_mask_MACH_COMPAQ_AERO_2140 = {{ PLATID_CPU_MIPS_VR_4111, PLATID_MACH_COMPAQ_AERO_2140 }}; +platid_t platid_mask_MACH_VICTOR = {{ + PLATID_WILD, + PLATID_MACH_VICTOR +}}; +platid_t platid_mask_MACH_VICTOR_INTERLINK = {{ + PLATID_WILD, + PLATID_MACH_VICTOR_INTERLINK +}}; +platid_t platid_mask_MACH_VICTOR_INTERLINK_MP = {{ + PLATID_WILD, + PLATID_MACH_VICTOR_INTERLINK_MP +}}; +platid_t platid_mask_MACH_VICTOR_INTERLINK_MPC101 = {{ + PLATID_CPU_MIPS_TX_3922, + PLATID_MACH_VICTOR_INTERLINK_MPC101 +}}; diff --git a/sys/arch/hpcmips/include/platid_generated.h b/sys/arch/hpcmips/include/platid_generated.h index 5d403d139c3f..32f1abc322c3 100644 --- a/sys/arch/hpcmips/include/platid_generated.h +++ b/sys/arch/hpcmips/include/platid_generated.h @@ -1,4 +1,4 @@ -/* $Id: platid_generated.h,v 1.2 1999/09/25 10:52:51 uch Exp $ */ +/* $Id: platid_generated.h,v 1.3 1999/10/30 10:58:33 uch Exp $ */ /*- * Copyright (c) 1999 @@ -64,30 +64,26 @@ #define PLATID_CPU_MIPS_TX \ ((PLATID_CPU_MIPS_TX_NUM << PLATID_CPU_SERIES_SHIFT)| \ PLATID_CPU_MIPS) -#define PLATID_CPU_MIPS_TX_391X_NUM 1 -#define PLATID_CPU_MIPS_TX_391X \ - ((PLATID_CPU_MIPS_TX_391X_NUM << PLATID_CPU_MODEL_SHIFT)| \ +#define PLATID_CPU_MIPS_TX_3900_NUM 1 +#define PLATID_CPU_MIPS_TX_3900 \ + ((PLATID_CPU_MIPS_TX_3900_NUM << PLATID_CPU_MODEL_SHIFT)| \ PLATID_CPU_MIPS_TX) -#define PLATID_CPU_MIPS_TX_3910_NUM 1 -#define PLATID_CPU_MIPS_TX_3910 \ - ((PLATID_CPU_MIPS_TX_3910_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \ - PLATID_CPU_MIPS_TX_391X) -#define PLATID_CPU_MIPS_TX_3911_NUM 2 +#define PLATID_CPU_MIPS_TX_3911_NUM 1 #define PLATID_CPU_MIPS_TX_3911 \ ((PLATID_CPU_MIPS_TX_3911_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \ - PLATID_CPU_MIPS_TX_391X) -#define PLATID_CPU_MIPS_TX_3912_NUM 3 + PLATID_CPU_MIPS_TX_3900) +#define PLATID_CPU_MIPS_TX_3912_NUM 2 #define PLATID_CPU_MIPS_TX_3912 \ ((PLATID_CPU_MIPS_TX_3912_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \ - PLATID_CPU_MIPS_TX_391X) -#define PLATID_CPU_MIPS_TX_392X_NUM 2 -#define PLATID_CPU_MIPS_TX_392X \ - ((PLATID_CPU_MIPS_TX_392X_NUM << PLATID_CPU_MODEL_SHIFT)| \ + PLATID_CPU_MIPS_TX_3900) +#define PLATID_CPU_MIPS_TX_3920_NUM 2 +#define PLATID_CPU_MIPS_TX_3920 \ + ((PLATID_CPU_MIPS_TX_3920_NUM << PLATID_CPU_MODEL_SHIFT)| \ PLATID_CPU_MIPS_TX) #define PLATID_CPU_MIPS_TX_3922_NUM 1 #define PLATID_CPU_MIPS_TX_3922 \ ((PLATID_CPU_MIPS_TX_3922_NUM << PLATID_CPU_SUBMODEL_SHIFT)| \ - PLATID_CPU_MIPS_TX_392X) + PLATID_CPU_MIPS_TX_3920) #define PLATID_MACH_NEC_NUM 1 #define PLATID_MACH_NEC \ ((PLATID_MACH_NEC_NUM << PLATID_VENDOR_SHIFT)) @@ -236,6 +232,18 @@ #define PLATID_MACH_SHARP_TRIPAD_PV6000 \ ((PLATID_MACH_SHARP_TRIPAD_PV6000_NUM << PLATID_SUBMODEL_SHIFT)| \ PLATID_MACH_SHARP_TRIPAD_PV) +#define PLATID_MACH_SHARP_TELIOS_NUM 2 +#define PLATID_MACH_SHARP_TELIOS \ + ((PLATID_MACH_SHARP_TELIOS_NUM << PLATID_SERIES_SHIFT)| \ + PLATID_MACH_SHARP) +#define PLATID_MACH_SHARP_TELIOS_HC_NUM 1 +#define PLATID_MACH_SHARP_TELIOS_HC \ + ((PLATID_MACH_SHARP_TELIOS_HC_NUM << PLATID_MODEL_SHIFT)| \ + PLATID_MACH_SHARP_TELIOS) +#define PLATID_MACH_SHARP_TELIOS_HCAJ1_NUM 1 +#define PLATID_MACH_SHARP_TELIOS_HCAJ1 \ + ((PLATID_MACH_SHARP_TELIOS_HCAJ1_NUM << PLATID_SUBMODEL_SHIFT)| \ + PLATID_MACH_SHARP_TELIOS_HC) #define PLATID_MACH_FUJITSU_NUM 5 #define PLATID_MACH_FUJITSU \ ((PLATID_MACH_FUJITSU_NUM << PLATID_VENDOR_SHIFT)) @@ -313,3 +321,18 @@ #define PLATID_MACH_COMPAQ_AERO_2140 \ ((PLATID_MACH_COMPAQ_AERO_2140_NUM << PLATID_SUBMODEL_SHIFT)| \ PLATID_MACH_COMPAQ_AERO_21XX) +#define PLATID_MACH_VICTOR_NUM 8 +#define PLATID_MACH_VICTOR \ + ((PLATID_MACH_VICTOR_NUM << PLATID_VENDOR_SHIFT)) +#define PLATID_MACH_VICTOR_INTERLINK_NUM 1 +#define PLATID_MACH_VICTOR_INTERLINK \ + ((PLATID_MACH_VICTOR_INTERLINK_NUM << PLATID_SERIES_SHIFT)| \ + PLATID_MACH_VICTOR) +#define PLATID_MACH_VICTOR_INTERLINK_MP_NUM 1 +#define PLATID_MACH_VICTOR_INTERLINK_MP \ + ((PLATID_MACH_VICTOR_INTERLINK_MP_NUM << PLATID_MODEL_SHIFT)| \ + PLATID_MACH_VICTOR_INTERLINK) +#define PLATID_MACH_VICTOR_INTERLINK_MPC101_NUM 1 +#define PLATID_MACH_VICTOR_INTERLINK_MPC101 \ + ((PLATID_MACH_VICTOR_INTERLINK_MPC101_NUM << PLATID_SUBMODEL_SHIFT)| \ + PLATID_MACH_VICTOR_INTERLINK_MP) diff --git a/sys/arch/hpcmips/include/platid_mask.h b/sys/arch/hpcmips/include/platid_mask.h index a67a4e445b90..c4eb884dbc75 100644 --- a/sys/arch/hpcmips/include/platid_mask.h +++ b/sys/arch/hpcmips/include/platid_mask.h @@ -1,4 +1,4 @@ -/* $Id: platid_mask.h,v 1.2 1999/09/25 10:52:51 uch Exp $ */ +/* $Id: platid_mask.h,v 1.3 1999/10/30 10:58:33 uch Exp $ */ /*- * Copyright (c) 1999 @@ -65,13 +65,9 @@ extern platid_t platid_mask_CPU_MIPS_TX; #ifdef PLATID_DEFINE_MASK_NICKNAME # define GENERIC_MIPS_TX ((int)&platid_mask_CPU_MIPS_TX) #endif -extern platid_t platid_mask_CPU_MIPS_TX_391X; +extern platid_t platid_mask_CPU_MIPS_TX_3900; #ifdef PLATID_DEFINE_MASK_NICKNAME -# define GENERIC_MIPS_TX_391X ((int)&platid_mask_CPU_MIPS_TX_391X) -#endif -extern platid_t platid_mask_CPU_MIPS_TX_3910; -#ifdef PLATID_DEFINE_MASK_NICKNAME -# define GENERIC_MIPS_TX_3910 ((int)&platid_mask_CPU_MIPS_TX_3910) +# define GENERIC_MIPS_TX_3900 ((int)&platid_mask_CPU_MIPS_TX_3900) #endif extern platid_t platid_mask_CPU_MIPS_TX_3911; #ifdef PLATID_DEFINE_MASK_NICKNAME @@ -81,9 +77,9 @@ extern platid_t platid_mask_CPU_MIPS_TX_3912; #ifdef PLATID_DEFINE_MASK_NICKNAME # define GENERIC_MIPS_TX_3912 ((int)&platid_mask_CPU_MIPS_TX_3912) #endif -extern platid_t platid_mask_CPU_MIPS_TX_392X; +extern platid_t platid_mask_CPU_MIPS_TX_3920; #ifdef PLATID_DEFINE_MASK_NICKNAME -# define GENERIC_MIPS_TX_392X ((int)&platid_mask_CPU_MIPS_TX_392X) +# define GENERIC_MIPS_TX_3920 ((int)&platid_mask_CPU_MIPS_TX_3920) #endif extern platid_t platid_mask_CPU_MIPS_TX_3922; #ifdef PLATID_DEFINE_MASK_NICKNAME @@ -241,6 +237,18 @@ extern platid_t platid_mask_MACH_SHARP_TRIPAD_PV6000; #ifdef PLATID_DEFINE_MASK_NICKNAME # define SHARP_TRIPAD_PV6000 ((int)&platid_mask_MACH_SHARP_TRIPAD_PV6000) #endif +extern platid_t platid_mask_MACH_SHARP_TELIOS; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define SHARP_TELIOS ((int)&platid_mask_MACH_SHARP_TELIOS) +#endif +extern platid_t platid_mask_MACH_SHARP_TELIOS_HC; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define SHARP_TELIOS_HC ((int)&platid_mask_MACH_SHARP_TELIOS_HC) +#endif +extern platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ1; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define SHARP_TELIOS_HCAJ1 ((int)&platid_mask_MACH_SHARP_TELIOS_HCAJ1) +#endif extern platid_t platid_mask_MACH_FUJITSU; #ifdef PLATID_DEFINE_MASK_NICKNAME # define FUJITSU ((int)&platid_mask_MACH_FUJITSU) @@ -321,3 +329,19 @@ extern platid_t platid_mask_MACH_COMPAQ_AERO_2140; #ifdef PLATID_DEFINE_MASK_NICKNAME # define COMPAQ_AERO_2140 ((int)&platid_mask_MACH_COMPAQ_AERO_2140) #endif +extern platid_t platid_mask_MACH_VICTOR; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define VICTOR ((int)&platid_mask_MACH_VICTOR) +#endif +extern platid_t platid_mask_MACH_VICTOR_INTERLINK; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define VICTOR_INTERLINK ((int)&platid_mask_MACH_VICTOR_INTERLINK) +#endif +extern platid_t platid_mask_MACH_VICTOR_INTERLINK_MP; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define VICTOR_INTERLINK_MP ((int)&platid_mask_MACH_VICTOR_INTERLINK_MP) +#endif +extern platid_t platid_mask_MACH_VICTOR_INTERLINK_MPC101; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define VICTOR_INTERLINK_MPC101 ((int)&platid_mask_MACH_VICTOR_INTERLINK_MPC101) +#endif