Module Name: src
Committed By: nonaka
Date: Wed May 18 12:11:46 UTC 2011
Modified Files:
src/sys/arch/hpc/conf: platid.def
src/sys/arch/hpc/hpc: platid_mask.c platid_name.c
src/sys/arch/hpc/include: platid_generated.h platid_mask.h
src/sys/arch/hpc/stand/hpcboot: machine_config.cpp
Log Message:
Added Psion Teklogix NETBOOK PRO entry.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/hpc/conf/platid.def
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hpc/hpc/platid_mask.c \
src/sys/arch/hpc/hpc/platid_name.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/hpc/include/platid_generated.h \
src/sys/arch/hpc/include/platid_mask.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/hpc/stand/hpcboot/machine_config.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hpc/conf/platid.def
diff -u src/sys/arch/hpc/conf/platid.def:1.25 src/sys/arch/hpc/conf/platid.def:1.26
--- src/sys/arch/hpc/conf/platid.def:1.25 Tue Apr 6 16:15:34 2010
+++ src/sys/arch/hpc/conf/platid.def Wed May 18 12:11:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: platid.def,v 1.25 2010/04/06 16:15:34 nonaka Exp $ */
+/* $NetBSD: platid.def,v 1.26 2011/05/18 12:11:46 nonaka Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -410,3 +410,12 @@
}
}
#endif /* hpcmips */
+
+#ifdef hpcarm
+PSIONTEKLOGIX {
+ NETBOOK {
+ CPU=ARM_XSCALE_PXA250
+ PRO -" NETBOOK PRO"
+ }
+}
+#endif /* hpcarm */
Index: src/sys/arch/hpc/hpc/platid_mask.c
diff -u src/sys/arch/hpc/hpc/platid_mask.c:1.24 src/sys/arch/hpc/hpc/platid_mask.c:1.25
--- src/sys/arch/hpc/hpc/platid_mask.c:1.24 Tue Apr 6 16:18:24 2010
+++ src/sys/arch/hpc/hpc/platid_mask.c Wed May 18 12:11:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: platid_mask.c,v 1.24 2010/04/06 16:18:24 nonaka Exp $ */
+/* $NetBSD: platid_mask.c,v 1.25 2011/05/18 12:11:46 nonaka Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -948,3 +948,17 @@
PLATID_MACH_AGENDA_VR_VR3
}};
#endif /* hpcmips */
+#ifdef hpcarm
+platid_t platid_mask_MACH_PSIONTEKLOGIX = {{
+ PLATID_WILD,
+ PLATID_MACH_PSIONTEKLOGIX
+}};
+platid_t platid_mask_MACH_PSIONTEKLOGIX_NETBOOK = {{
+ PLATID_WILD,
+ PLATID_MACH_PSIONTEKLOGIX_NETBOOK
+}};
+platid_t platid_mask_MACH_PSIONTEKLOGIX_NETBOOK_PRO = {{
+ PLATID_CPU_ARM_XSCALE_PXA250,
+ PLATID_MACH_PSIONTEKLOGIX_NETBOOK_PRO
+}};
+#endif /* hpcarm */
Index: src/sys/arch/hpc/hpc/platid_name.c
diff -u src/sys/arch/hpc/hpc/platid_name.c:1.24 src/sys/arch/hpc/hpc/platid_name.c:1.25
--- src/sys/arch/hpc/hpc/platid_name.c:1.24 Tue Apr 6 16:18:24 2010
+++ src/sys/arch/hpc/hpc/platid_name.c Wed May 18 12:11:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: platid_name.c,v 1.24 2010/04/06 16:18:24 nonaka Exp $ */
+/* $NetBSD: platid_name.c,v 1.25 2011/05/18 12:11:46 nonaka Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -519,5 +519,13 @@
{ &platid_mask_MACH_AGENDA_VR_VR3,
TEXT("AGENDA VR3+") },
#endif /* hpcmips */
+#ifdef hpcarm
+ { &platid_mask_MACH_PSIONTEKLOGIX,
+ TEXT("PSIONTEKLOGIX") },
+ { &platid_mask_MACH_PSIONTEKLOGIX_NETBOOK,
+ TEXT("PSIONTEKLOGIX NETBOOK") },
+ { &platid_mask_MACH_PSIONTEKLOGIX_NETBOOK_PRO,
+ TEXT("PSIONTEKLOGIX NETBOOK PRO") },
+#endif /* hpcarm */
};
int platid_name_table_size = sizeof(platid_name_table)/sizeof(*platid_name_table);
Index: src/sys/arch/hpc/include/platid_generated.h
diff -u src/sys/arch/hpc/include/platid_generated.h:1.24 src/sys/arch/hpc/include/platid_generated.h:1.25
--- src/sys/arch/hpc/include/platid_generated.h:1.24 Tue Apr 6 16:23:17 2010
+++ src/sys/arch/hpc/include/platid_generated.h Wed May 18 12:11:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: platid_generated.h,v 1.24 2010/04/06 16:23:17 nonaka Exp $ */
+/* $NetBSD: platid_generated.h,v 1.25 2011/05/18 12:11:46 nonaka Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -1480,3 +1480,25 @@
((PLATID_MACH_AGENDA_VR_VR3_NUM << PLATID_MODEL_SHIFT)| \
PLATID_MACH_AGENDA_VR)
#endif /* hpcmips */
+#ifdef hpcarm
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_PSIONTEKLOGIX
+#endif /* !SPEC_PLATFORM */
+#define PLATID_MACH_PSIONTEKLOGIX_NUM 16
+#define PLATID_MACH_PSIONTEKLOGIX \
+ ((PLATID_MACH_PSIONTEKLOGIX_NUM << PLATID_VENDOR_SHIFT))
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_PSIONTEKLOGIX_NETBOOK
+#endif /* !SPEC_PLATFORM */
+#define PLATID_MACH_PSIONTEKLOGIX_NETBOOK_NUM 1
+#define PLATID_MACH_PSIONTEKLOGIX_NETBOOK \
+ ((PLATID_MACH_PSIONTEKLOGIX_NETBOOK_NUM << PLATID_SERIES_SHIFT)| \
+ PLATID_MACH_PSIONTEKLOGIX)
+#ifndef SPEC_PLATFORM
+#define SPEC_MACH_PSIONTEKLOGIX_NETBOOK_PRO
+#endif /* !SPEC_PLATFORM */
+#define PLATID_MACH_PSIONTEKLOGIX_NETBOOK_PRO_NUM 1
+#define PLATID_MACH_PSIONTEKLOGIX_NETBOOK_PRO \
+ ((PLATID_MACH_PSIONTEKLOGIX_NETBOOK_PRO_NUM << PLATID_MODEL_SHIFT)| \
+ PLATID_MACH_PSIONTEKLOGIX_NETBOOK)
+#endif /* hpcarm */
Index: src/sys/arch/hpc/include/platid_mask.h
diff -u src/sys/arch/hpc/include/platid_mask.h:1.24 src/sys/arch/hpc/include/platid_mask.h:1.25
--- src/sys/arch/hpc/include/platid_mask.h:1.24 Tue Apr 6 16:23:17 2010
+++ src/sys/arch/hpc/include/platid_mask.h Wed May 18 12:11:46 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: platid_mask.h,v 1.24 2010/04/06 16:23:17 nonaka Exp $ */
+/* $NetBSD: platid_mask.h,v 1.25 2011/05/18 12:11:46 nonaka Exp $ */
/*-
* Copyright (c) 1999-2001
@@ -946,3 +946,17 @@
# define AGENDA_VR_VR3 ((int)&platid_mask_MACH_AGENDA_VR_VR3)
#endif
#endif /* hpcmips */
+#ifdef hpcarm
+extern platid_t platid_mask_MACH_PSIONTEKLOGIX;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+# define PSIONTEKLOGIX ((int)&platid_mask_MACH_PSIONTEKLOGIX)
+#endif
+extern platid_t platid_mask_MACH_PSIONTEKLOGIX_NETBOOK;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+# define PSIONTEKLOGIX_NETBOOK ((int)&platid_mask_MACH_PSIONTEKLOGIX_NETBOOK)
+#endif
+extern platid_t platid_mask_MACH_PSIONTEKLOGIX_NETBOOK_PRO;
+#ifdef PLATID_DEFINE_MASK_NICKNAME
+# define PSIONTEKLOGIX_NETBOOK_PRO ((int)&platid_mask_MACH_PSIONTEKLOGIX_NETBOOK_PRO)
+#endif
+#endif /* hpcarm */
Index: src/sys/arch/hpc/stand/hpcboot/machine_config.cpp
diff -u src/sys/arch/hpc/stand/hpcboot/machine_config.cpp:1.14 src/sys/arch/hpc/stand/hpcboot/machine_config.cpp:1.15
--- src/sys/arch/hpc/stand/hpcboot/machine_config.cpp:1.14 Mon Apr 28 20:23:20 2008
+++ src/sys/arch/hpc/stand/hpcboot/machine_config.cpp Wed May 18 12:11:46 2011
@@ -1,4 +1,4 @@
-/* -*-C++-*- $NetBSD: machine_config.cpp,v 1.14 2008/04/28 20:23:20 martin Exp $ */
+/* -*-C++-*- $NetBSD: machine_config.cpp,v 1.15 2011/05/18 12:11:46 nonaka Exp $ */
/*-
* Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
@@ -120,6 +120,7 @@
{ PLATID_CPU_ARM_STRONGARM_SA1110 , PLATID_MACH_COMPAQ_IPAQ_H3600 , 16, 320, 240, 640, 0x00000000 },
// PXA250
{ PLATID_CPU_ARM_XSCALE_PXA250 , PLATID_MACH_COMPAQ_IPAQ_H3900 , 16, 320, 240, 640, 0x00000000 },
+ { PLATID_CPU_ARM_XSCALE_PXA250 , PLATID_MACH_PSIONTEKLOGIX_NETBOOK_PRO, 16, 800, 600, 1600, 0x14200000 },
#endif // ARM
{ 0, 0, 0, 0, 0, 0, 0 } // TERMINATOR
};
