head 1.5; access; symbols pkgsrc-2026Q1:1.5.0.30 pkgsrc-2026Q1-base:1.5 pkgsrc-2025Q4:1.5.0.28 pkgsrc-2025Q4-base:1.5 pkgsrc-2025Q3:1.5.0.26 pkgsrc-2025Q3-base:1.5 pkgsrc-2025Q2:1.5.0.24 pkgsrc-2025Q2-base:1.5 pkgsrc-2025Q1:1.5.0.22 pkgsrc-2025Q1-base:1.5 pkgsrc-2024Q4:1.5.0.20 pkgsrc-2024Q4-base:1.5 pkgsrc-2024Q3:1.5.0.18 pkgsrc-2024Q3-base:1.5 pkgsrc-2024Q2:1.5.0.16 pkgsrc-2024Q2-base:1.5 pkgsrc-2024Q1:1.5.0.14 pkgsrc-2024Q1-base:1.5 pkgsrc-2023Q4:1.5.0.12 pkgsrc-2023Q4-base:1.5 pkgsrc-2023Q3:1.5.0.10 pkgsrc-2023Q3-base:1.5 pkgsrc-2023Q2:1.5.0.8 pkgsrc-2023Q2-base:1.5 pkgsrc-2023Q1:1.5.0.6 pkgsrc-2023Q1-base:1.5 pkgsrc-2022Q4:1.5.0.4 pkgsrc-2022Q4-base:1.5 pkgsrc-2022Q3:1.5.0.2 pkgsrc-2022Q3-base:1.5 pkgsrc-2022Q2:1.4.0.110 pkgsrc-2022Q2-base:1.4 pkgsrc-2022Q1:1.4.0.108 pkgsrc-2022Q1-base:1.4 pkgsrc-2021Q4:1.4.0.106 pkgsrc-2021Q4-base:1.4 pkgsrc-2021Q3:1.4.0.104 pkgsrc-2021Q3-base:1.4 pkgsrc-2021Q2:1.4.0.102 pkgsrc-2021Q2-base:1.4 pkgsrc-2021Q1:1.4.0.100 pkgsrc-2021Q1-base:1.4 pkgsrc-2020Q4:1.4.0.98 pkgsrc-2020Q4-base:1.4 pkgsrc-2020Q3:1.4.0.96 pkgsrc-2020Q3-base:1.4 pkgsrc-2020Q2:1.4.0.92 pkgsrc-2020Q2-base:1.4 pkgsrc-2020Q1:1.4.0.72 pkgsrc-2020Q1-base:1.4 pkgsrc-2019Q4:1.4.0.94 pkgsrc-2019Q4-base:1.4 pkgsrc-2019Q3:1.4.0.90 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.88 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.86 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.84 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.82 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.80 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.78 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.76 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.74 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.4.0.70 pkgsrc-2017Q2-base:1.4 pkgsrc-2017Q1:1.4.0.68 pkgsrc-2017Q1-base:1.4 pkgsrc-2016Q4:1.4.0.66 pkgsrc-2016Q4-base:1.4 pkgsrc-2016Q3:1.4.0.64 pkgsrc-2016Q3-base:1.4 pkgsrc-2016Q2:1.4.0.62 pkgsrc-2016Q2-base:1.4 pkgsrc-2016Q1:1.4.0.60 pkgsrc-2016Q1-base:1.4 pkgsrc-2015Q4:1.4.0.58 pkgsrc-2015Q4-base:1.4 pkgsrc-2015Q3:1.4.0.56 pkgsrc-2015Q3-base:1.4 pkgsrc-2015Q2:1.4.0.54 pkgsrc-2015Q2-base:1.4 pkgsrc-2015Q1:1.4.0.52 pkgsrc-2015Q1-base:1.4 pkgsrc-2014Q4:1.4.0.50 pkgsrc-2014Q4-base:1.4 pkgsrc-2014Q3:1.4.0.48 pkgsrc-2014Q3-base:1.4 pkgsrc-2014Q2:1.4.0.46 pkgsrc-2014Q2-base:1.4 pkgsrc-2014Q1:1.4.0.44 pkgsrc-2014Q1-base:1.4 pkgsrc-2013Q4:1.4.0.42 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.40 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.38 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.36 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.34 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.32 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.30 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.4.0.28 pkgsrc-2012Q1-base:1.4 pkgsrc-2011Q4:1.4.0.26 pkgsrc-2011Q4-base:1.4 pkgsrc-2011Q3:1.4.0.24 pkgsrc-2011Q3-base:1.4 pkgsrc-2011Q2:1.4.0.22 pkgsrc-2011Q2-base:1.4 pkgsrc-2011Q1:1.4.0.20 pkgsrc-2011Q1-base:1.4 pkgsrc-2010Q4:1.4.0.18 pkgsrc-2010Q4-base:1.4 pkgsrc-2010Q3:1.4.0.16 pkgsrc-2010Q3-base:1.4 pkgsrc-2010Q2:1.4.0.14 pkgsrc-2010Q2-base:1.4 pkgsrc-2010Q1:1.4.0.12 pkgsrc-2010Q1-base:1.4 pkgsrc-2009Q4:1.4.0.10 pkgsrc-2009Q4-base:1.4 pkgsrc-2009Q3:1.4.0.8 pkgsrc-2009Q3-base:1.4 pkgsrc-2009Q2:1.4.0.6 pkgsrc-2009Q2-base:1.4 pkgsrc-2009Q1:1.4.0.4 pkgsrc-2009Q1-base:1.4 pkgsrc-2008Q4:1.4.0.2 pkgsrc-2008Q4-base:1.4 pkgsrc-2008Q3:1.3.0.12 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.10 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.8 pkgsrc-2008Q2-base:1.3 cwrapper:1.3.0.6 pkgsrc-2008Q1:1.3.0.4 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.2 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.1.1.1.0.22 pkgsrc-2007Q3-base:1.1.1.1 pkgsrc-2007Q2:1.1.1.1.0.20 pkgsrc-2007Q2-base:1.1.1.1 pkgsrc-2007Q1:1.1.1.1.0.18 pkgsrc-2007Q1-base:1.1.1.1 pkgsrc-2006Q4:1.1.1.1.0.16 pkgsrc-2006Q4-base:1.1.1.1 pkgsrc-2006Q3:1.1.1.1.0.14 pkgsrc-2006Q3-base:1.1.1.1 pkgsrc-2006Q2:1.1.1.1.0.12 pkgsrc-2006Q2-base:1.1.1.1 pkgsrc-2006Q1:1.1.1.1.0.10 pkgsrc-2006Q1-base:1.1.1.1 pkgsrc-2005Q4:1.1.1.1.0.8 pkgsrc-2005Q4-base:1.1.1.1 pkgsrc-2005Q3:1.1.1.1.0.6 pkgsrc-2005Q3-base:1.1.1.1 pkgsrc-2005Q2:1.1.1.1.0.4 pkgsrc-2005Q2-base:1.1.1.1 pkgsrc-2005Q1:1.1.1.1.0.2 pkgsrc-2005Q1-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2022.08.22.17.23.36; author tnn; state Exp; branches; next 1.4; commitid xSgwXw7mW1crMTQD; 1.4 date 2008.12.30.20.25.54; author hasso; state Exp; branches; next 1.3; 1.3 date 2007.12.18.20.45.49; author rumble; state Exp; branches; next 1.2; 1.2 date 2007.12.18.17.03.35; author rumble; state Exp; branches; next 1.1; 1.1 date 2005.01.24.15.07.35; author jmcneill; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2005.01.24.15.07.35; author jmcneill; state Exp; branches; next ; desc @@ 1.5 log @radeontool: use sysconf(3) instead of non-portable PAGE_SIZE macro @ text @$NetBSD: patch-aa,v 1.4 2008/12/30 20:25:54 hasso Exp $ --- radeontool.c.orig 2004-02-11 03:50:27.000000000 +0000 +++ radeontool.c @@@@ -21,12 +21,12 @@@@ #include #include #include -#include #include "radeon_reg.h" int debug; int skip; +long page_size; /* *radeon_cntl_mem is mapped to the actual device's memory mapped control area. */ /* Not the address but what it points to is volatile. */ @@@@ -94,11 +94,11 @@@@ static unsigned char * map_devince_memor } /* mmap graphics memory */ - if ((device_mem = malloc(length + (PAGE_SIZE-1))) == NULL) { + if ((device_mem = malloc(length + (page_size-1))) == NULL) { fatal("allocation error \n"); } - if ((unsigned long)device_mem % PAGE_SIZE) - device_mem += PAGE_SIZE - ((unsigned long)device_mem % PAGE_SIZE); + if ((unsigned long)device_mem % page_size) + device_mem += page_size - ((unsigned long)device_mem % page_size); device_mem = (unsigned char *)mmap( (caddr_t)device_mem, length, @@@@ -107,7 +107,7 @@@@ static unsigned char * map_devince_memor mem_fd, base ); - if ((long)device_mem < 0) { + if (device_mem == MAP_FAILED) { if(debug) fprintf(stderr,"mmap returned %d\n",(int)device_mem); fatal("mmap error \n"); @@@@ -251,7 +251,6 @@@@ static void map_radeon_cntl_mem(void) } else if(forkrc == 0) { /* if child */ close(pipefd[0]); dup2(pipefd[1],1); /* stdout */ - setenv("PATH","/sbin:/usr/sbin:/bin:/usr/bin",1); execlp("lspci","lspci","-v",NULL); fatal("exec lspci failure\n"); } @@@@ -307,7 +306,13 @@@@ We need to look through it to find the s } if(debug) printf("%s",line); - if(strstr(line,"emory") && strstr(line,"K")) { /* if line contains a "Memory" and "K" string */ + if(strstr(line,"emory") && +#ifdef __NetBSD__ + strstr(line,"non-prefetch")) +#else + strstr(line,"K")) +#endif + { /* if line contains a "Memory" and "K" string */ break; } }; @@@@ -321,6 +326,10 @@@@ We need to look through it to find the s int main(int argc,char *argv[]) { + if ((page_size = sysconf(_SC_PAGESIZE)) == -1) { + fatal("sysconf failed\n"); + } + if(argc == 1) { map_radeon_cntl_mem(); usage(); @ 1.4 log @Make it build on DragonFly. @ text @d1 4 a4 4 $NetBSD: patch-aa,v 1.3 2007/12/18 20:45:49 rumble Exp $ --- radeontool.c.orig 2004-02-11 05:50:27 +0200 +++ radeontool.c 2008-12-30 21:47:53 +0200 @@@@ -21,7 +21,19 @@@@ d8 1 a8 13 +#ifdef __NetBSD__ +#include +#if __NetBSD_Prereq__(4,99,32) +#include +#else +#include +#endif +#include +#elif defined(__DragonFly__) +#include +#else /* ! __NetBSD__ */ #include +#endif d12 22 a33 1 @@@@ -107,7 +119,7 @@@@ static unsigned char * map_devince_memor d42 1 a42 1 @@@@ -251,7 +263,6 @@@@ static void map_radeon_cntl_mem(void) d50 1 a50 1 @@@@ -307,7 +318,13 @@@@ We need to look through it to find the s d65 11 @ 1.3 log @The mmap error condition is MAP_FAILED, not necessarily pointer < 0. Now it not only builds, but works again on my laptop. @ text @d1 4 a4 4 $NetBSD$ --- radeontool.c.orig 2007-12-17 21:35:53.000000000 -0500 +++ radeontool.c 2007-12-18 15:38:46.000000000 -0500 @@@@ -21,7 +21,17 @@@@ d16 2 d24 1 a24 1 @@@@ -107,7 +117,7 @@@@ d33 1 a33 1 @@@@ -251,7 +261,6 @@@@ d41 1 a41 1 @@@@ -307,7 +316,13 @@@@ @ 1.2 log @On NetBSD-current (approximately >= 4.99.32) requires rather than . Conditionally include the appropriate file so this compiles again. @ text @d3 1 a3 1 +++ radeontool.c 2007-12-17 21:42:16.000000000 -0500 d22 9 @ 1.1 log @Initial revision @ text @d2 3 a4 3 --- radeontool.c.orig 2005-01-24 10:39:22.000000000 -0400 +++ radeontool.c 2005-01-24 10:41:49.000000000 -0400 @@@@ -21,7 +21,12 @@@@ d9 4 d14 1 d16 1 a16 1 +#else d22 1 a22 1 @@@@ -251,7 +256,6 @@@@ d30 1 a30 1 @@@@ -307,7 +311,13 @@@@ @ 1.1.1.1 log @Import radeontool-1.5. Radeontool can turn off and on the backlight and external video output. Radeontool requires lspci. @ text @@