From e9fd18895babdb0bfed9cd63271c71e2f881fee1 Mon Sep 17 00:00:00 2001
From: uwe <uwe@NetBSD.org>
Date: Tue, 11 Jan 2005 01:05:32 +0000
Subject: [PATCH] Regen for Compaq Aero 8000 and Jornada 680/690 with Spanish
 keyboard.

---
 sys/arch/hpc/hpc/platid_mask.c          | 20 +++++++++++++++-
 sys/arch/hpc/hpc/platid_name.c          | 12 +++++++++-
 sys/arch/hpc/include/platid_generated.h | 32 ++++++++++++++++++++++++-
 sys/arch/hpc/include/platid_mask.h      | 20 +++++++++++++++-
 4 files changed, 80 insertions(+), 4 deletions(-)

diff --git a/sys/arch/hpc/hpc/platid_mask.c b/sys/arch/hpc/hpc/platid_mask.c
index 6d234d81f24e..93df210fc609 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.16 2004/08/13 15:49:13 uch Exp $	*/
+/*	$NetBSD: platid_mask.c,v 1.17 2005/01/11 01:05:32 uwe Exp $	*/
 
 /*-
  * Copyright (c) 1999-2001
@@ -618,6 +618,16 @@ platid_t platid_mask_MACH_COMPAQ_IPAQ_H3660 = {{
 	PLATID_MACH_COMPAQ_IPAQ_H3660
 }};
 #endif /* hpcarm */
