diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2007-08-08 17:12:44 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2007-08-08 17:12:44 +0000 |
| commit | f6f856c55975b62674468e9fc3e45e72d46d91a9 (patch) | |
| tree | ecd39ed826a71d7a737c0b2b7160e4b2062b2321 /sysutils/vbetool | |
| parent | 7be7ecf32d6eb5f68d572ea812ac3ade2b2f52d2 (diff) | |
| download | pkgsrc-f6f856c55975b62674468e9fc3e45e72d46d91a9.tar.gz | |
outb args are swapped between NetBSD and linux... found by jmcneill@.
Bump PKGREVISION.
Diffstat (limited to 'sysutils/vbetool')
| -rw-r--r-- | sysutils/vbetool/Makefile | 3 | ||||
| -rw-r--r-- | sysutils/vbetool/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/vbetool/patches/patch-ab | 39 |
3 files changed, 37 insertions, 9 deletions
diff --git a/sysutils/vbetool/Makefile b/sysutils/vbetool/Makefile index d54757a34e6..f5effa1188a 100644 --- a/sysutils/vbetool/Makefile +++ b/sysutils/vbetool/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2007/08/08 15:55:28 xtraeme Exp $ +# $NetBSD: Makefile,v 1.4 2007/08/08 17:12:44 xtraeme Exp $ # DISTNAME= vbetool_0.7-1 PKGNAME= ${DISTNAME:S/_/-/} +PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.srcf.ucam.org/~mjg59/vbetool/ diff --git a/sysutils/vbetool/distinfo b/sysutils/vbetool/distinfo index c7bca962d4f..e9381afb7f5 100644 --- a/sysutils/vbetool/distinfo +++ b/sysutils/vbetool/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.2 2007/08/08 12:36:38 xtraeme Exp $ +$NetBSD: distinfo,v 1.3 2007/08/08 17:12:44 xtraeme Exp $ SHA1 (vbetool_0.7-1.tar.gz) = 49c86aa6fb877f35a0b336d6aa1d6b204c2cc66f RMD160 (vbetool_0.7-1.tar.gz) = b5a5d3a0794f8dbb06c78373e15c26d9536d8303 Size (vbetool_0.7-1.tar.gz) = 176277 bytes SHA1 (patch-aa) = d27a3dd8eb1943c3f30351996483a01638521e90 -SHA1 (patch-ab) = 23b1bf49f395793b53dccd71be6f03aa27685a64 +SHA1 (patch-ab) = 1b5b041ec8dac282a0e8305b82af2c0fe325e1e8 SHA1 (patch-ac) = 89b24bd2fadbf40ab614186b53dc339653029919 diff --git a/sysutils/vbetool/patches/patch-ab b/sysutils/vbetool/patches/patch-ab index 95e75470fee..d1bd911637f 100644 --- a/sysutils/vbetool/patches/patch-ab +++ b/sysutils/vbetool/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2007/08/08 12:36:38 xtraeme Exp $ +$NetBSD: patch-ab,v 1.3 2007/08/08 17:12:44 xtraeme Exp $ --- vbetool.c.orig 2006-07-26 03:27:21.000000000 +0200 -+++ vbetool.c 2007-08-08 14:27:44.000000000 +0200 -@@ -8,19 +8,26 @@ ++++ vbetool.c 2007-08-08 19:07:18.000000000 +0200 +@@ -8,19 +8,29 @@ version 2 */ @@ -27,10 +27,13 @@ $NetBSD: patch-ab,v 1.2 2007/08/08 12:36:38 xtraeme Exp $ +#include <machine/pio.h> +#endif + ++/* out* arguments are swapped between NetBSD and linux */ ++#define __outb(v, p) outb((p), (v)) ++ #include "include/lrmi.h" #include "vbetool.h" -@@ -42,8 +49,16 @@ +@@ -42,8 +52,16 @@ exit(1); } @@ -47,7 +50,7 @@ $NetBSD: patch-ab,v 1.2 2007/08/08 12:36:38 xtraeme Exp $ pacc = pci_alloc(); pacc->numeric_ids = 1; -@@ -256,7 +271,9 @@ +@@ -256,7 +274,9 @@ LRMI_free_real(data); @@ -57,7 +60,7 @@ $NetBSD: patch-ab,v 1.2 2007/08/08 12:36:38 xtraeme Exp $ } -@@ -476,7 +493,9 @@ +@@ -476,23 +496,25 @@ return 11; } @@ -67,3 +70,27 @@ $NetBSD: patch-ab,v 1.2 2007/08/08 12:36:38 xtraeme Exp $ return 0; } + int enable_vga() { +- outb(0x03 | inb(0x3CC), 0x3C2); +- outb(0x01 | inb(0x3C3), 0x3C3); +- outb(0x08 | inb(0x46e8), 0x46e8); +- outb(0x01 | inb(0x102), 0x102); ++ __outb(0x03 | inb(0x3CC), 0x3C2); ++ __outb(0x01 | inb(0x3C3), 0x3C3); ++ __outb(0x08 | inb(0x46e8), 0x46e8); ++ __outb(0x01 | inb(0x102), 0x102); + return 0; + } + + int disable_vga() { +- outb(~0x03 & inb(0x3CC), 0x3C2); +- outb(~0x01 & inb(0x3C3), 0x3C3); +- outb(~0x08 & inb(0x46e8), 0x46e8); +- outb(~0x01 & inb(0x102), 0x102); ++ __outb(~0x03 & inb(0x3CC), 0x3C2); ++ __outb(~0x01 & inb(0x3C3), 0x3C3); ++ __outb(~0x08 & inb(0x46e8), 0x46e8); ++ __outb(~0x01 & inb(0x102), 0x102); + return 0; + } + |