CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: jandberg
Date: Wed Jan 6 13:00:51 UTC 2021
Modified Files:
src/sys/arch/amiga/dev: amidisplaycc.c
Log Message:
Implement the WSDISPLAYIO_GET_FBINFO ioctl, needed by X wsfb driver.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/amiga/dev/amidisplaycc.c
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/amiga/dev/amidisplaycc.c
diff -u src/sys/arch/amiga/dev/amidisplaycc.c:1.32 src/sys/arch/amiga/dev/amidisplaycc.c:1.33
--- src/sys/arch/amiga/dev/amidisplaycc.c:1.32 Mon Sep 3 16:29:22 2018
+++ src/sys/arch/amiga/dev/amidisplaycc.c Wed Jan 6 13:00:51 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: amidisplaycc.c,v 1.32 2018/09/03 16:29:22 riastradh Exp $ */
+/* $NetBSD: amidisplaycc.c,v 1.33 2021/01/06 13:00:51 jandberg Exp $ */
/*-
* Copyright (c) 2000 Jukka Andberg.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.32 2018/09/03 16:29:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.33 2021/01/06 13:00:51 jandberg Exp $");
/*
* wscons interface to amiga custom chips. Contains the necessary functions
@@ -116,7 +116,9 @@ static int amidisplaycc_setemulcmap(stru
static int amidisplaycc_cmapioctl(view_t *, u_long, struct wsdisplay_cmap *);
static int amidisplaycc_setcmap(view_t *, struct wsdisplay_cmap *);
static int amidisplaycc_getcmap(view_t *, struct wsdisplay_cmap *);
-static int amidisplaycc_gfxscreen(struct amidisplaycc_softc *, int);
+static int amidisplaycc_setgfxview(struct amidisplaycc_softc *, int);
+static void amidisplaycc_initgfxview(struct amidisplaycc_softc *);
+static int amidisplaycc_getfbinfo(struct amidisplaycc_softc *, struct wsdisplayio_fbinfo *);
static int amidisplaycc_setfont(struct amidisplaycc_screen *, const char *);
static const struct wsdisplay_font * amidisplaycc_getbuiltinfont(void);
@@ -365,8 +367,6 @@ amidisplaycc_cninit(struct consdev * cd
int x;
int y;
- /* Yeah, we got the console! */
-
/*
* This will do the basic stuff we also need.
*/
@@ -1042,9 +1042,9 @@ amidisplaycc_ioctl(void *dp, void *vs, u
case WSDISPLAYIO_SMODE:
if (INTDATA == WSDISPLAYIO_MODE_EMUL)
- return amidisplaycc_gfxscreen(adp, 0);
+ return amidisplaycc_setgfxview(adp, 0);
if (INTDATA == WSDISPLAYIO_MODE_MAPPED)
- return amidisplaycc_gfxscreen(adp, 1);
+ return amidisplaycc_setgfxview(adp, 1);
return (EINVAL);
case WSDISPLAYIO_GINFO:
@@ -1059,6 +1059,9 @@ amidisplaycc_ioctl(void *dp, void *vs, u
return (amidisplaycc_cmapioctl(adp->gfxview,
cmd,
(struct wsdisplay_cmap*)data));
+ case WSDISPLAYIO_GET_FBINFO:
+ amidisplaycc_initgfxview(adp);
+ return amidisplaycc_getfbinfo(adp, data);
}
return (EPASSTHROUGH);
@@ -1068,6 +1071,52 @@ amidisplaycc_ioctl(void *dp, void *vs, u
#undef FBINFO
}
+static int
+amidisplaycc_getfbinfo(struct amidisplaycc_softc *adp, struct wsdisplayio_fbinfo *fbinfo)
+{
+ bmap_t *bm;
+
+ KASSERT(adp);
+
+ if (adp->gfxview == NULL) {
+ return ENOMEM;
+ }
+
+ bm = adp->gfxview->bitmap;
+ KASSERT(bm);
+
+ /* Depth 1 since current X wsfb driver doesn't support multiple bitplanes */
+ memset(fbinfo, 0, sizeof(*fbinfo));
+ fbinfo->fbi_fbsize = bm->bytes_per_row * bm->rows;
+ fbinfo->fbi_fboffset = 0;
+ fbinfo->fbi_width = bm->bytes_per_row * 8;
+ fbinfo->fbi_height = bm->rows;
+ fbinfo->fbi_stride = bm->bytes_per_row;
+ fbinfo->fbi_bitsperpixel = 1;
+ fbinfo->fbi_pixeltype = WSFB_CI;
+ fbinfo->fbi_flags = 0;
+ fbinfo->fbi_subtype.fbi_cmapinfo.cmap_entries = 1 << adp->gfxdepth;
+
+ return (0);
+}
+
+/*
+ * Initialize (but not display) the view used for graphics.
+ */
+static void
+amidisplaycc_initgfxview(struct amidisplaycc_softc *adp)
+{
+ dimen_t dimension;
+
+ if (adp->gfxview == NULL) {
+ /* First time here, create the screen */
+ dimension.width = adp->gfxwidth;
+ dimension.height = adp->gfxheight;
+ adp->gfxview = grf_alloc_view(NULL,
+ ,
+ adp->gfxdepth);
+ }
+}
/*
* Switch to either emulation (text) or mapped (graphics) mode
@@ -1076,12 +1125,9 @@ amidisplaycc_ioctl(void *dp, void *vs, u
*
* Once the extra screen is created, it never goes away.
*/
-
static int
-amidisplaycc_gfxscreen(struct amidisplaycc_softc *adp, int on)
+amidisplaycc_setgfxview(struct amidisplaycc_softc *adp, int on)
{
- dimen_t dimension;
-
dprintf("amidisplaycc: switching to %s mode.\n",
on ? "mapped" : "emul");
@@ -1105,22 +1151,7 @@ amidisplaycc_gfxscreen(struct amidisplay
}
/* switch to mapped mode then */
-
- if (adp->gfxview == NULL) {
- /* First time here, create the screen */
-
- dimension.width = adp->gfxwidth;
- dimension.height = adp->gfxheight;
-
- dprintf("amidisplayc
CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: jandberg
Date: Sun Feb 24 19:25:35 UTC 2019
Modified Files:
src/sys/arch/amiga/dev: kbd.c
Log Message:
fix comment
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/amiga/dev/kbd.c
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/amiga/dev/kbd.c
diff -u src/sys/arch/amiga/dev/kbd.c:1.57 src/sys/arch/amiga/dev/kbd.c:1.58
--- src/sys/arch/amiga/dev/kbd.c:1.57 Fri Jul 25 08:10:31 2014
+++ src/sys/arch/amiga/dev/kbd.c Sun Feb 24 19:25:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kbd.c,v 1.57 2014/07/25 08:10:31 dholland Exp $ */
+/* $NetBSD: kbd.c,v 1.58 2019/02/24 19:25:35 jandberg Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.57 2014/07/25 08:10:31 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kbd.c,v 1.58 2019/02/24 19:25:35 jandberg Exp $");
#include
#include
@@ -144,7 +144,7 @@ struct kbd_softc {
int k_console; /* true if used as console keyboard */
#if NWSKBD>0
device_t k_wskbddev; /* pointer to wskbd for sending strokes */
- int k_pollingmode; /* polling mode on? whatever it isss... */
+ int k_pollingmode; /* Polling mode on? Otherwise send events. */
#endif
};
struct kbd_softc kbd_softc;
CVS commit: src/sys/arch/amiga/amiga
Module Name:src
Committed By: jandberg
Date: Sun Feb 24 19:24:21 UTC 2019
Modified Files:
src/sys/arch/amiga/amiga: machdep.c
Log Message:
cnpollc needs to be called before cngetc
To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 src/sys/arch/amiga/amiga/machdep.c
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/amiga/amiga/machdep.c
diff -u src/sys/arch/amiga/amiga/machdep.c:1.250 src/sys/arch/amiga/amiga/machdep.c:1.251
--- src/sys/arch/amiga/amiga/machdep.c:1.250 Wed Dec 5 09:34:46 2018
+++ src/sys/arch/amiga/amiga/machdep.c Sun Feb 24 19:24:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.250 2018/12/05 09:34:46 mlelstv Exp $ */
+/* $NetBSD: machdep.c,v 1.251 2019/02/24 19:24:20 jandberg Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -50,7 +50,7 @@
#include "empm.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.250 2018/12/05 09:34:46 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.251 2019/02/24 19:24:20 jandberg Exp $");
#include
#include
@@ -440,7 +440,9 @@ cpu_reboot(register int howto, char *boo
printf("\n");
printf("The operating system has halted.\n");
printf("Please press any key to reboot.\n\n");
+ cnpollc(1);
cngetc();
+ cnpollc(0);
}
printf("rebooting...\n");
CVS commit: src/sys/arch/amiga/dev
Module Name:src
Committed By: jandberg
Date: Sun Jan 28 10:00:31 UTC 2018
Modified Files:
src/sys/arch/amiga/dev: amidisplaycc.c
Log Message:
Make the console framebuffer visible when polling mode console input is used.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amiga/dev/amidisplaycc.c
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/amiga/dev/amidisplaycc.c
diff -u src/sys/arch/amiga/dev/amidisplaycc.c:1.30 src/sys/arch/amiga/dev/amidisplaycc.c:1.31
--- src/sys/arch/amiga/dev/amidisplaycc.c:1.30 Sat Feb 6 20:20:18 2016
+++ src/sys/arch/amiga/dev/amidisplaycc.c Sun Jan 28 10:00:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: amidisplaycc.c,v 1.30 2016/02/06 20:20:18 jandberg Exp $ */
+/* $NetBSD: amidisplaycc.c,v 1.31 2018/01/28 10:00:31 jandberg Exp $ */
/*-
* Copyright (c) 2000 Jukka Andberg.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.30 2016/02/06 20:20:18 jandberg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.31 2018/01/28 10:00:31 jandberg Exp $");
/*
* wscons interface to amiga custom chips. Contains the necessary functions
@@ -438,6 +438,7 @@ amidisplaycc_attach(device_t parent, dev
aga_enable ? "(AGA)" : "");
if (amidisplaycc_consolescreen.isconsole) {
+ amidisplaycc_consolescreen.device = adp;
adp->currentscreen = _consolescreen;
printf(" (console)");
} else
@@ -1060,11 +1061,6 @@ amidisplaycc_ioctl(void *dp, void *vs, u
(struct wsdisplay_cmap*)data));
}
- dprintf("amidisplaycc: unknown ioctl %lx (grp:'%c' num:%d)\n",
- (long)cmd,
- (char)((cmd&0xff00)>>8),
- (int)(cmd&0xff));
-
return (EPASSTHROUGH);
#undef UINTDATA
@@ -1878,6 +1874,22 @@ amidisplaycc_getbuiltinfont(void)
void
amidisplaycc_pollc(void *cookie, int on)
{
+ if (amidisplaycc_consolescreen.isconsole)
+ {
+ if (on)
+ {
+ /* About to use console, so make it visible */
+ grf_display_view(amidisplaycc_consolescreen.view);
+ }
+ if (!on &&
+ amidisplaycc_consolescreen.isconsole &&
+ amidisplaycc_consolescreen.device != NULL &&
+ amidisplaycc_consolescreen.device->currentscreen != NULL)
+ {
+ /* Restore the correct view after done with console use */
+ grf_display_view(amidisplaycc_consolescreen.device->currentscreen->view);
+ }
+ }
}
/*
CVS commit: src/share/man/man4/man4.amiga
Module Name:src Committed By: jandberg Date: Sun Feb 7 10:46:08 UTC 2016 Modified Files: src/share/man/man4/man4.amiga: amidisplaycc.4 Log Message: Add the copyright notice which was missing from my initial version. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/man4.amiga/amidisplaycc.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.amiga/amidisplaycc.4 diff -u src/share/man/man4/man4.amiga/amidisplaycc.4:1.11 src/share/man/man4/man4.amiga/amidisplaycc.4:1.12 --- src/share/man/man4/man4.amiga/amidisplaycc.4:1.11 Sat Feb 6 20:20:18 2016 +++ src/share/man/man4/man4.amiga/amidisplaycc.4 Sun Feb 7 10:46:08 2016 @@ -1,4 +1,28 @@ -.\" $NetBSD: amidisplaycc.4,v 1.11 2016/02/06 20:20:18 jandberg Exp $ +.\" +.\" Copyright (c) 2000 Jukka Andberg +.\" All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +.\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +.\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +.\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +.\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +.\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +.\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +.\" +.\" $NetBSD: amidisplaycc.4,v 1.12 2016/02/07 10:46:08 jandberg Exp $ .Dd November 12, 2003 .Dt AMIDISPLAYCC 4 amiga .Os
CVS commit: src
Module Name:src
Committed By: jandberg
Date: Sat Feb 6 20:20:19 UTC 2016
Modified Files:
src/share/man/man4/man4.amiga: amidisplaycc.4
src/sys/arch/amiga/dev: amidisplaycc.c
Log Message:
Fix some awkward language in manpage and code comments.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/share/man/man4/man4.amiga/amidisplaycc.4
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/amiga/dev/amidisplaycc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/man4.amiga/amidisplaycc.4
diff -u src/share/man/man4/man4.amiga/amidisplaycc.4:1.10 src/share/man/man4/man4.amiga/amidisplaycc.4:1.11
--- src/share/man/man4/man4.amiga/amidisplaycc.4:1.10 Wed Mar 11 13:41:25 2009
+++ src/share/man/man4/man4.amiga/amidisplaycc.4 Sat Feb 6 20:20:18 2016
@@ -1,4 +1,4 @@
-.\" $NetBSD: amidisplaycc.4,v 1.10 2009/03/11 13:41:25 joerg Exp $
+.\" $NetBSD: amidisplaycc.4,v 1.11 2016/02/06 20:20:18 jandberg Exp $
.Dd November 12, 2003
.Dt AMIDISPLAYCC 4 amiga
.Os
@@ -23,11 +23,10 @@ Currently it does not support running X.
It can however coexist well enough with grf0 to make possible running
X the old way, but be warned, you cannot switch screens while
in X and when quitting it, it seems to hang. Switching a screen
-then will bring up the text console. As always, we apologise for
-the inconvenience.
+then will bring up the text console.
.Pp
-What it does support is hilite (bold), underline, reverse and
-foreground/background colors.
+It supports foreground and background color, and the hilite (bold),
+underline, and reverse text attributes.
.Ss Virtual terminals and screen types
The number of virtual screens is limited only by
the available chip memory.
Index: src/sys/arch/amiga/dev/amidisplaycc.c
diff -u src/sys/arch/amiga/dev/amidisplaycc.c:1.29 src/sys/arch/amiga/dev/amidisplaycc.c:1.30
--- src/sys/arch/amiga/dev/amidisplaycc.c:1.29 Thu Nov 12 12:19:49 2015
+++ src/sys/arch/amiga/dev/amidisplaycc.c Sat Feb 6 20:20:18 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: amidisplaycc.c,v 1.29 2015/11/12 12:19:49 phx Exp $ */
+/* $NetBSD: amidisplaycc.c,v 1.30 2016/02/06 20:20:18 jandberg Exp $ */
/*-
* Copyright (c) 2000 Jukka Andberg.
@@ -28,15 +28,15 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.29 2015/11/12 12:19:49 phx Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amidisplaycc.c,v 1.30 2016/02/06 20:20:18 jandberg Exp $");
/*
* wscons interface to amiga custom chips. Contains the necessary functions
* to render text on bitmapped screens. Uses the functions defined in
* grfabs_reg.h for display creation/destruction and low level setup.
*
- * For each virtual terminal a new screen ('view') is allocated.
- * Also one more is allocated for the mapped screen on demand.
+ * For each virtual terminal a new screen (a grfabs view) is allocated.
+ * Also one more view is allocated for the mapped screen on demand.
*/
#include "amidisplaycc.h"
@@ -65,7 +65,7 @@ __KERNEL_RCSID(0, "$NetBSD: amidisplaycc
#include
#include
-/* These can be lowered if you are sure you dont need that much colors. */
+/* These can be lowered if you are sure you don't need that much colors. */
#define MAXDEPTH 8
#define MAXROWS 128
@@ -175,16 +175,12 @@ const struct wsdisplay_emulops amidispla
amidisplaycc_allocattr
};
-/* add some of our own data to the wsscreen_descr */
+/* Add some of our own data to the wsscreen_descr */
struct amidisplaycc_screen_descr {
struct wsscreen_descr wsdescr;
intdepth;
};
-/*
- * List of supported screenmodes. Almost anything can be given here.
- */
-
#define ADCC_SCREEN(name, width, height, depth, fontwidth, fontheight) \
/* CONSTCOND */ \
{{ \
@@ -197,10 +193,10 @@ struct amidisplaycc_screen_descr {
depth }
/*
- * Screen types.
+ * List of supported screen types.
*
- * The first in list is used for the console screen.
- * A suitable screen mode is guessed for it by looking
+ * The first item in list is used for the console screen.
+ * A suitable screen size is guessed for it by looking
* at the GRF_* options.
*/
struct amidisplaycc_screen_descr amidisplaycc_screentab[] = {
@@ -252,7 +248,7 @@ const struct wsscreen_descr *amidisplayc
#define NELEMS(arr) (sizeof(arr)/sizeof((arr)[0]))
/*
- * This structure also is passed to wscons. It contains pointers
+ * This structure is passed to wscons. It contains pointers
* to the available display modes.
*/
@@ -343,7 +339,7 @@ static int aga_enable = 0;
* This gets called at console init to determine the priority of
* this console device.
*
- * Of course pointers to this and other functions must present
+ * Pointers to this and other functions must present
* in constab[] in conf.c for this to work.
*/
void
@@ -409,7 +405,7 @@ amidisplaycc_match(device_t parent, cfda
if (match
CVS commit: src/sys/arch/amiga/dev
Module Name:src Committed By: jandberg Date: Sun Feb 8 09:55:25 UTC 2015 Modified Files: src/sys/arch/amiga/dev: gayle_pcmcia.c Log Message: Add a delay between the recently added new PCMCIA reset method and the old reset method to get the card reset work reliably on my A1200 model and network cards. Discussed on port-amiga. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amiga/dev/gayle_pcmcia.c 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/amiga/dev/gayle_pcmcia.c diff -u src/sys/arch/amiga/dev/gayle_pcmcia.c:1.30 src/sys/arch/amiga/dev/gayle_pcmcia.c:1.31 --- src/sys/arch/amiga/dev/gayle_pcmcia.c:1.30 Sun Sep 7 22:24:40 2014 +++ src/sys/arch/amiga/dev/gayle_pcmcia.c Sun Feb 8 09:55:25 2015 @@ -1,9 +1,9 @@ -/* $NetBSD: gayle_pcmcia.c,v 1.30 2014/09/07 22:24:40 phx Exp $ */ +/* $NetBSD: gayle_pcmcia.c,v 1.31 2015/02/08 09:55:25 jandberg Exp $ */ /* public domain */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gayle_pcmcia.c,v 1.30 2014/09/07 22:24:40 phx Exp $); +__KERNEL_RCSID(0, $NetBSD: gayle_pcmcia.c,v 1.31 2015/02/08 09:55:25 jandberg Exp $); /* PCMCIA front-end driver for A1200's and A600's. */ @@ -211,6 +211,8 @@ pccard_attach(device_t parent, device_t delay(500); gayle_intr_ack(0xfc); + delay(100*1000); + *reset_card_reg = 0x0; delay(1000); x = *reset_card_reg;
CVS commit: src/sys/arch/amiga/dev
Module Name:src Committed By: jandberg Date: Mon Sep 23 08:39:28 UTC 2013 Modified Files: src/sys/arch/amiga/dev: gayle_pcmcia.c Log Message: Fix interrupt handler arg (needs to be softc instead of device_t) To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amiga/dev/gayle_pcmcia.c 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/amiga/dev/gayle_pcmcia.c diff -u src/sys/arch/amiga/dev/gayle_pcmcia.c:1.26 src/sys/arch/amiga/dev/gayle_pcmcia.c:1.27 --- src/sys/arch/amiga/dev/gayle_pcmcia.c:1.26 Sat Oct 27 17:17:28 2012 +++ src/sys/arch/amiga/dev/gayle_pcmcia.c Mon Sep 23 08:39:28 2013 @@ -1,9 +1,9 @@ -/* $NetBSD: gayle_pcmcia.c,v 1.26 2012/10/27 17:17:28 chs Exp $ */ +/* $NetBSD: gayle_pcmcia.c,v 1.27 2013/09/23 08:39:28 jandberg Exp $ */ /* public domain */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: gayle_pcmcia.c,v 1.26 2012/10/27 17:17:28 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: gayle_pcmcia.c,v 1.27 2013/09/23 08:39:28 jandberg Exp $); /* PCMCIA front-end driver for A1200's and A600's. */ @@ -185,12 +185,12 @@ pccard_attach(device_t parent, device_t } sc-intr6.isr_intr = pccard_intr6; - sc-intr6.isr_arg = self; + sc-intr6.isr_arg = sc; sc-intr6.isr_ipl = 6; add_isr(sc-intr6); sc-intr2.isr_intr = pccard_intr2; - sc-intr2.isr_arg = self; + sc-intr2.isr_arg = sc; sc-intr2.isr_ipl = 2; add_isr(sc-intr2);
CVS commit: src/sys/arch/amigappc/amigappc
Module Name:src Committed By: jandberg Date: Sun Dec 19 08:32:33 UTC 2010 Modified Files: src/sys/arch/amigappc/amigappc: machdep.c Log Message: Identify another type of BPPC correctly To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sys/arch/amigappc/amigappc/machdep.c 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/amigappc/amigappc/machdep.c diff -u src/sys/arch/amigappc/amigappc/machdep.c:1.44 src/sys/arch/amigappc/amigappc/machdep.c:1.45 --- src/sys/arch/amigappc/amigappc/machdep.c:1.44 Mon Nov 1 19:00:08 2010 +++ src/sys/arch/amigappc/amigappc/machdep.c Sun Dec 19 08:32:33 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.44 2010/11/01 19:00:08 phx Exp $ */ +/* $NetBSD: machdep.c,v 1.45 2010/12/19 08:32:33 jandberg Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.44 2010/11/01 19:00:08 phx Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.45 2010/12/19 08:32:33 jandberg Exp $); #include sys/param.h #include sys/mount.h @@ -304,7 +304,7 @@ cpu = 603; break; case 7: - cpuname = 603e+; + cpuname = 603ev; cpu = 603; break; case 9: @@ -328,6 +328,7 @@ case 'F': pup = [CS Mk.III]; break; + case 'H': case 'I': pup = [BlizzardPPC]; break;
