head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.32 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.30 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.28 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.26 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.24 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.22 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.20 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.18 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.16 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.14 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.12 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.10 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.8 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.6 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.4 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.5.0.2 pkgsrc-2022Q2-base:1.5 pkgsrc-2022Q1:1.4.0.120 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.118 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.116 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.114 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.112 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.110 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.108 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.104 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.84 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.106 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.102 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.100 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.98 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.96 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.94 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.92 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.90 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.88 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.86 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.82 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.80 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.78 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.76 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.74 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.72 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.70 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.68 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.66 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.64 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.62 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.60 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.58 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.56 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.54 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.52 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.50 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.48 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.46 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.44 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.42 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.40 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.38 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.36 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.34 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.32 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.30 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.28 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.26 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.24 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.22 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.20 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.18 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.16 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.14 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.4.0.12 pkgsrc-2008Q3-base:1.4 cube-native-xorg:1.4.0.10 cube-native-xorg-base:1.4 pkgsrc-2008Q2:1.4.0.8 pkgsrc-2008Q2-base:1.4 cwrapper:1.4.0.6 pkgsrc-2008Q1:1.4.0.4 pkgsrc-2008Q1-base:1.4 pkgsrc-2007Q4:1.4.0.2 pkgsrc-2007Q4-base:1.4 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2022.05.13.15.46.09; author wiz; state Exp; branches; next 1.4; commitid BXIYAfLYsBLluUDD; 1.4 date 2007.10.29.18.41.24; author joerg; state Exp; branches; next 1.3; 1.3 date 2007.08.08.17.12.44; author xtraeme; state Exp; branches; next 1.2; 1.2 date 2007.08.08.12.36.38; author xtraeme; state Exp; branches; next 1.1; 1.1 date 2007.08.08.12.00.34; author xtraeme; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2007.08.08.12.00.34; author xtraeme; state Exp; branches; next ; desc @@ 1.5 log @vbetool: adapt for pciutils 3.8.0 @ text @$NetBSD: patch-ab,v 1.4 2007/10/29 18:41:24 joerg Exp $ --- vbetool.c.orig 2006-07-26 01:27:21.000000000 +0000 +++ vbetool.c @@@@ -16,11 +16,31 @@@@ version 2 #include #include #include +#ifdef __linux__ #include #include +#endif #include #include +#ifdef __NetBSD__ +#include +#endif + +static uint8_t +asm_inb(unsigned port) +{ + uint8_t data; + __asm volatile("inb %w1,%0" : "=a" (data) : "d" (port)); + return data; +} + +static __inline void +asm_outb(uint8_t data, unsigned port) +{ + __asm volatile("outb %0,%w1" : : "a" (data), "d" (port)); +} + #include "include/lrmi.h" #include "vbetool.h" @@@@ -42,8 +62,16 @@@@ int vbetool_init (void) { exit(1); } +#ifdef __NetBSD__ +# ifdef __i386__ + i386_iopl(3); +# else + x86_64_iopl(3); +# endif +#else ioperm(0, 1024, 1); iopl(3); +#endif pacc = pci_alloc(); pacc->numeric_ids = 1; @@@@ -256,7 +284,9 @@@@ void restore_state_from(char *data) LRMI_free_real(data); +#ifdef __linux__ ioctl(0, KDSETMODE, KD_TEXT); +#endif } @@@@ -476,23 +506,25 @@@@ int check_console() return 11; } +#ifdef __linux__ ioctl(0, KDSETMODE, KD_GRAPHICS); +#endif 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); + asm_outb(0x03 | asm_inb(0x3CC), 0x3C2); + asm_outb(0x01 | asm_inb(0x3C3), 0x3C3); + asm_outb(0x08 | asm_inb(0x46e8), 0x46e8); + asm_outb(0x01 | asm_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); + asm_outb(~0x03 & asm_inb(0x3CC), 0x3C2); + asm_outb(~0x01 & asm_inb(0x3C3), 0x3C3); + asm_outb(~0x08 & asm_inb(0x46e8), 0x46e8); + asm_outb(~0x01 & asm_inb(0x102), 0x102); return 0; } @ 1.4 log @Don't expect the OS to provide inb/outb, just define the assembler functions directly. Fixes build on NetBSD current. Add DESTDIR support. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- vbetool.c.orig 2006-07-26 03:27:21.000000000 +0200 d5 1 a5 10 @@@@ -8,19 +8,39 @@@@ This program is released under the terms version 2 */ -#include #include +#include #include #include #include @ 1.3 log @outb args are swapped between NetBSD and linux... found by jmcneill@@. Bump PKGREVISION. @ text @d4 2 a5 2 +++ vbetool.c 2007-08-08 19:07:18.000000000 +0200 @@@@ -8,19 +8,29 @@@@ a26 1 +#include d29 13 a41 2 +/* out* arguments are swapped between NetBSD and linux */ +#define __outb(v, p) outb((p), (v)) d46 1 a46 1 @@@@ -42,8 +52,16 @@@@ d63 1 a63 1 @@@@ -256,7 +274,9 @@@@ d73 1 a73 1 @@@@ -476,23 +496,25 @@@@ d88 4 a91 4 + __outb(0x03 | inb(0x3CC), 0x3C2); + __outb(0x01 | inb(0x3C3), 0x3C3); + __outb(0x08 | inb(0x46e8), 0x46e8); + __outb(0x01 | inb(0x102), 0x102); d100 4 a103 4 + __outb(~0x03 & inb(0x3CC), 0x3C2); + __outb(~0x01 & inb(0x3C3), 0x3C3); + __outb(~0x08 & inb(0x46e8), 0x46e8); + __outb(~0x01 & inb(0x102), 0x102); @ 1.2 log @Make this work on amd64, verified running "vbetool post". @ text @d4 2 a5 2 +++ vbetool.c 2007-08-08 14:27:44.000000000 +0200 @@@@ -8,19 +8,26 @@@@ d30 3 d36 1 a36 1 @@@@ -42,8 +49,16 @@@@ d53 1 a53 1 @@@@ -256,7 +271,9 @@@@ d63 1 a63 1 @@@@ -476,7 +493,9 @@@@ d73 24 @ 1.1 log @Initial revision @ text @d3 2 a4 2 --- vbetool.c.orig 2007-08-08 13:30:13.000000000 +0200 +++ vbetool.c 2007-08-08 13:32:10.000000000 +0200 d33 1 a33 1 @@@@ -42,8 +49,12 @@@@ d38 1 d40 3 d50 1 a50 1 @@@@ -256,7 +267,9 @@@@ d60 1 a60 1 @@@@ -476,7 +489,9 @@@@ @ 1.1.1.1 log @vbetool uses lrmi in order to run code from the video BIOS. Currently, it is able to alter DPMS states, save/restore video card state and attempt to initialize the video card from scratch. -- Requested by jmcneill@@. @ text @@