From 6e7b011421fb0a50ecf2473cad1ae2655c234893 Mon Sep 17 00:00:00 2001
From: David du Colombier <0intro@gmail.com>
Date: Tue, 5 Nov 2002 00:00:00 +0000
Subject: [PATCH] Plan 9 from Bell Labs 2002-11-05

---
 pc/devarch.c     | 29 ++++++++++++++---------------
 pc/pcmciamodem.c |  1 +
 port/portdat.h   |  2 ++
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/pc/devarch.c b/pc/devarch.c
index db22b9de2f3c2e367cea9eed9a3c0236f1ad4eb8..f1031d92804f50949a385115da4541686f45e903 100644
--- a/pc/devarch.c
+++ b/pc/devarch.c
@@ -495,21 +495,20 @@ PCArch* arch;
 extern PCArch* knownarch[];
 
 PCArch archgeneric = {
-	"generic",				/* id */
-	0,					/* ident */
-	i8042reset,				/* reset */
-	unimplemented,				/* serialpower */
-	unimplemented,				/* modempower */
-
-	i8259init,				/* intrinit */
-	i8259enable,				/* intrenable */
-	i8259vecno,				/* vector number */
-	i8259disable,				/* intrdisable */
-
-	i8253enable,				/* clockenable */
-
-	i8253read,				/* read the standard timer */
-	i8253timerset,
+.id=		"generic",
+.ident=		0,
+.reset=		i8042reset,
+.serialpower=	unimplemented,
+.modempower=	unimplemented,
+
+.intrinit=	i8259init,
+.intrenable=	i8259enable,
+.intrvecno=	i8259vecno,
+.intrdisable=	i8259disable,
+
+.clockenable=	i8253enable,
+.fastclock=	i8253read,
+.timerset=	i8253timerset,
 };
 
 typedef struct {
diff --git a/pc/pcmciamodem.c b/pc/pcmciamodem.c
index 04ab86a621feca75d38373f7a0651c9e85672ceb..82d09b8817a0e9503bd9ecfc56a757e44db2ecc4 100644
--- a/pc/pcmciamodem.c
+++ b/pc/pcmciamodem.c
@@ -27,6 +27,7 @@ static char* modems[] = {
 	"MONTANA V.34 FAX/MODEM",	/* Motorola */
 	"REM10",
 	"GSM/GPRS",
+	"AirCard 555",
 	0,
 };
 
diff --git a/port/portdat.h b/port/portdat.h
index 79e11e59f003183fcc09eb8e5d1821e93114c270..20549bc37545828f1a4dd0892a58d396d91e1e29 100644
--- a/port/portdat.h
+++ b/port/portdat.h
@@ -662,6 +662,8 @@ struct Proc
 
 	ulong	qpc;		/* pc calling last blocking qlock */
 
+	int	setargs;
+
 	void	*ureg;		/* User registers for notes */
 	void	*dbgreg;	/* User registers for devproc */
 	Notsave;