Subject: port-hpcmips/28228: PCMCIA support for Clio C-1050
To: None <port-hpcmips-maintainer@netbsd.org, gnats-admin@netbsd.org,>
From: Matthew Orgass <darkstar@city-net.com>
List: netbsd-bugs
Date: 11/11/2004 21:25:00
>Number: 28228
>Category: port-hpcmips
>Synopsis: PCMCIA support for Clio C-1050
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: port-hpcmips-maintainer
>State: open
>Class: change-request
>Submitter-Id: net
>Arrival-Date: Thu Nov 11 21:25:00 +0000 2004
>Originator: darkstar@city-net.com
>Release: NetBSD 2.0_RC4
>Organization:
>Description:
The Clio C-1050 needs a isaportoffset of 0 for PCMCIA to function. Pbsdboot
and hpcboot also incorrectly identify the C-1050 as the Sharp Tripad. (For
anyone wanting to use the 1050 kernel patches before the boot loaders are
updated, the machine id (right id box in pbsdboot) is 02810102).
For some reason, 1.6 kernels would attach pcic at the incorrect address (but
trying to use it would hang the system). This does not happen in 2.0_RC4.
>Fix:
Index: sys/arch/hpcmips/conf/GENERIC
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcmips/conf/GENERIC,v
retrieving revision 1.145.2.3
diff -u -r1.145.2.3 GENERIC
--- sys/arch/hpcmips/conf/GENERIC 15 Jul 2004 20:19:16 -0000 1.145.2.3
+++ sys/arch/hpcmips/conf/GENERIC 11 Nov 2004 21:10:37 -0000
@@ -314,7 +314,8 @@
# Vadem Clio and Sharp Tripad
#
vrisab3 at vrgiu? platform SHARP_TRIPAD isaportoffset 0x1000000
-vrisab3 at vrgiu? platform VADEM_CLIO_C isaportoffset 0x1000000
+vrisab3 at vrgiu? platform VADEM_CLIO_C1000 isaportoffset 0x1000000
+vrisab3 at vrgiu? platform VADEM_CLIO_C1050 isaportoffset 0x0
isa3 at vrisab3
pcic0 at isa3 port 0x3e0 iomem 0x70000 iosiz 0x4000 irq 0x000d0003
Index: sys/arch/hpcmips/conf/MPC303
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcmips/conf/MPC303,v
retrieving revision 1.25.2.2
diff -u -r1.25.2.2 MPC303
--- sys/arch/hpcmips/conf/MPC303 15 Jul 2004 20:16:56 -0000 1.25.2.2
+++ sys/arch/hpcmips/conf/MPC303 11 Nov 2004 21:10:38 -0000
@@ -373,7 +373,8 @@
# Vadem Clio and Sharp Tripad
#
vrisab3 at vrgiu? platform SHARP_TRIPAD isaportoffset 0x1000000
-vrisab3 at vrgiu? platform VADEM_CLIO_C isaportoffset 0x1000000
+vrisab3 at vrgiu? platform VADEM_CLIO_C1000 isaportoffset 0x1000000
+vrisab3 at vrgiu? platform VADEM_CLIO_C1050 isaportoffset 0x0
isa3 at vrisab3
pcic0 at isa3 port 0x3e0 iomem 0x70000 iosiz 0x4000 irq 0x000d0003
Index: sys/arch/hpcmips/conf/VR41XX
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcmips/conf/VR41XX,v
retrieving revision 1.16.2.2
diff -u -r1.16.2.2 VR41XX
--- sys/arch/hpcmips/conf/VR41XX 15 Jul 2004 20:17:31 -0000 1.16.2.2
+++ sys/arch/hpcmips/conf/VR41XX 11 Nov 2004 21:10:39 -0000
@@ -302,7 +302,8 @@
# Vadem Clio and Sharp Tripad
#
vrisab3 at vrgiu? platform SHARP_TRIPAD isaportoffset 0x1000000
-vrisab3 at vrgiu? platform VADEM_CLIO_C isaportoffset 0x1000000
+vrisab3 at vrgiu? platform VADEM_CLIO_C1000 isaportoffset 0x1000000
+vrisab3 at vrgiu? platform VADEM_CLIO_C1050 isaportoffset 0x0
isa3 at vrisab3
pcic0 at isa3 port 0x3e0 iomem 0x70000 iosiz 0x4000 irq 0x000d0003
Index: sys/arch/hpcmips/stand/pbsdboot/main.c
===================================================================
RCS file: /cvsroot/src/sys/arch/hpcmips/stand/pbsdboot/main.c,v
retrieving revision 1.59
diff -u -r1.59 main.c
--- sys/arch/hpcmips/stand/pbsdboot/main.c 17 Nov 2003 10:07:58 -0000 1.59
+++ sys/arch/hpcmips/stand/pbsdboot/main.c 11 Nov 2004 04:48:17 -0000
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.59 2003/11/17 10:07:58 keihan Exp $ */
+ /* $NetBSD: main.c,v 1.59 2003/11/17 10:07:58 keihan Exp $ */
/*-
* Copyright (c) 1999, 2000 Shin Takemura.
@@ -257,7 +257,7 @@
PLATID_CPU_MIPS_VR_4111, PLATID_MACH_SHARP_TRIPAD_PV6000 },
{ TEXT("Vadem Clio C-1050"), BIFB_D16_FFFF,
640, 480, 1280, 0xa200000,
- PLATID_CPU_MIPS_VR_4121, PLATID_MACH_SHARP_TRIPAD_PV6000 },
+ PLATID_CPU_MIPS_VR_4121, PLATID_MACH_VADEM_CLIO_C1050 },
{ TEXT("E-55"), BIFB_D2_M2L_0,
240, 320, 256, 0xa000000,
PLATID_CPU_MIPS_VR_4111, PLATID_MACH_CASIO_CASSIOPEIAE_E55 },
Index: sys/arch/hpc/stand/hpcboot/machine_config.cpp
===================================================================
RCS file: /cvsroot/src/sys/arch/hpc/stand/hpcboot/machine_config.cpp,v
retrieving revision 1.8
diff -u -r1.8 machine_config.cpp
--- sys/arch/hpc/stand/hpcboot/machine_config.cpp 18 Dec 2003 12:21:36 -0000 1.8
+++ sys/arch/hpc/stand/hpcboot/machine_config.cpp 11 Nov 2004 21:18:06 -0000
@@ -69,6 +69,7 @@
{ PLATID_CPU_MIPS_VR_4111, PLATID_MACH_NEC_MCR_500A , 8, 640, 240, 1024, 0xb3000000 },
{ PLATID_CPU_MIPS_VR_4111, PLATID_MACH_NEC_MCR_FORDOCOMO , 2, 640, 240, 256, 0xaa000000 },
{ PLATID_CPU_MIPS_VR_4111, PLATID_MACH_SHARP_TRIPAD_PV6000 , 8, 640, 480, 640, 0xaa000000 },
+ { PLATID_CPU_MIPS_VR_4111, PLATID_MACH_VADEM_CLIO_C1000 , 8, 640, 480, 640, 0xaa000000 },
{ PLATID_CPU_MIPS_VR_4121, PLATID_MACH_CASIO_CASSIOPEIAE_E100 , 16, 240, 320, 512, 0xaa200000 },
{ PLATID_CPU_MIPS_VR_4121, PLATID_MACH_CASIO_CASSIOPEIAE_E500 , 16, 240, 320, 512, 0xaa200000 },
{ PLATID_CPU_MIPS_VR_4121, PLATID_MACH_CASIO_POCKETPOSTPET_POCKETPOSTPET, 16, 320, 240, 1024, 0xaa200000 },
@@ -92,7 +93,7 @@
{ PLATID_CPU_MIPS_VR_4121, PLATID_MACH_NEC_MCR_730A , 16, 800, 600, 1600, 0xaa0ea600 },
{ PLATID_CPU_MIPS_VR_4121, PLATID_MACH_NEC_MCR_SIGMARION , 16, 640, 240, 1280, 0xaa000000 },
{ PLATID_CPU_MIPS_VR_4131, PLATID_MACH_NEC_MCR_SIGMARION2 , 16, 640, 240, 1280, 0xb0800000 },
- { PLATID_CPU_MIPS_VR_4121, PLATID_MACH_SHARP_TRIPAD_PV6000 , 16, 640, 480, 1280, 0xaa200000 },
+ { PLATID_CPU_MIPS_VR_4121, PLATID_MACH_VADEM_CLIO_C1050 , 16, 640, 480, 1280, 0xaa200000 },
{ PLATID_CPU_MIPS_VR_4121, PLATID_MACH_FUJITSU_PENCENTRA_130 , 8, 640, 480, 640, 0xb0201e00 },
{ PLATID_CPU_MIPS_VR_4122, PLATID_MACH_VICTOR_INTERLINK_MPC303 , 16, 800, 600, 0, 0x00000000 },
// TX39 (can't determine frame buffer address)
>Unformatted: