head 1.3; access; symbols pkgsrc-2023Q3:1.2.0.88 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.86 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.84 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.82 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.80 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.78 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.76 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.74 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.72 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.70 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.68 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.66 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.64 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.60 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.40 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.62 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.58 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.56 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.54 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.52 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.50 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.48 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.46 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.44 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.42 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.38 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.36 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.34 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.32 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.30 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.28 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.26 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.24 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.22 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.20 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.18 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.16 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.14 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.12 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.10 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.8 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.6 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.4 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.2 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.1.0.56 pkgsrc-2012Q3-base:1.1 pkgsrc-2012Q2:1.1.0.54 pkgsrc-2012Q2-base:1.1 pkgsrc-2012Q1:1.1.0.52 pkgsrc-2012Q1-base:1.1 pkgsrc-2011Q4:1.1.0.50 pkgsrc-2011Q4-base:1.1 pkgsrc-2011Q3:1.1.0.48 pkgsrc-2011Q3-base:1.1 pkgsrc-2011Q2:1.1.0.46 pkgsrc-2011Q2-base:1.1 pkgsrc-2011Q1:1.1.0.44 pkgsrc-2011Q1-base:1.1 pkgsrc-2010Q4:1.1.0.42 pkgsrc-2010Q4-base:1.1 pkgsrc-2010Q3:1.1.0.40 pkgsrc-2010Q3-base:1.1 pkgsrc-2010Q2:1.1.0.38 pkgsrc-2010Q2-base:1.1 pkgsrc-2010Q1:1.1.0.36 pkgsrc-2010Q1-base:1.1 pkgsrc-2009Q4:1.1.0.34 pkgsrc-2009Q4-base:1.1 pkgsrc-2009Q3:1.1.0.32 pkgsrc-2009Q3-base:1.1 pkgsrc-2009Q2:1.1.0.30 pkgsrc-2009Q2-base:1.1 pkgsrc-2009Q1:1.1.0.28 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.26 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.24 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.22 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.20 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.18 pkgsrc-2008Q1:1.1.0.16 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.14 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.12 pkgsrc-2007Q3-base:1.1 pkgsrc-2007Q2:1.1.0.10 pkgsrc-2007Q2-base:1.1 pkgsrc-2007Q1:1.1.0.8 pkgsrc-2007Q1-base:1.1 pkgsrc-2006Q4:1.1.0.6 pkgsrc-2006Q4-base:1.1 pkgsrc-2006Q3:1.1.0.4 pkgsrc-2006Q3-base:1.1 pkgsrc-2006Q2:1.1.0.2 pkgsrc-2006Q2-base:1.1; locks; strict; comment @# @; 1.3 date 2023.11.10.14.41.44; author wiz; state dead; branches; next 1.2; commitid w52ooOFkxuJ4A4ME; 1.2 date 2012.12.24.21.13.28; author joerg; state Exp; branches; next 1.1; 1.1 date 2006.04.26.01.52.18; author wulf; state Exp; branches; next ; desc @@ 1.3 log @gmfsk: remove dead upstream since 2004, uses gnome 2. @ text @$NetBSD: patch-aa,v 1.2 2012/12/24 21:13:28 joerg Exp $ --- src/misc/misc.h.orig 2004-04-13 12:45:19.000000000 +0000 +++ src/misc/misc.h @@@@ -32,7 +32,7 @@@@ /* * Hamming weight (number of bits that are ones). */ -extern inline unsigned int hweight32(unsigned int w) +__attribute__((gnu_inline)) extern inline unsigned int hweight32(unsigned int w) { w = (w & 0x55555555) + ((w >> 1) & 0x55555555); w = (w & 0x33333333) + ((w >> 2) & 0x33333333); @@@@ -42,7 +42,7 @@@@ extern inline unsigned int hweight32(uns return w; } -extern inline unsigned int hweight16(unsigned short w) +__attribute__((gnu_inline)) extern inline unsigned int hweight16(unsigned short w) { w = (w & 0x5555) + ((w >> 1) & 0x5555); w = (w & 0x3333) + ((w >> 2) & 0x3333); @@@@ -51,7 +51,7 @@@@ extern inline unsigned int hweight16(uns return w; } -extern inline unsigned int hweight8(unsigned char w) +__attribute__((gnu_inline)) extern inline unsigned int hweight8(unsigned char w) { w = (w & 0x55) + ((w >> 1) & 0x55); w = (w & 0x33) + ((w >> 2) & 0x33); @@@@ -64,7 +64,7 @@@@ extern inline unsigned int hweight8(unsi /* * Parity function. Return one if `w' has odd number of ones, zero otherwise. */ -extern inline int parity(unsigned int w) +__attribute__((gnu_inline)) extern inline int parity(unsigned int w) { return hweight32(w) & 1; } @@@@ -74,7 +74,7 @@@@ extern inline int parity(unsigned int w) /* * Reverse order of bits. */ -extern inline unsigned int rbits32(unsigned int w) +__attribute__((gnu_inline)) extern inline unsigned int rbits32(unsigned int w) { w = ((w >> 1) & 0x55555555) | ((w << 1) & 0xAAAAAAAA); w = ((w >> 2) & 0x33333333) | ((w << 2) & 0xCCCCCCCC); @@@@ -84,7 +84,7 @@@@ extern inline unsigned int rbits32(unsig return w; } -extern inline unsigned short rbits16(unsigned short w) +__attribute__((gnu_inline)) extern inline unsigned short rbits16(unsigned short w) { w = ((w >> 1) & 0x5555) | ((w << 1) & 0xAAAA); w = ((w >> 2) & 0x3333) | ((w << 2) & 0xCCCC); @@@@ -93,7 +93,7 @@@@ extern inline unsigned short rbits16(uns return w; } -extern inline unsigned char rbits8(unsigned char w) +__attribute__((gnu_inline)) extern inline unsigned char rbits8(unsigned char w) { w = ((w >> 1) & 0x55) | ((w << 1) & 0xFF); w = ((w >> 2) & 0x33) | ((w << 2) & 0xCC); @@@@ -104,28 +104,9 @@@@ extern inline unsigned char rbits8(unsig /* ---------------------------------------------------------------------- */ /* - * Integer base-2 logarithm - */ -extern inline int log2(unsigned int x) -{ - int y = 0; - - x >>= 1; - - while (x) { - x >>= 1; - y++; - } - - return y; -} - -/* ---------------------------------------------------------------------- */ - -/* * Gray encoding and decoding (8 bit) */ -extern inline unsigned char grayencode(unsigned char data) +__attribute__((gnu_inline)) extern inline unsigned char grayencode(unsigned char data) { unsigned char bits = data; @@@@ -140,7 +121,7 @@@@ extern inline unsigned char grayencode(u return bits; } -extern inline unsigned char graydecode(unsigned char data) +__attribute__((gnu_inline)) extern inline unsigned char graydecode(unsigned char data) { return data ^ (data >> 1); } @@@@ -150,7 +131,7 @@@@ extern inline unsigned char graydecode(u /* * Hamming window function */ -extern inline double hamming(double x) +__attribute__((gnu_inline)) extern inline double hamming(double x) { return 0.54 - 0.46 * cos(2 * M_PI * x); } @@@@ -160,26 +141,26 @@@@ extern inline double hamming(double x) /* * Sinc etc... */ -extern inline double sinc(double x) +__attribute__((gnu_inline)) extern inline double sinc(double x) { return (fabs(x) < 1e-10) ? 1.0 : (sin(M_PI * x) / (M_PI * x)); } -extern inline double cosc(double x) +__attribute__((gnu_inline)) extern inline double cosc(double x) { return (fabs(x) < 1e-10) ? 0.0 : ((1.0 - cos(M_PI * x)) / (M_PI * x)); } /* ---------------------------------------------------------------------- */ -extern inline float clamp(float x, float min, float max) +__attribute__((gnu_inline)) extern inline float clamp(float x, float min, float max) { return (x < min) ? min : ((x > max) ? max : x); } /* ---------------------------------------------------------------------- */ -extern inline float decayavg(float average, float input, float weight) +__attribute__((gnu_inline)) extern inline float decayavg(float average, float input, float weight) { return input * (1.0 / weight) + average * (1.0 - (1.0 / weight)); } @ 1.2 log @Fix inline usage. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2006/04/26 01:52:18 wulf Exp $ @ 1.1 log @Updated ham/gmfsk to 0.6nb7: Fixed build problem caused by definition of log2() function in misc.c and several compiler warnings. @ text @d1 1 a1 1 $NetBSD$ d3 66 a68 3 --- src/misc/misc.h.orig 2006-04-26 10:32:02.000000000 +0930 +++ src/misc/misc.h 2006-04-26 10:31:20.000000000 +0930 @@@@ -104,25 +104,6 @@@@ d93 54 a146 1 extern inline unsigned char grayencode(unsigned char data) @