+#ifdef hpcsh
+platid_t platid_mask_MACH_COMPAQ_AERO = {{
+	PLATID_WILD,
+	PLATID_MACH_COMPAQ_AERO
+}};
+platid_t platid_mask_MACH_COMPAQ_AERO_8000 = {{
+	PLATID_WILD,
+	PLATID_MACH_COMPAQ_AERO_8000
+}};
+#endif /* hpcsh */
 #ifdef hpcmips
 platid_t platid_mask_MACH_VICTOR = {{
 	PLATID_WILD,
@@ -763,6 +773,14 @@ platid_t platid_mask_MACH_HP_JORNADA_690SV = {{
 	PLATID_CPU_SH_3_7709A,
 	PLATID_MACH_HP_JORNADA_690SV
 }};
+platid_t platid_mask_MACH_HP_JORNADA_680ES = {{
+	PLATID_CPU_SH_3_7709A,
+	PLATID_MACH_HP_JORNADA_680ES
+}};
+platid_t platid_mask_MACH_HP_JORNADA_690ES = {{
+	PLATID_CPU_SH_3_7709A,
+	PLATID_MACH_HP_JORNADA_690ES
+}};
 #endif /* hpcsh */
 #ifdef hpcarm
 platid_t platid_mask_MACH_HP_JORNADA_7XX = {{
diff --git a/sys/arch/hpc/hpc/platid_name.c b/sys/arch/hpc/hpc/platid_name.c
index ee17034c5abd..aa4bad80518f 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.16 2004/08/13 15:49:13 uch Exp $	*/
+/*	$NetBSD: platid_name.c,v 1.17 2005/01/11 01:05:32 uwe Exp $	*/
 
 /*-
  * Copyright (c) 1999-2001
@@ -341,6 +341,12 @@ struct platid_name platid_name_table[] = {
 	{ &platid_mask_MACH_COMPAQ_IPAQ_H3660,
 	 TEXT("Compaq iPAQ H3660") },
 #endif /* hpcarm */
+#ifdef hpcsh
+	{ &platid_mask_MACH_COMPAQ_AERO,
+	 TEXT("Compaq Aero") },
+	{ &platid_mask_MACH_COMPAQ_AERO_8000,
+	 TEXT("Compaq Aero 8000") },
+#endif /* hpcsh */
 #ifdef hpcmips
 	{ &platid_mask_MACH_VICTOR,
 	 TEXT("Victor") },
@@ -418,6 +424,10 @@ struct platid_name platid_name_table[] = {
 	 TEXT("HP Jornada 680 (Scandinavian)") },
 	{ &platid_mask_MACH_HP_JORNADA_690SV,
 	 TEXT("HP Jornada 690 (Scandinavian)") },
+	{ &platid_mask_MACH_HP_JORNADA_680ES,
+	 TEXT("HP Jornada 680 (Spanish)") },
+	{ &platid_mask_MACH_HP_JORNADA_690ES,
+	 TEXT("HP Jornada 690 (Spanish)") },
 #endif /* hpcsh */
 #ifdef hpcarm
 	{ &platid_mask_MACH_HP_JORNADA_7XX,
diff --git a/sys/arch/hpc/include/platid_generated.h b/sys/arch/hpc/include/platid_generated.h
index 9e84fc11102c..75abcecf5c51 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.16 2004/08/13 15:49:13 uch Exp $	*/
+/*	$NetBSD: platid_generated.h,v 1.17 2005/01/11 01:05:32 uwe Exp $	*/
 
 /*-
  * Copyright (c) 1999-2001
@@ -939,6 +939,22 @@
   ((PLATID_MACH_COMPAQ_IPAQ_H3660_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_COMPAQ_IPAQ_H36XX)
 #endif /* hpcarm */
+#ifdef hpcsh
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_COMPAQ_AERO
+#endif /* !SPEC_PLATFORM */
+#define PLATID_MACH_COMPAQ_AERO_NUM	5
+#define PLATID_MACH_COMPAQ_AERO	\
+  ((PLATID_MACH_COMPAQ_AERO_NUM << PLATID_SERIES_SHIFT)| \
+    PLATID_MACH_COMPAQ)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_COMPAQ_AERO_8000
+#endif /* !SPEC_PLATFORM */
+#define PLATID_MACH_COMPAQ_AERO_8000_NUM	1
+#define PLATID_MACH_COMPAQ_AERO_8000	\
+  ((PLATID_MACH_COMPAQ_AERO_8000_NUM << PLATID_MODEL_SHIFT)| \
+    PLATID_MACH_COMPAQ_AERO)
+#endif /* hpcsh */
 #ifdef hpcmips
 #ifndef SPEC_PLATFORM
 #define SPEC_MACH_VICTOR
@@ -1182,6 +1198,20 @@
 #define PLATID_MACH_HP_JORNADA_690SV	\
   ((PLATID_MACH_HP_JORNADA_690SV_NUM << PLATID_SUBMODEL_SHIFT)| \
     PLATID_MACH_HP_JORNADA_6XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_HP_JORNADA_680ES
+#endif /* !SPEC_PLATFORM */
+#define PLATID_MACH_HP_JORNADA_680ES_NUM	13
+#define PLATID_MACH_HP_JORNADA_680ES	\
+  ((PLATID_MACH_HP_JORNADA_680ES_NUM << PLATID_SUBMODEL_SHIFT)| \
+    PLATID_MACH_HP_JORNADA_6XX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_HP_JORNADA_690ES
+#endif /* !SPEC_PLATFORM */
+#define PLATID_MACH_HP_JORNADA_690ES_NUM	14
+#define PLATID_MACH_HP_JORNADA_690ES	\
+  ((PLATID_MACH_HP_JORNADA_690ES_NUM << PLATID_SUBMODEL_SHIFT)| \
+    PLATID_MACH_HP_JORNADA_6XX)
 #endif /* hpcsh */
 #ifdef hpcarm
 #ifndef SPEC_PLATFORM
diff --git a/sys/arch/hpc/include/platid_mask.h b/sys/arch/hpc/include/platid_mask.h
index bd01679dafb9..f03722a8471a 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.16 2004/08/13 15:49:13 uch Exp $	*/
+/*	$NetBSD: platid_mask.h,v 1.17 2005/01/11 01:05:32 uwe Exp $	*/
 
 /*-
  * Copyright (c) 1999-2001
@@ -616,6 +616,16 @@ extern platid_t platid_mask_MACH_COMPAQ_IPAQ_H3660;
 #  define COMPAQ_IPAQ_H3660 ((int)&platid_mask_MACH_COMPAQ_IPAQ_H3660)
 #endif
 #endif /* hpcarm */
+#ifdef hpcsh
+extern platid_t platid_mask_MACH_COMPAQ_AERO;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_AERO ((int)&platid_mask_MACH_COMPAQ_AERO)
+#endif
+extern platid_t platid_mask_MACH_COMPAQ_AERO_8000;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define COMPAQ_AERO_8000 ((int)&platid_mask_MACH_COMPAQ_AERO_8000)
+#endif
+#endif /* hpcsh */
 #ifdef hpcmips
 extern platid_t platid_mask_MACH_VICTOR;
 #ifdef PLATID_DEFINE_MASK_NICKNAME
@@ -761,6 +771,14 @@ extern platid_t platid_mask_MACH_HP_JORNADA_690SV;
 #ifdef PLATID_DEFINE_MASK_NICKNAME
 #  define HP_JORNADA_690SV ((int)&platid_mask_MACH_HP_JORNADA_690SV)
 #endif
+extern platid_t platid_mask_MACH_HP_JORNADA_680ES;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define HP_JORNADA_680ES ((int)&platid_mask_MACH_HP_JORNADA_680ES)
+#endif
+extern platid_t platid_mask_MACH_HP_JORNADA_690ES;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+#  define HP_JORNADA_690ES ((int)&platid_mask_MACH_HP_JORNADA_690ES)
+#endif
 #endif /* hpcsh */
 #ifdef hpcarm
 extern platid_t platid_mask_MACH_HP_JORNADA_7XX;