From abe2d7cbc77498f3692390a19571dd8d77ecc528 Mon Sep 17 00:00:00 2001 From: uch Date: Fri, 13 Aug 2004 15:49:13 +0000 Subject: [PATCH] regen. --- sys/arch/hpc/hpc/platid_mask.c | 32 +++++++++++--- sys/arch/hpc/hpc/platid_name.c | 20 ++++++--- sys/arch/hpc/include/platid_generated.h | 56 +++++++++++++++++++------ sys/arch/hpc/include/platid_mask.h | 30 ++++++++++--- 4 files changed, 110 insertions(+), 28 deletions(-) diff --git a/sys/arch/hpc/hpc/platid_mask.c b/sys/arch/hpc/hpc/platid_mask.c index 9f1a226865ca..6d234d81f24e 100644 --- a/sys/arch/hpc/hpc/platid_mask.c +++ b/sys/arch/hpc/hpc/platid_mask.c @@ -1,4 +1,4 @@ -/* $NetBSD: platid_mask.c,v 1.15 2004/06/28 14:43:42 uch Exp $ */ +/* $NetBSD: platid_mask.c,v 1.16 2004/08/13 15:49:13 uch Exp $ */ /*- * Copyright (c) 1999-2001 @@ -125,6 +125,10 @@ platid_t platid_mask_CPU_SH_3_7709A = {{ PLATID_CPU_SH_3_7709A, PLATID_WILD }}; +platid_t platid_mask_CPU_SH_3_7707 = {{ + PLATID_CPU_SH_3_7707, + PLATID_WILD +}}; platid_t platid_mask_CPU_SH_4 = {{ PLATID_CPU_SH_4, PLATID_WILD @@ -405,16 +409,28 @@ platid_t platid_mask_MACH_SHARP_TELIOS = {{ PLATID_WILD, PLATID_MACH_SHARP_TELIOS }}; -platid_t platid_mask_MACH_SHARP_TELIOS_HC = {{ +platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ = {{ PLATID_WILD, - PLATID_MACH_SHARP_TELIOS_HC + PLATID_MACH_SHARP_TELIOS_HCAJ }}; -platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ1 = {{ +platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ1_JP = {{ PLATID_CPU_MIPS_TX_3922, - PLATID_MACH_SHARP_TELIOS_HCAJ1 + PLATID_MACH_SHARP_TELIOS_HCAJ1_JP +}}; +platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ2_JP = {{ + PLATID_CPU_MIPS_TX_3922, + PLATID_MACH_SHARP_TELIOS_HCAJ2_JP +}}; +platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ3_JP = {{ + PLATID_CPU_MIPS_TX_3922, + PLATID_MACH_SHARP_TELIOS_HCAJ3_JP +}}; +platid_t platid_mask_MACH_SHARP_TELIOS_HCVJ = {{ + PLATID_WILD, + PLATID_MACH_SHARP_TELIOS_HCVJ }}; platid_t platid_mask_MACH_SHARP_TELIOS_HCVJ1C_JP = {{ - PLATID_CPU_MIPS_TX_3922, + PLATID_WILD, PLATID_MACH_SHARP_TELIOS_HCVJ1C_JP }}; platid_t platid_mask_MACH_SHARP_MOBILON = {{ @@ -685,6 +701,10 @@ platid_t platid_mask_MACH_HP_LX_620JP = {{ PLATID_CPU_SH_3_7709, PLATID_MACH_HP_LX_620JP }}; +platid_t platid_mask_MACH_HP_LX_360 = {{ + PLATID_CPU_SH_3_7707, + PLATID_MACH_HP_LX_360 +}}; #endif /* hpcsh */ platid_t platid_mask_MACH_HP_JORNADA = {{ PLATID_WILD, diff --git a/sys/arch/hpc/hpc/platid_name.c b/sys/arch/hpc/hpc/platid_name.c index f040275128a5..ee17034c5abd 100644 --- a/sys/arch/hpc/hpc/platid_name.c +++ b/sys/arch/hpc/hpc/platid_name.c @@ -1,4 +1,4 @@ -/* $NetBSD: platid_name.c,v 1.15 2004/06/28 14:43:42 uch Exp $ */ +/* $NetBSD: platid_name.c,v 1.16 2004/08/13 15:49:13 uch Exp $ */ /*- * Copyright (c) 1999-2001 @@ -84,6 +84,8 @@ struct platid_name platid_name_table[] = { TEXT("SH 3 7709") }, { &platid_mask_CPU_SH_3_7709A, TEXT("SH 3 7709A") }, + { &platid_mask_CPU_SH_3_7707, + TEXT("SH 3 7707") }, { &platid_mask_CPU_SH_4, TEXT("SH 4") }, { &platid_mask_CPU_SH_4_7750, @@ -230,10 +232,16 @@ struct platid_name platid_name_table[] = { TEXT("Sharp Tripad PV6000") }, { &platid_mask_MACH_SHARP_TELIOS, TEXT("Sharp Telios") }, - { &platid_mask_MACH_SHARP_TELIOS_HC, - TEXT("Sharp Telios HC") }, - { &platid_mask_MACH_SHARP_TELIOS_HCAJ1, - TEXT("Sharp HC-AJ1/AJ2") }, + { &platid_mask_MACH_SHARP_TELIOS_HCAJ, + TEXT("Sharp Telios HCAJ") }, + { &platid_mask_MACH_SHARP_TELIOS_HCAJ1_JP, + TEXT("Sharp HC-AJ1 (Japanese)") }, + { &platid_mask_MACH_SHARP_TELIOS_HCAJ2_JP, + TEXT("Sharp HC-AJ2 (Japanese)") }, + { &platid_mask_MACH_SHARP_TELIOS_HCAJ3_JP, + TEXT("Sharp HC-AJ3 (Japanese)") }, + { &platid_mask_MACH_SHARP_TELIOS_HCVJ, + TEXT("Sharp Telios HCVJ") }, { &platid_mask_MACH_SHARP_TELIOS_HCVJ1C_JP, TEXT("Sharp HC-VJ1C (Japanese)") }, { &platid_mask_MACH_SHARP_MOBILON, @@ -378,6 +386,8 @@ struct platid_name platid_name_table[] = { TEXT("HP 620LX") }, { &platid_mask_MACH_HP_LX_620JP, TEXT("HP 620LX (Japanese)") }, + { &platid_mask_MACH_HP_LX_360, + TEXT("HP 360LX (Ericsson MC-16)") }, #endif /* hpcsh */ { &platid_mask_MACH_HP_JORNADA, TEXT("HP Jornada") }, diff --git a/sys/arch/hpc/include/platid_generated.h b/sys/arch/hpc/include/platid_generated.h index ea5e48277c16..9e84fc11102c 100644 --- a/sys/arch/hpc/include/platid_generated.h +++ b/sys/arch/hpc/include/platid_generated.h @@ -1,4 +1,4 @@ -/* $NetBSD: platid_generated.h,v 1.15 2004/06/28 14:43:42 uch Exp $ */ +/* $NetBSD: platid_generated.h,v 1.16 2004/08/13 15:49:13 uch Exp $ */ /*- * Copyright (c) 1999-2001 @@ -121,6 +121,10 @@ #define PLATID_CPU_SH_3_7709A \ ((PLATID_CPU_SH_3_7709A_NUM << PLATID_CPU_MODEL_SHIFT)| \ PLATID_CPU_SH_3) +#define PLATID_CPU_SH_3_7707_NUM 3 +#define PLATID_CPU_SH_3_7707 \ + ((PLATID_CPU_SH_3_7707_NUM << PLATID_CPU_MODEL_SHIFT)| \ + PLATID_CPU_SH_3) #define PLATID_CPU_SH_4_NUM 2 #define PLATID_CPU_SH_4 \ ((PLATID_CPU_SH_4_NUM << PLATID_CPU_SERIES_SHIFT)| \ @@ -580,26 +584,47 @@ ((PLATID_MACH_SHARP_TELIOS_NUM << PLATID_SERIES_SHIFT)| \ PLATID_MACH_SHARP) #ifndef SPEC_PLATFORM -#define SPEC_MACH_SHARP_TELIOS_HC +#define SPEC_MACH_SHARP_TELIOS_HCAJ #endif /* !SPEC_PLATFORM */ -#define PLATID_MACH_SHARP_TELIOS_HC_NUM 1 -#define PLATID_MACH_SHARP_TELIOS_HC \ - ((PLATID_MACH_SHARP_TELIOS_HC_NUM << PLATID_MODEL_SHIFT)| \ +#define PLATID_MACH_SHARP_TELIOS_HCAJ_NUM 1 +#define PLATID_MACH_SHARP_TELIOS_HCAJ \ + ((PLATID_MACH_SHARP_TELIOS_HCAJ_NUM << PLATID_MODEL_SHIFT)| \ PLATID_MACH_SHARP_TELIOS) #ifndef SPEC_PLATFORM -#define SPEC_MACH_SHARP_TELIOS_HCAJ1 +#define SPEC_MACH_SHARP_TELIOS_HCAJ1_JP #endif /* !SPEC_PLATFORM */ -#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_SHARP_TELIOS_HCAJ1_JP_NUM 1 +#define PLATID_MACH_SHARP_TELIOS_HCAJ1_JP \ + ((PLATID_MACH_SHARP_TELIOS_HCAJ1_JP_NUM << PLATID_SUBMODEL_SHIFT)| \ + PLATID_MACH_SHARP_TELIOS_HCAJ) +#ifndef SPEC_PLATFORM +#define SPEC_MACH_SHARP_TELIOS_HCAJ2_JP +#endif /* !SPEC_PLATFORM */ +#define PLATID_MACH_SHARP_TELIOS_HCAJ2_JP_NUM 2 +#define PLATID_MACH_SHARP_TELIOS_HCAJ2_JP \ + ((PLATID_MACH_SHARP_TELIOS_HCAJ2_JP_NUM << PLATID_SUBMODEL_SHIFT)| \ + PLATID_MACH_SHARP_TELIOS_HCAJ) +#ifndef SPEC_PLATFORM +#define SPEC_MACH_SHARP_TELIOS_HCAJ3_JP +#endif /* !SPEC_PLATFORM */ +#define PLATID_MACH_SHARP_TELIOS_HCAJ3_JP_NUM 3 +#define PLATID_MACH_SHARP_TELIOS_HCAJ3_JP \ + ((PLATID_MACH_SHARP_TELIOS_HCAJ3_JP_NUM << PLATID_SUBMODEL_SHIFT)| \ + PLATID_MACH_SHARP_TELIOS_HCAJ) +#ifndef SPEC_PLATFORM +#define SPEC_MACH_SHARP_TELIOS_HCVJ +#endif /* !SPEC_PLATFORM */ +#define PLATID_MACH_SHARP_TELIOS_HCVJ_NUM 2 +#define PLATID_MACH_SHARP_TELIOS_HCVJ \ + ((PLATID_MACH_SHARP_TELIOS_HCVJ_NUM << PLATID_MODEL_SHIFT)| \ + PLATID_MACH_SHARP_TELIOS) #ifndef SPEC_PLATFORM #define SPEC_MACH_SHARP_TELIOS_HCVJ1C_JP #endif /* !SPEC_PLATFORM */ -#define PLATID_MACH_SHARP_TELIOS_HCVJ1C_JP_NUM 2 +#define PLATID_MACH_SHARP_TELIOS_HCVJ1C_JP_NUM 1 #define PLATID_MACH_SHARP_TELIOS_HCVJ1C_JP \ ((PLATID_MACH_SHARP_TELIOS_HCVJ1C_JP_NUM << PLATID_SUBMODEL_SHIFT)| \ - PLATID_MACH_SHARP_TELIOS_HC) + PLATID_MACH_SHARP_TELIOS_HCVJ) #ifndef SPEC_PLATFORM #define SPEC_MACH_SHARP_MOBILON #endif /* !SPEC_PLATFORM */ @@ -1050,6 +1075,13 @@ #define PLATID_MACH_HP_LX_620JP \ ((PLATID_MACH_HP_LX_620JP_NUM << PLATID_MODEL_SHIFT)| \ PLATID_MACH_HP_LX) +#ifndef SPEC_PLATFORM +#define SPEC_MACH_HP_LX_360 +#endif /* !SPEC_PLATFORM */ +#define PLATID_MACH_HP_LX_360_NUM 3 +#define PLATID_MACH_HP_LX_360 \ + ((PLATID_MACH_HP_LX_360_NUM << PLATID_MODEL_SHIFT)| \ + PLATID_MACH_HP_LX) #endif /* hpcsh */ #ifndef SPEC_PLATFORM #define SPEC_MACH_HP_JORNADA diff --git a/sys/arch/hpc/include/platid_mask.h b/sys/arch/hpc/include/platid_mask.h index 053c3034d43f..bd01679dafb9 100644 --- a/sys/arch/hpc/include/platid_mask.h +++ b/sys/arch/hpc/include/platid_mask.h @@ -1,4 +1,4 @@ -/* $NetBSD: platid_mask.h,v 1.15 2004/06/28 14:43:42 uch Exp $ */ +/* $NetBSD: platid_mask.h,v 1.16 2004/08/13 15:49:13 uch Exp $ */ /*- * Copyright (c) 1999-2001 @@ -123,6 +123,10 @@ extern platid_t platid_mask_CPU_SH_3_7709A; #ifdef PLATID_DEFINE_MASK_NICKNAME # define GENERIC_SH_3_7709A ((int)&platid_mask_CPU_SH_3_7709A) #endif +extern platid_t platid_mask_CPU_SH_3_7707; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define GENERIC_SH_3_7707 ((int)&platid_mask_CPU_SH_3_7707) +#endif extern platid_t platid_mask_CPU_SH_4; #ifdef PLATID_DEFINE_MASK_NICKNAME # define GENERIC_SH_4 ((int)&platid_mask_CPU_SH_4) @@ -403,13 +407,25 @@ 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; +extern platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ; #ifdef PLATID_DEFINE_MASK_NICKNAME -# define SHARP_TELIOS_HC ((int)&platid_mask_MACH_SHARP_TELIOS_HC) +# define SHARP_TELIOS_HCAJ ((int)&platid_mask_MACH_SHARP_TELIOS_HCAJ) #endif -extern platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ1; +extern platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ1_JP; #ifdef PLATID_DEFINE_MASK_NICKNAME -# define SHARP_TELIOS_HCAJ1 ((int)&platid_mask_MACH_SHARP_TELIOS_HCAJ1) +# define SHARP_TELIOS_HCAJ1_JP ((int)&platid_mask_MACH_SHARP_TELIOS_HCAJ1_JP) +#endif +extern platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ2_JP; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define SHARP_TELIOS_HCAJ2_JP ((int)&platid_mask_MACH_SHARP_TELIOS_HCAJ2_JP) +#endif +extern platid_t platid_mask_MACH_SHARP_TELIOS_HCAJ3_JP; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define SHARP_TELIOS_HCAJ3_JP ((int)&platid_mask_MACH_SHARP_TELIOS_HCAJ3_JP) +#endif +extern platid_t platid_mask_MACH_SHARP_TELIOS_HCVJ; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define SHARP_TELIOS_HCVJ ((int)&platid_mask_MACH_SHARP_TELIOS_HCVJ) #endif extern platid_t platid_mask_MACH_SHARP_TELIOS_HCVJ1C_JP; #ifdef PLATID_DEFINE_MASK_NICKNAME @@ -683,6 +699,10 @@ extern platid_t platid_mask_MACH_HP_LX_620JP; #ifdef PLATID_DEFINE_MASK_NICKNAME # define HP_LX_620JP ((int)&platid_mask_MACH_HP_LX_620JP) #endif +extern platid_t platid_mask_MACH_HP_LX_360; +#ifdef PLATID_DEFINE_MASK_NICKNAME +# define HP_LX_360 ((int)&platid_mask_MACH_HP_LX_360) +#endif #endif /* hpcsh */ extern platid_t platid_mask_MACH_HP_JORNADA; #ifdef PLATID_DEFINE_MASK_NICKNAME