pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
alsa-lib-git: add some proposed patches for better portability (types)
Module Name: pkgsrc-wip
Committed By: Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By: wiz
Date: Mon Feb 29 16:06:17 2016 +0100
Changeset: 663221b09cb169286ec70bae2ec3b69d9f3741be
Modified Files:
alsa-lib-git/Makefile
alsa-lib-git/distinfo
alsa-lib-git/patches/patch-ah
alsa-lib-git/patches/patch-ar
alsa-lib-git/patches/patch-au
alsa-lib-git/patches/patch-aw
alsa-lib-git/patches/patch-ba
alsa-lib-git/patches/patch-bb
alsa-lib-git/patches/patch-include_pcm.h
alsa-lib-git/patches/patch-include_sound_asoc.h
alsa-lib-git/patches/patch-include_sound_asound.h
Added Files:
alsa-lib-git/patches/patch-src_pcm_interval.c
alsa-lib-git/patches/patch-src_pcm_mask__inline.h
alsa-lib-git/patches/patch-src_pcm_plugin__ops.h
Log Message:
alsa-lib-git: add some proposed patches for better portability (types)
Sent upstream.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=663221b09cb169286ec70bae2ec3b69d9f3741be
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
alsa-lib-git/Makefile | 2 -
alsa-lib-git/distinfo | 21 +-
alsa-lib-git/patches/patch-ah | 99 ++++++-
alsa-lib-git/patches/patch-ar | 56 +++-
alsa-lib-git/patches/patch-au | 11 +-
alsa-lib-git/patches/patch-aw | 147 +++++++++-
alsa-lib-git/patches/patch-ba | 20 +-
alsa-lib-git/patches/patch-bb | 11 +-
alsa-lib-git/patches/patch-include_pcm.h | 17 +-
alsa-lib-git/patches/patch-include_sound_asoc.h | 298 +++++++++++++++++++-
alsa-lib-git/patches/patch-include_sound_asound.h | 23 +-
alsa-lib-git/patches/patch-src_pcm_interval.c | 22 ++
alsa-lib-git/patches/patch-src_pcm_mask__inline.h | 31 +++
alsa-lib-git/patches/patch-src_pcm_plugin__ops.h | 320 ++++++++++++++++++++++
14 files changed, 1037 insertions(+), 41 deletions(-)
diffs:
diff --git a/alsa-lib-git/Makefile b/alsa-lib-git/Makefile
index 1955048..630948b 100644
--- a/alsa-lib-git/Makefile
+++ b/alsa-lib-git/Makefile
@@ -26,8 +26,6 @@ CONFIGURE_ARGS+= --disable-python
LIBS.SunOS+= -lsocket -lnsl
CPPFLAGS.SunOS+= -std=c99 -D_POSIX_C_SOURCE=200112L
CPPFLAGS.SunOS+= -D__EXTENSIONS__ -DBSD_COMP -DMAP_FILE=0
-CPPFLAGS.SunOS+= -Du_int8_t=uint8_t -Du_int16_t=uint16_t
-CPPFLAGS.SunOS+= -Du_int32_t=uint32_t -Du_int64_t=uint64_t
CPPFLAGS.SunOS+= -D__u32=uint32_t -D__u64=uint64_t
CPPFLAGS.SunOS+= -Dbswap_64=BSWAP_64 -Dbswap_32=BSWAP_32 -Dbswap_16=BSWAP_16
diff --git a/alsa-lib-git/distinfo b/alsa-lib-git/distinfo
index c9d5c4d..93f7c0e 100644
--- a/alsa-lib-git/distinfo
+++ b/alsa-lib-git/distinfo
@@ -7,23 +7,23 @@ Size (alsa-lib-1.1.0.tar.bz2) = 929874 bytes
SHA1 (patch-ad) = 43b9a214626bac91cf5b9afb19b6785b100fd7de
SHA1 (patch-ae) = d4555043215e1868172a2defd60d52801f4a633c
SHA1 (patch-af) = b5d0a48da183c0725367b08abb24bf1fed85cb30
-SHA1 (patch-ah) = 4dd4e27d0dfb6cedf79775b6d01a0b8c6617cdf0
+SHA1 (patch-ah) = 669fcad18f5c0b737cf3eb7c6f93db4bc34647d9
SHA1 (patch-ai) = 9eb6c61d013f187267c40fdd4f1f466704507619
SHA1 (patch-aj) = 82a5b4cf2501c94d4cc5e3275078d84ded1e7a79
SHA1 (patch-ak) = 39a782c8882a86226f18137d33c70a3736c48cc6
SHA1 (patch-am) = 7b5cf015ec0612c1c4a9a864d42d84bba7a78e47
SHA1 (patch-ap) = 3a3c8316b56997052d27f084ed178acbc49d1b17
SHA1 (patch-aq) = 4cfecee96f04bd6efa5c8078916672b0b9623fa4
-SHA1 (patch-ar) = 8823c573ac4f6ce038b1067f71a8de91e73bea20
+SHA1 (patch-ar) = 2908257e428532aee69f6207dc70f119fe31230b
SHA1 (patch-at) = 831c8b94e079a33057effcbee7113dfc3ca5533e
-SHA1 (patch-au) = 3dbf68b4ad655f2b2c91dcce8ca5daac6e80a361
+SHA1 (patch-au) = f0ff8eeca6e00213384d7b2ecb21c8cf9335679d
SHA1 (patch-av) = 5f145c3755bf510be6fb101e30d40e10b8dcbd6d
-SHA1 (patch-aw) = dfad5799001f9e1de7f5892b9a89bc4b6defd9e9
+SHA1 (patch-aw) = 2c6a1183aacf37f7d22be8767d018537b8a25673
SHA1 (patch-ax) = cab065c0b4fb697e21c058b3be1fc1665692ffd3
SHA1 (patch-ay) = 9a4d25acf7e15a8b9a592583305500c7f4465b56
SHA1 (patch-az) = 6cc7e6b94dd7c0a638e5c714718b970d2972669d
-SHA1 (patch-ba) = ab5b3fbd497e29c9b1e548e3f510fce7b994f5f3
-SHA1 (patch-bb) = 300c18e806b090cbe6dca1f133bbaace9625fb91
+SHA1 (patch-ba) = 385c98b30caeebf06aec15c53696bf74cf9ce17a
+SHA1 (patch-bb) = ce9e7a4e4c1254fd9d0100d73f38c8b072240365
SHA1 (patch-bf) = 10588dd9f8faac208b8f314676558c2c7da12063
SHA1 (patch-bg) = 29c0fb6c1fb6a11e7f42778bdd965b9d25ddfd0c
SHA1 (patch-bh) = a64e54b14946697fdc15b274238851fe8bd32106
@@ -32,12 +32,15 @@ SHA1 (patch-bj) = 5b7a36747e57e41eddb05cd1b1d9771a36b0c4f7
SHA1 (patch-bk) = 55754e4d0ac947c2e7e59b604a21fb5798ae5b39
SHA1 (patch-configure.ac) = 1c245e2ccd1a71f93847f0f2efab5e0b0c5c46b9
SHA1 (patch-include_iatomic.h) = 7096f31a6b38c10b2e11a907f8431d33d98cce94
-SHA1 (patch-include_pcm.h) = 9558c5f5c80276632d27e0278cd33ee77d8281a5
-SHA1 (patch-include_sound_asoc.h) = d5c274e838f70c22c9e0ba94ef7b7db6f4310e74
-SHA1 (patch-include_sound_asound.h) = dc11957bc69f59a86284afc81c7719b3a955f7ad
+SHA1 (patch-include_pcm.h) = 2a6d970c021818260bba7932fd1be3e8b803997a
+SHA1 (patch-include_sound_asoc.h) = 2102832267b5f7f1433852ea25cd4a652ede41e6
+SHA1 (patch-include_sound_asound.h) = ae8f9e746cc1862278fbd7d925d928c93e0a4208
SHA1 (patch-src_conf.c) = 27795c60a05ced40c42dbfb474eed88f3b284cc6
SHA1 (patch-src_control_control__hw.c) = 07cfe3abe586b32f6b989403cd162599da07e865
+SHA1 (patch-src_pcm_interval.c) = 66bc1a09ac6dca1dd14f3f1a8ee336f2c1982af5
+SHA1 (patch-src_pcm_mask__inline.h) = 7fe12d952fa16ab1cf03d2732adb54d19429928c
SHA1 (patch-src_pcm_pcm__mmap.c) = 2d0f05aa53b30cef1ec083aa4f5d559d0a679058
+SHA1 (patch-src_pcm_plugin__ops.h) = db4ad184ff368b42acd389b824bcd27c54a8cea9
SHA1 (patch-src_seq_seq__midi__event.c) = 2a5de492d6ca19a0f0c564e8f5a065e5fc57ea5c
SHA1 (patch-src_shmarea.c) = d6d0876ae7911ff16138bb82a3b1c79e795218cf
SHA1 (patch-src_topology_tplg__local.h) = 121d138c68b9c1832c4b3cf2f0f24c72623dbce0
diff --git a/alsa-lib-git/patches/patch-ah b/alsa-lib-git/patches/patch-ah
index a4cecce..b41e24d 100644
--- a/alsa-lib-git/patches/patch-ah
+++ b/alsa-lib-git/patches/patch-ah
@@ -1,6 +1,6 @@
$NetBSD: patch-ah,v 1.3 2014/06/09 12:21:07 ryoon Exp $
---- src/pcm/pcm.c.orig 2013-07-08 12:31:36.000000000 +0000
+--- src/pcm/pcm.c.orig 2016-02-24 08:33:29.000000000 +0000
+++ src/pcm/pcm.c
@@ -630,7 +630,7 @@ playback devices.
@@ -11,3 +11,100 @@ $NetBSD: patch-ah,v 1.3 2014/06/09 12:21:07 ryoon Exp $
#include <stdarg.h>
#include <signal.h>
#include <ctype.h>
+@@ -2584,7 +2584,7 @@ int snd_pcm_area_silence(const snd_pcm_c
+ char *dst;
+ unsigned int dst_step;
+ int width;
+- u_int64_t silence;
++ uint64_t silence;
+ if (!dst_area->addr)
+ return 0;
+ dst = snd_pcm_channel_area_addr(dst_area, dst_offset);
+@@ -2592,7 +2592,7 @@ int snd_pcm_area_silence(const snd_pcm_c
+ silence = snd_pcm_format_silence_64(format);
+ if (dst_area->step == (unsigned int) width) {
+ unsigned int dwords = samples * width / 64;
+- u_int64_t *dstp = (u_int64_t *)dst;
++ uint64_t *dstp = (uint64_t *)dst;
+ samples -= dwords * 64 / width;
+ while (dwords-- > 0)
+ *dstp++ = silence;
+@@ -2602,8 +2602,8 @@ int snd_pcm_area_silence(const snd_pcm_c
+ dst_step = dst_area->step / 8;
+ switch (width) {
+ case 4: {
+- u_int8_t s0 = silence & 0xf0;
+- u_int8_t s1 = silence & 0x0f;
++ uint8_t s0 = silence & 0xf0;
++ uint8_t s1 = silence & 0x0f;
+ int dstbit = dst_area->first % 8;
+ int dstbit_step = dst_area->step % 8;
+ while (samples-- > 0) {
+@@ -2624,7 +2624,7 @@ int snd_pcm_area_silence(const snd_pcm_c
+ break;
+ }
+ case 8: {
+- u_int8_t sil = silence;
++ uint8_t sil = silence;
+ while (samples-- > 0) {
+ *dst = sil;
+ dst += dst_step;
+@@ -2632,9 +2632,9 @@ int snd_pcm_area_silence(const snd_pcm_c
+ break;
+ }
+ case 16: {
+- u_int16_t sil = silence;
++ uint16_t sil = silence;
+ while (samples-- > 0) {
+- *(u_int16_t*)dst = sil;
++ *(uint16_t*)dst = sil;
+ dst += dst_step;
+ }
+ break;
+@@ -2651,16 +2651,16 @@ int snd_pcm_area_silence(const snd_pcm_c
+ #endif
+ break;
+ case 32: {
+- u_int32_t sil = silence;
++ uint32_t sil = silence;
+ while (samples-- > 0) {
+- *(u_int32_t*)dst = sil;
++ *(uint32_t*)dst = sil;
+ dst += dst_step;
+ }
+ break;
+ }
+ case 64: {
+ while (samples-- > 0) {
+- *(u_int64_t*)dst = silence;
++ *(uint64_t*)dst = silence;
+ dst += dst_step;
+ }
+ break;
+@@ -2804,7 +2804,7 @@ int snd_pcm_area_copy(const snd_pcm_chan
+ }
+ case 16: {
+ while (samples-- > 0) {
+- *(u_int16_t*)dst = *(const u_int16_t*)src;
++ *(uint16_t*)dst = *(const uint16_t*)src;
+ src += src_step;
+ dst += dst_step;
+ }
+@@ -2821,7 +2821,7 @@ int snd_pcm_area_copy(const snd_pcm_chan
+ break;
+ case 32: {
+ while (samples-- > 0) {
+- *(u_int32_t*)dst = *(const u_int32_t*)src;
++ *(uint32_t*)dst = *(const uint32_t*)src;
+ src += src_step;
+ dst += dst_step;
+ }
+@@ -2829,7 +2829,7 @@ int snd_pcm_area_copy(const snd_pcm_chan
+ }
+ case 64: {
+ while (samples-- > 0) {
+- *(u_int64_t*)dst = *(const u_int64_t*)src;
++ *(uint64_t*)dst = *(const uint64_t*)src;
+ src += src_step;
+ dst += dst_step;
+ }
diff --git a/alsa-lib-git/patches/patch-ar b/alsa-lib-git/patches/patch-ar
index ec63247..9be9a05 100644
--- a/alsa-lib-git/patches/patch-ar
+++ b/alsa-lib-git/patches/patch-ar
@@ -1,6 +1,6 @@
$NetBSD: patch-ar,v 1.4 2014/03/25 23:06:07 asau Exp $
---- src/pcm/pcm_iec958.c.orig 2008-10-29 08:42:10.000000000 -0400
+--- src/pcm/pcm_iec958.c.orig 2016-02-24 08:33:29.000000000 +0000
+++ src/pcm/pcm_iec958.c
@@ -26,7 +26,9 @@
*
@@ -12,3 +12,57 @@ $NetBSD: patch-ar,v 1.4 2014/03/25 23:06:07 asau Exp $
#include "pcm_local.h"
#include "pcm_plugin.h"
+@@ -102,7 +104,7 @@ static unsigned int iec958_parity(unsign
+ * 31 = parity
+ */
+
+-static inline u_int32_t iec958_subframe(snd_pcm_iec958_t *iec, u_int32_t data, int channel)
++static inline uint32_t iec958_subframe(snd_pcm_iec958_t *iec, uint32_t data, int channel)
+ {
+ unsigned int byte = iec->counter >> 3;
+ unsigned int mask = 1 << (iec->counter - (byte << 3));
+@@ -132,7 +134,7 @@ static inline u_int32_t iec958_subframe(
+ return data;
+ }
+
+-static inline int32_t iec958_to_s32(snd_pcm_iec958_t *iec, u_int32_t data)
++static inline int32_t iec958_to_s32(snd_pcm_iec958_t *iec, uint32_t data)
+ {
+ if (iec->byteswap)
+ data = bswap_32(data);
+@@ -155,7 +157,7 @@ static void snd_pcm_iec958_decode(snd_pc
+ void *put = put32_labels[iec->getput_idx];
+ unsigned int channel;
+ for (channel = 0; channel < channels; ++channel) {
+- const u_int32_t *src;
++ const uint32_t *src;
+ char *dst;
+ int src_step, dst_step;
+ snd_pcm_uframes_t frames1;
+@@ -163,7 +165,7 @@ static void snd_pcm_iec958_decode(snd_pc
+ const snd_pcm_channel_area_t *dst_area = &dst_areas[channel];
+ src = snd_pcm_channel_area_addr(src_area, src_offset);
+ dst = snd_pcm_channel_area_addr(dst_area, dst_offset);
+- src_step = snd_pcm_channel_area_step(src_area) / sizeof(u_int32_t);
++ src_step = snd_pcm_channel_area_step(src_area) / sizeof(uint32_t);
+ dst_step = snd_pcm_channel_area_step(dst_area);
+ frames1 = frames;
+ while (frames1-- > 0) {
+@@ -195,7 +197,7 @@ static void snd_pcm_iec958_encode(snd_pc
+ int counter = iec->counter;
+ for (channel = 0; channel < channels; ++channel) {
+ const char *src;
+- u_int32_t *dst;
++ uint32_t *dst;
+ int src_step, dst_step;
+ snd_pcm_uframes_t frames1;
+ const snd_pcm_channel_area_t *src_area = &src_areas[channel];
+@@ -203,7 +205,7 @@ static void snd_pcm_iec958_encode(snd_pc
+ src = snd_pcm_channel_area_addr(src_area, src_offset);
+ dst = snd_pcm_channel_area_addr(dst_area, dst_offset);
+ src_step = snd_pcm_channel_area_step(src_area);
+- dst_step = snd_pcm_channel_area_step(dst_area) / sizeof(u_int32_t);
++ dst_step = snd_pcm_channel_area_step(dst_area) / sizeof(uint32_t);
+ frames1 = frames;
+ iec->counter = counter;
+ while (frames1-- > 0) {
diff --git a/alsa-lib-git/patches/patch-au b/alsa-lib-git/patches/patch-au
index 3d37746..1a58024 100644
--- a/alsa-lib-git/patches/patch-au
+++ b/alsa-lib-git/patches/patch-au
@@ -1,6 +1,6 @@
$NetBSD: patch-au,v 1.4 2014/03/25 23:06:07 asau Exp $
---- src/pcm/pcm_linear.c.orig 2008-10-29 08:42:10.000000000 -0400
+--- src/pcm/pcm_linear.c.orig 2016-02-24 08:33:29.000000000 +0000
+++ src/pcm/pcm_linear.c
@@ -26,7 +26,9 @@
*
@@ -12,3 +12,12 @@ $NetBSD: patch-au,v 1.4 2014/03/25 23:06:07 asau Exp $
#include "pcm_local.h"
#include "pcm_plugin.h"
+@@ -183,7 +185,7 @@ void snd_pcm_linear_getput(const snd_pcm
+ void *get = get32_labels[get_idx];
+ void *put = put32_labels[put_idx];
+ unsigned int channel;
+- u_int32_t sample = 0;
++ uint32_t sample = 0;
+ for (channel = 0; channel < channels; ++channel) {
+ const char *src;
+ char *dst;
diff --git a/alsa-lib-git/patches/patch-aw b/alsa-lib-git/patches/patch-aw
index 3317476..a743eb1 100644
--- a/alsa-lib-git/patches/patch-aw
+++ b/alsa-lib-git/patches/patch-aw
@@ -1,7 +1,7 @@
$NetBSD: patch-aw,v 1.5 2014/03/25 23:06:07 asau Exp $
---- src/pcm/pcm_misc.c.orig 2008-10-29 14:42:10 +0200
-+++ src/pcm/pcm_misc.c 2008-12-21 17:08:14 +0200
+--- src/pcm/pcm_misc.c.orig 2016-02-24 08:33:29.000000000 +0000
++++ src/pcm/pcm_misc.c
@@ -23,7 +23,15 @@
#include <stdlib.h>
#include <unistd.h>
@@ -18,3 +18,146 @@ $NetBSD: patch-aw,v 1.5 2014/03/25 23:06:07 asau Exp $
#include "pcm_local.h"
+@@ -387,7 +395,7 @@ ssize_t snd_pcm_format_size(snd_pcm_form
+ * \param format Sample format
+ * \return silence 64 bit word
+ */
+-u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format)
++uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format)
+ {
+ switch (format) {
+ case SNDRV_PCM_FORMAT_S8:
+@@ -467,7 +475,7 @@ u_int64_t snd_pcm_format_silence_64(snd_
+ {
+ union {
+ float f[2];
+- u_int64_t i;
++ uint64_t i;
+ } u;
+ u.f[0] = u.f[1] = 0.0;
+ #ifdef SNDRV_LITTLE_ENDIAN
+@@ -480,7 +488,7 @@ u_int64_t snd_pcm_format_silence_64(snd_
+ {
+ union {
+ double f;
+- u_int64_t i;
++ uint64_t i;
+ } u;
+ u.f = 0.0;
+ #ifdef SNDRV_LITTLE_ENDIAN
+@@ -493,7 +501,7 @@ u_int64_t snd_pcm_format_silence_64(snd_
+ {
+ union {
+ float f[2];
+- u_int64_t i;
++ uint64_t i;
+ } u;
+ u.f[0] = u.f[1] = 0.0;
+ #ifdef SNDRV_LITTLE_ENDIAN
+@@ -506,7 +514,7 @@ u_int64_t snd_pcm_format_silence_64(snd_
+ {
+ union {
+ double f;
+- u_int64_t i;
++ uint64_t i;
+ } u;
+ u.f = 0.0;
+ #ifdef SNDRV_LITTLE_ENDIAN
+@@ -539,10 +547,10 @@ u_int64_t snd_pcm_format_silence_64(snd_
+ * \param format Sample format
+ * \return silence 32 bit word
+ */
+-u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format)
++uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format)
+ {
+ assert(snd_pcm_format_physical_width(format) <= 32);
+- return (u_int32_t)snd_pcm_format_silence_64(format);
++ return (uint32_t)snd_pcm_format_silence_64(format);
+ }
+
+ /**
+@@ -550,10 +558,10 @@ u_int32_t snd_pcm_format_silence_32(snd_
+ * \param format Sample format
+ * \return silence 16 bit word
+ */
+-u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format)
++uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format)
+ {
+ assert(snd_pcm_format_physical_width(format) <= 16);
+- return (u_int16_t)snd_pcm_format_silence_64(format);
++ return (uint16_t)snd_pcm_format_silence_64(format);
+ }
+
+ /**
+@@ -561,10 +569,10 @@ u_int16_t snd_pcm_format_silence_16(snd_
+ * \param format Sample format
+ * \return silence 8 bit word
+ */
+-u_int8_t snd_pcm_format_silence(snd_pcm_format_t format)
++uint8_t snd_pcm_format_silence(snd_pcm_format_t format)
+ {
+ assert(snd_pcm_format_physical_width(format) <= 8);
+- return (u_int8_t)snd_pcm_format_silence_64(format);
++ return (uint8_t)snd_pcm_format_silence_64(format);
+ }
+
+ /**
+@@ -580,7 +588,7 @@ int snd_pcm_format_set_silence(snd_pcm_f
+ return 0;
+ switch (snd_pcm_format_physical_width(format)) {
+ case 4: {
+- u_int8_t silence = snd_pcm_format_silence_64(format);
++ uint8_t silence = snd_pcm_format_silence_64(format);
+ unsigned int samples1;
+ if (samples % 2 != 0)
+ return -EINVAL;
+@@ -589,13 +597,13 @@ int snd_pcm_format_set_silence(snd_pcm_f
+ break;
+ }
+ case 8: {
+- u_int8_t silence = snd_pcm_format_silence_64(format);
++ uint8_t silence = snd_pcm_format_silence_64(format);
+ memset(data, silence, samples);
+ break;
+ }
+ case 16: {
+- u_int16_t silence = snd_pcm_format_silence_64(format);
+- u_int16_t *pdata = (u_int16_t *)data;
++ uint16_t silence = snd_pcm_format_silence_64(format);
++ uint16_t *pdata = (uint16_t *)data;
+ if (! silence)
+ memset(data, 0, samples * 2);
+ else {
+@@ -605,8 +613,8 @@ int snd_pcm_format_set_silence(snd_pcm_f
+ break;
+ }
+ case 24: {
+- u_int32_t silence = snd_pcm_format_silence_64(format);
+- u_int8_t *pdata = (u_int8_t *)data;
++ uint32_t silence = snd_pcm_format_silence_64(format);
++ uint8_t *pdata = (uint8_t *)data;
+ if (! silence)
+ memset(data, 0, samples * 3);
+ else {
+@@ -625,8 +633,8 @@ int snd_pcm_format_set_silence(snd_pcm_f
+ break;
+ }
+ case 32: {
+- u_int32_t silence = snd_pcm_format_silence_64(format);
+- u_int32_t *pdata = (u_int32_t *)data;
++ uint32_t silence = snd_pcm_format_silence_64(format);
++ uint32_t *pdata = (uint32_t *)data;
+ if (! silence)
+ memset(data, 0, samples * 4);
+ else {
+@@ -636,8 +644,8 @@ int snd_pcm_format_set_silence(snd_pcm_f
+ break;
+ }
+ case 64: {
+- u_int64_t silence = snd_pcm_format_silence_64(format);
+- u_int64_t *pdata = (u_int64_t *)data;
++ uint64_t silence = snd_pcm_format_silence_64(format);
++ uint64_t *pdata = (uint64_t *)data;
+ if (! silence)
+ memset(data, 0, samples * 8);
+ else {
diff --git a/alsa-lib-git/patches/patch-ba b/alsa-lib-git/patches/patch-ba
index f6d330f..6aadd41 100644
--- a/alsa-lib-git/patches/patch-ba
+++ b/alsa-lib-git/patches/patch-ba
@@ -1,6 +1,6 @@
$NetBSD: patch-ba,v 1.4 2014/03/25 23:06:07 asau Exp $
---- src/pcm/pcm_rate_linear.c.orig 2008-10-29 08:42:10.000000000 -0400
+--- src/pcm/pcm_rate_linear.c.orig 2016-02-24 08:33:29.000000000 +0000
+++ src/pcm/pcm_rate_linear.c
@@ -21,7 +21,9 @@
*/
@@ -12,3 +12,21 @@ $NetBSD: patch-ba,v 1.4 2014/03/25 23:06:07 asau Exp $
#include "pcm_local.h"
#include "pcm_plugin.h"
#include "pcm_rate.h"
+@@ -346,7 +348,7 @@ static int linear_init(void *obj, snd_pc
+ rate->func = linear_shrink;
+ /* pitch is get_increment */
+ }
+- rate->pitch = (((u_int64_t)info->out.rate * LINEAR_DIV) +
++ rate->pitch = (((uint64_t)info->out.rate * LINEAR_DIV) +
+ (info->in.rate / 2)) / info->in.rate;
+ rate->channels = info->channels;
+
+@@ -363,7 +365,7 @@ static int linear_adjust_pitch(void *obj
+ struct rate_linear *rate = obj;
+ snd_pcm_uframes_t cframes;
+
+- rate->pitch = (((u_int64_t)info->out.period_size * LINEAR_DIV) +
++ rate->pitch = (((uint64_t)info->out.period_size * LINEAR_DIV) +
+ (info->in.period_size/2) ) / info->in.period_size;
+
+ cframes = input_frames(rate, info->out.period_size);
diff --git a/alsa-lib-git/patches/patch-bb b/alsa-lib-git/patches/patch-bb
index e7659db..0bf6461 100644
--- a/alsa-lib-git/patches/patch-bb
+++ b/alsa-lib-git/patches/patch-bb
@@ -1,6 +1,6 @@
$NetBSD: patch-bb,v 1.4 2014/03/25 23:06:07 asau Exp $
---- src/pcm/pcm_route.c.orig 2008-10-29 08:42:10.000000000 -0400
+--- src/pcm/pcm_route.c.orig 2016-02-24 08:33:29.000000000 +0000
+++ src/pcm/pcm_route.c
@@ -26,7 +26,9 @@
*
@@ -12,3 +12,12 @@ $NetBSD: patch-bb,v 1.4 2014/03/25 23:06:07 asau Exp $
#include <math.h>
#include "pcm_local.h"
#include "pcm_plugin.h"
+@@ -190,7 +192,7 @@ static void snd_pcm_route_convert1_one_g
+ const char *src;
+ char *dst;
+ int src_step, dst_step;
+- u_int32_t sample = 0;
++ uint32_t sample = 0;
+ for (srcidx = 0; srcidx < ttable->nsrcs && srcidx < src_channels; ++srcidx) {
+ unsigned int channel = ttable->srcs[srcidx].channel;
+ if (channel >= src_channels)
diff --git a/alsa-lib-git/patches/patch-include_pcm.h b/alsa-lib-git/patches/patch-include_pcm.h
index d6d44ba..ce3d86a 100644
--- a/alsa-lib-git/patches/patch-include_pcm.h
+++ b/alsa-lib-git/patches/patch-include_pcm.h
@@ -1,8 +1,8 @@
$NetBSD: patch-include_pcm.h,v 1.4 2014/06/09 12:21:07 ryoon Exp $
---- include/pcm.h.orig 2013-07-08 12:31:36.000000000 +0000
+--- include/pcm.h.orig 2016-02-24 08:33:29.000000000 +0000
+++ include/pcm.h
-@@ -579,7 +579,9 @@ int snd_pcm_chmap_print(const snd_pcm_ch
+@@ -612,7 +612,9 @@ int snd_pcm_chmap_print(const snd_pcm_ch
unsigned int snd_pcm_chmap_from_string(const char *str);
snd_pcm_chmap_t *snd_pcm_chmap_parse_string(const char *str);
@@ -12,21 +12,18 @@ $NetBSD: patch-include_pcm.h,v 1.4 2014/06/09 12:21:07 ryoon Exp $
/*
* application helpers - these functions are implemented on top
-@@ -1048,10 +1050,17 @@ int snd_pcm_format_width(snd_pcm_format_
+@@ -1108,10 +1110,10 @@ int snd_pcm_format_width(snd_pcm_format_
int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */
snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian);
ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples);
-+#ifdef __sun
+-u_int8_t snd_pcm_format_silence(snd_pcm_format_t format);
+-u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
+-u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
+-u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
+uint8_t snd_pcm_format_silence(snd_pcm_format_t format);
+uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
+uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
+uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
-+#else
- u_int8_t snd_pcm_format_silence(snd_pcm_format_t format);
- u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format);
- u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format);
- u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format);
-+#endif
int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples);
snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes);
diff --git a/alsa-lib-git/patches/patch-include_sound_asoc.h b/alsa-lib-git/patches/patch-include_sound_asoc.h
index 860c434..c3b293a 100644
--- a/alsa-lib-git/patches/patch-include_sound_asoc.h
+++ b/alsa-lib-git/patches/patch-include_sound_asoc.h
@@ -1,8 +1,8 @@
$NetBSD: patch-include_sound_asoc.h,v 1.1 2016/02/18 15:15:57 wiz Exp $
---- include/sound/asoc.h.orig 2015-11-09 07:39:18.000000000 +0000
+--- include/sound/asoc.h.orig 2016-02-24 08:33:29.000000000 +0000
+++ include/sound/asoc.h
-@@ -111,6 +111,16 @@
+@@ -111,16 +111,26 @@
* Block Header.
* This header precedes all object and object arrays below.
*/
@@ -17,5 +17,295 @@ $NetBSD: patch-include_sound_asoc.h,v 1.1 2016/02/18 15:15:57 wiz Exp $
+#endif
+
struct snd_soc_tplg_hdr {
- __le32 magic; /* magic number */
- __le32 abi; /* ABI version */
+- __le32 magic; /* magic number */
+- __le32 abi; /* ABI version */
+- __le32 version; /* optional vendor specific version details */
+- __le32 type; /* SND_SOC_TPLG_TYPE_ */
+- __le32 size; /* size of this structure */
+- __le32 vendor_type; /* optional vendor specific type info */
+- __le32 payload_size; /* data bytes, excluding this header */
+- __le32 index; /* identifier for block */
+- __le32 count; /* number of elements in block */
++ uint32_t magic; /* magic number */
++ uint32_t abi; /* ABI version */
++ uint32_t version; /* optional vendor specific version details */
++ uint32_t type; /* SND_SOC_TPLG_TYPE_ */
++ uint32_t size; /* size of this structure */
++ uint32_t vendor_type; /* optional vendor specific type info */
++ uint32_t payload_size; /* data bytes, excluding this header */
++ uint32_t index; /* identifier for block */
++ uint32_t count; /* number of elements in block */
+ } __attribute__((packed));
+
+ /*
+@@ -129,7 +139,7 @@ struct snd_soc_tplg_hdr {
+ * firmware. Core will ignore this data.
+ */
+ struct snd_soc_tplg_private {
+- __le32 size; /* in bytes of private data */
++ uint32_t size; /* in bytes of private data */
+ char data[0];
+ } __attribute__((packed));
+
+@@ -137,16 +147,16 @@ struct snd_soc_tplg_private {
+ * Kcontrol TLV data.
+ */
+ struct snd_soc_tplg_tlv_dbscale {
+- __le32 min;
+- __le32 step;
+- __le32 mute;
++ uint32_t min;
++ uint32_t step;
++ uint32_t mute;
+ } __attribute__((packed));
+
+ struct snd_soc_tplg_ctl_tlv {
+- __le32 size; /* in bytes of this structure */
+- __le32 type; /* SNDRV_CTL_TLVT_*, type of TLV */
++ uint32_t size; /* in bytes of this structure */
++ uint32_t type; /* SNDRV_CTL_TLVT_*, type of TLV */
+ union {
+- __le32 data[SND_SOC_TPLG_TLV_SIZE];
++ uint32_t data[SND_SOC_TPLG_TLV_SIZE];
+ struct snd_soc_tplg_tlv_dbscale scale;
+ };
+ } __attribute__((packed));
+@@ -155,10 +165,10 @@ struct snd_soc_tplg_ctl_tlv {
+ * Kcontrol channel data
+ */
+ struct snd_soc_tplg_channel {
+- __le32 size; /* in bytes of this structure */
+- __le32 reg;
+- __le32 shift;
+- __le32 id; /* ID maps to Left, Right, LFE etc */
++ uint32_t size; /* in bytes of this structure */
++ uint32_t reg;
++ uint32_t shift;
++ uint32_t id; /* ID maps to Left, Right, LFE etc */
+ } __attribute__((packed));
+
+ /*
+@@ -167,19 +177,19 @@ struct snd_soc_tplg_channel {
+ * Bytes ext ops need get/put.
+ */
+ struct snd_soc_tplg_io_ops {
+- __le32 get;
+- __le32 put;
+- __le32 info;
++ uint32_t get;
++ uint32_t put;
++ uint32_t info;
+ } __attribute__((packed));
+
+ /*
+ * kcontrol header
+ */
+ struct snd_soc_tplg_ctl_hdr {
+- __le32 size; /* in bytes of this structure */
+- __le32 type;
++ uint32_t size; /* in bytes of this structure */
++ uint32_t type;
+ char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+- __le32 access;
++ uint32_t access;
+ struct snd_soc_tplg_io_ops ops;
+ struct snd_soc_tplg_ctl_tlv tlv;
+ } __attribute__((packed));
+@@ -188,33 +198,33 @@ struct snd_soc_tplg_ctl_hdr {
+ * Stream Capabilities
+ */
+ struct snd_soc_tplg_stream_caps {
+- __le32 size; /* in bytes of this structure */
++ uint32_t size; /* in bytes of this structure */
+ char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+- __le64 formats; /* supported formats SNDRV_PCM_FMTBIT_* */
+- __le32 rates; /* supported rates SNDRV_PCM_RATE_* */
+- __le32 rate_min; /* min rate */
+- __le32 rate_max; /* max rate */
+- __le32 channels_min; /* min channels */
+- __le32 channels_max; /* max channels */
+- __le32 periods_min; /* min number of periods */
+- __le32 periods_max; /* max number of periods */
+- __le32 period_size_min; /* min period size bytes */
+- __le32 period_size_max; /* max period size bytes */
+- __le32 buffer_size_min; /* min buffer size bytes */
+- __le32 buffer_size_max; /* max buffer size bytes */
++ uint64_t formats; /* supported formats SNDRV_PCM_FMTBIT_* */
++ uint32_t rates; /* supported rates SNDRV_PCM_RATE_* */
++ uint32_t rate_min; /* min rate */
++ uint32_t rate_max; /* max rate */
++ uint32_t channels_min; /* min channels */
++ uint32_t channels_max; /* max channels */
++ uint32_t periods_min; /* min number of periods */
++ uint32_t periods_max; /* max number of periods */
++ uint32_t period_size_min; /* min period size bytes */
++ uint32_t period_size_max; /* max period size bytes */
++ uint32_t buffer_size_min; /* min buffer size bytes */
++ uint32_t buffer_size_max; /* max buffer size bytes */
+ } __attribute__((packed));
+
+ /*
+ * FE or BE Stream configuration supported by SW/FW
+ */
+ struct snd_soc_tplg_stream {
+- __le32 size; /* in bytes of this structure */
++ uint32_t size; /* in bytes of this structure */
+ char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN]; /* Name of the stream */
+- __le64 format; /* SNDRV_PCM_FMTBIT_* */
+- __le32 rate; /* SNDRV_PCM_RATE_* */
+- __le32 period_bytes; /* size of period in bytes */
+- __le32 buffer_bytes; /* size of buffer in bytes */
+- __le32 channels; /* channels */
++ uint64_t format; /* SNDRV_PCM_FMTBIT_* */
++ uint32_t rate; /* SNDRV_PCM_RATE_* */
++ uint32_t period_bytes; /* size of period in bytes */
++ uint32_t buffer_bytes; /* size of buffer in bytes */
++ uint32_t channels; /* channels */
+ } __attribute__((packed));
+
+ /*
+@@ -230,12 +240,12 @@ struct snd_soc_tplg_stream {
+ * +-----------------------------------+----+
+ */
+ struct snd_soc_tplg_manifest {
+- __le32 size; /* in bytes of this structure */
+- __le32 control_elems; /* number of control elements */
+- __le32 widget_elems; /* number of widget elements */
+- __le32 graph_elems; /* number of graph elements */
+- __le32 pcm_elems; /* number of PCM elements */
+- __le32 dai_link_elems; /* number of DAI link elements */
++ uint32_t size; /* in bytes of this structure */
++ uint32_t control_elems; /* number of control elements */
++ uint32_t widget_elems; /* number of widget elements */
++ uint32_t graph_elems; /* number of graph elements */
++ uint32_t pcm_elems; /* number of PCM elements */
++ uint32_t dai_link_elems; /* number of DAI link elements */
+ struct snd_soc_tplg_private priv;
+ } __attribute__((packed));
+
+@@ -251,12 +261,12 @@ struct snd_soc_tplg_manifest {
+ */
+ struct snd_soc_tplg_mixer_control {
+ struct snd_soc_tplg_ctl_hdr hdr;
+- __le32 size; /* in bytes of this structure */
+- __le32 min;
+- __le32 max;
+- __le32 platform_max;
+- __le32 invert;
+- __le32 num_channels;
++ uint32_t size; /* in bytes of this structure */
++ uint32_t min;
++ uint32_t max;
++ uint32_t platform_max;
++ uint32_t invert;
++ uint32_t num_channels;
+ struct snd_soc_tplg_channel channel[SND_SOC_TPLG_MAX_CHAN];
+ struct snd_soc_tplg_private priv;
+ } __attribute__((packed));
+@@ -273,14 +283,14 @@ struct snd_soc_tplg_mixer_control {
+ */
+ struct snd_soc_tplg_enum_control {
+ struct snd_soc_tplg_ctl_hdr hdr;
+- __le32 size; /* in bytes of this structure */
+- __le32 num_channels;
++ uint32_t size; /* in bytes of this structure */
++ uint32_t num_channels;
+ struct snd_soc_tplg_channel channel[SND_SOC_TPLG_MAX_CHAN];
+- __le32 items;
+- __le32 mask;
+- __le32 count;
++ uint32_t items;
++ uint32_t mask;
++ uint32_t count;
+ char texts[SND_SOC_TPLG_NUM_TEXTS][SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+- __le32 values[SND_SOC_TPLG_NUM_TEXTS * SNDRV_CTL_ELEM_ID_NAME_MAXLEN / 4];
++ uint32_t values[SND_SOC_TPLG_NUM_TEXTS * SNDRV_CTL_ELEM_ID_NAME_MAXLEN / 4];
+ struct snd_soc_tplg_private priv;
+ } __attribute__((packed));
+
+@@ -296,11 +306,11 @@ struct snd_soc_tplg_enum_control {
+ */
+ struct snd_soc_tplg_bytes_control {
+ struct snd_soc_tplg_ctl_hdr hdr;
+- __le32 size; /* in bytes of this structure */
+- __le32 max;
+- __le32 mask;
+- __le32 base;
+- __le32 num_regs;
++ uint32_t size; /* in bytes of this structure */
++ uint32_t max;
++ uint32_t mask;
++ uint32_t base;
++ uint32_t num_regs;
+ struct snd_soc_tplg_io_ops ext_ops;
+ struct snd_soc_tplg_private priv;
+ } __attribute__((packed));
+@@ -338,20 +348,20 @@ struct snd_soc_tplg_dapm_graph_elem {
+ * in the block.
+ */
+ struct snd_soc_tplg_dapm_widget {
+- __le32 size; /* in bytes of this structure */
+- __le32 id; /* SND_SOC_DAPM_CTL */
++ uint32_t size; /* in bytes of this structure */
++ uint32_t id; /* SND_SOC_DAPM_CTL */
+ char name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+ char sname[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+
+- __le32 reg; /* negative reg = no direct dapm */
+- __le32 shift; /* bits to shift */
+- __le32 mask; /* non-shifted mask */
+- __le32 subseq; /* sort within widget type */
+- __le32 invert; /* invert the power bit */
+- __le32 ignore_suspend; /* kept enabled over suspend */
+- __le16 event_flags;
+- __le16 event_type;
+- __le32 num_kcontrols;
++ uint32_t reg; /* negative reg = no direct dapm */
++ uint32_t shift; /* bits to shift */
++ uint32_t mask; /* non-shifted mask */
++ uint32_t subseq; /* sort within widget type */
++ uint32_t invert; /* invert the power bit */
++ uint32_t ignore_suspend; /* kept enabled over suspend */
++ uint16_t event_flags;
++ uint16_t event_type;
++ uint32_t num_kcontrols;
+ struct snd_soc_tplg_private priv;
+ /*
+ * kcontrols that relate to this widget
+@@ -371,16 +381,16 @@ struct snd_soc_tplg_dapm_widget {
+ * +-----------------------------------+-----+
+ */
+ struct snd_soc_tplg_pcm {
+- __le32 size; /* in bytes of this structure */
++ uint32_t size; /* in bytes of this structure */
+ char pcm_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+ char dai_name[SNDRV_CTL_ELEM_ID_NAME_MAXLEN];
+- __le32 pcm_id; /* unique ID - used to match */
+- __le32 dai_id; /* unique ID - used to match */
+- __le32 playback; /* supports playback mode */
+- __le32 capture; /* supports capture mode */
+- __le32 compress; /* 1 = compressed; 0 = PCM */
++ uint32_t pcm_id; /* unique ID - used to match */
++ uint32_t dai_id; /* unique ID - used to match */
++ uint32_t playback; /* supports playback mode */
++ uint32_t capture; /* supports capture mode */
++ uint32_t compress; /* 1 = compressed; 0 = PCM */
+ struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* for DAI link */
+- __le32 num_streams; /* number of streams */
++ uint32_t num_streams; /* number of streams */
+ struct snd_soc_tplg_stream_caps caps[2]; /* playback and capture for DAI */
+ } __attribute__((packed));
+
+@@ -396,9 +406,9 @@ struct snd_soc_tplg_pcm {
+ * +-----------------------------------+-----+
+ */
+ struct snd_soc_tplg_link_config {
+- __le32 size; /* in bytes of this structure */
+- __le32 id; /* unique ID - used to match */
++ uint32_t size; /* in bytes of this structure */
++ uint32_t id; /* unique ID - used to match */
+ struct snd_soc_tplg_stream stream[SND_SOC_TPLG_STREAM_CONFIG_MAX]; /* supported configs playback and captrure */
+- __le32 num_streams; /* number of streams */
++ uint32_t num_streams; /* number of streams */
+ } __attribute__((packed));
+ #endif
diff --git a/alsa-lib-git/patches/patch-include_sound_asound.h b/alsa-lib-git/patches/patch-include_sound_asound.h
index 118cdb6..3ad5a86 100644
--- a/alsa-lib-git/patches/patch-include_sound_asound.h
+++ b/alsa-lib-git/patches/patch-include_sound_asound.h
@@ -1,8 +1,8 @@
$NetBSD: patch-include_sound_asound.h,v 1.2 2016/02/18 15:15:57 wiz Exp $
---- include/sound/asound.h.orig 2015-11-09 07:39:18.000000000 +0000
+--- include/sound/asound.h.orig 2016-02-24 08:33:29.000000000 +0000
+++ include/sound/asound.h
-@@ -23,8 +23,14 @@
+@@ -23,8 +23,13 @@
#ifndef _UAPI__SOUND_ASOUND_H
#define _UAPI__SOUND_ASOUND_H
@@ -13,20 +13,25 @@ $NetBSD: patch-include_sound_asound.h,v 1.2 2016/02/18 15:15:57 wiz Exp $
+#include <sys/ioctl.h>
+#define __bitwise
+typedef uint32_t __u32;
-+typedef int __kernel_pid_t;
+#endif
#ifndef __KERNEL__
#include <stdlib.h>
#endif
-@@ -415,7 +421,11 @@ struct snd_pcm_sw_params {
+@@ -415,7 +420,7 @@ struct snd_pcm_sw_params {
struct snd_pcm_channel_info {
unsigned int channel;
-+#ifdef __linux__
- __kernel_off_t offset; /* mmap offset */
-+#else
-+ off_t offset; /* mmap offset */
-+#endif
+- __kernel_off_t offset; /* mmap offset */
++ off_t offset; /* mmap offset */
unsigned int first; /* offset to first sample in bits */
unsigned int step; /* samples distance in bits */
};
+@@ -884,7 +889,7 @@ struct snd_ctl_elem_info {
+ snd_ctl_elem_type_t type; /* R: value type - SNDRV_CTL_ELEM_TYPE_* */
+ unsigned int access; /* R: value access (bitmask) - SNDRV_CTL_ELEM_ACCESS_* */
+ unsigned int count; /* count of values */
+- __kernel_pid_t owner; /* owner's PID of this control */
++ pid_t owner; /* owner's PID of this control */
+ union {
+ struct {
+ long min; /* R: minimum value */
diff --git a/alsa-lib-git/patches/patch-src_pcm_interval.c b/alsa-lib-git/patches/patch-src_pcm_interval.c
new file mode 100644
index 0000000..dc93fa2
--- /dev/null
+++ b/alsa-lib-git/patches/patch-src_pcm_interval.c
@@ -0,0 +1,22 @@
+$NetBSD$
+
+--- src/pcm/interval.c.orig 2016-02-24 08:33:29.000000000 +0000
++++ src/pcm/interval.c
+@@ -26,7 +26,7 @@
+ #include <limits.h>
+ #include "pcm_local.h"
+
+-static inline void div64_32(u_int64_t *n, u_int32_t d, u_int32_t *rem)
++static inline void div64_32(uint64_t *n, uint32_t d, uint32_t *rem)
+ {
+ *rem = *n % d;
+ *n /= d;
+@@ -88,7 +88,7 @@ static inline unsigned int sub(unsigned
+ static inline unsigned int muldiv32(unsigned int a, unsigned int b,
+ unsigned int c, unsigned int *r)
+ {
+- u_int64_t n = (u_int64_t) a * b;
++ uint64_t n = (uint64_t) a * b;
+ if (c == 0) {
+ assert(n > 0);
+ *r = 0;
diff --git a/alsa-lib-git/patches/patch-src_pcm_mask__inline.h b/alsa-lib-git/patches/patch-src_pcm_mask__inline.h
new file mode 100644
index 0000000..f603390
--- /dev/null
+++ b/alsa-lib-git/patches/patch-src_pcm_mask__inline.h
@@ -0,0 +1,31 @@
+$NetBSD$
+
+--- src/pcm/mask_inline.h.orig 2016-02-24 08:33:29.000000000 +0000
++++ src/pcm/mask_inline.h
+@@ -29,7 +29,7 @@
+ #define MASK_OFS(i) ((i) >> 5)
+ #define MASK_BIT(i) (1U << ((i) & 31))
+
+-MASK_INLINE unsigned int ld2(u_int32_t v)
++MASK_INLINE unsigned int ld2(uint32_t v)
+ {
+ unsigned r = 0;
+
+@@ -54,7 +54,7 @@ MASK_INLINE unsigned int ld2(u_int32_t v
+ return r;
+ }
+
+-MASK_INLINE unsigned int hweight32(u_int32_t v)
++MASK_INLINE unsigned int hweight32(uint32_t v)
+ {
+ v = (v & 0x55555555) + ((v >> 1) & 0x55555555);
+ v = (v & 0x33333333) + ((v >> 2) & 0x33333333);
+@@ -75,7 +75,7 @@ MASK_INLINE void snd_mask_none(snd_mask_
+
+ MASK_INLINE void snd_mask_any(snd_mask_t *mask)
+ {
+- memset(mask, 0xff, MASK_SIZE * sizeof(u_int32_t));
++ memset(mask, 0xff, MASK_SIZE * sizeof(uint32_t));
+ }
+
+ MASK_INLINE int snd_mask_empty(const snd_mask_t *mask)
diff --git a/alsa-lib-git/patches/patch-src_pcm_plugin__ops.h b/alsa-lib-git/patches/patch-src_pcm_plugin__ops.h
new file mode 100644
index 0000000..3b62744
--- /dev/null
+++ b/alsa-lib-git/patches/patch-src_pcm_plugin__ops.h
@@ -0,0 +1,320 @@
+$NetBSD$
+
+--- src/pcm/plugin_ops.h.orig 2016-02-24 08:33:29.000000000 +0000
++++ src/pcm/plugin_ops.h
+@@ -21,13 +21,13 @@
+
+ #ifndef SX_INLINES
+ #define SX_INLINES
+-static inline u_int32_t sx24(u_int32_t x)
++static inline uint32_t sx24(uint32_t x)
+ {
+ if(x&0x00800000)
+ return x|0xFF000000;
+ return x&0x00FFFFFF;
+ }
+-static inline u_int32_t sx24s(u_int32_t x)
++static inline uint32_t sx24s(uint32_t x)
+ {
+ if(x&0x00008000)
+ return x|0x000000FF;
+@@ -35,10 +35,10 @@ static inline u_int32_t sx24s(u_int32_t
+ }
+ #endif
+
+-#define as_u8(ptr) (*(u_int8_t*)(ptr))
+-#define as_u16(ptr) (*(u_int16_t*)(ptr))
+-#define as_u32(ptr) (*(u_int32_t*)(ptr))
+-#define as_u64(ptr) (*(u_int64_t*)(ptr))
++#define as_u8(ptr) (*(uint8_t*)(ptr))
++#define as_u16(ptr) (*(uint16_t*)(ptr))
++#define as_u32(ptr) (*(uint32_t*)(ptr))
++#define as_u64(ptr) (*(uint64_t*)(ptr))
+ #define as_s8(ptr) (*(int8_t*)(ptr))
+ #define as_s16(ptr) (*(int16_t*)(ptr))
+ #define as_s32(ptr) (*(int32_t*)(ptr))
+@@ -46,10 +46,10 @@ static inline u_int32_t sx24s(u_int32_t
+ #define as_float(ptr) (*(float_t*)(ptr))
+ #define as_double(ptr) (*(double_t*)(ptr))
+
+-#define as_u8c(ptr) (*(const u_int8_t*)(ptr))
+-#define as_u16c(ptr) (*(const u_int16_t*)(ptr))
+-#define as_u32c(ptr) (*(const u_int32_t*)(ptr))
+-#define as_u64c(ptr) (*(const u_int64_t*)(ptr))
++#define as_u8c(ptr) (*(const uint8_t*)(ptr))
++#define as_u16c(ptr) (*(const uint16_t*)(ptr))
++#define as_u32c(ptr) (*(const uint32_t*)(ptr))
++#define as_u64c(ptr) (*(const uint64_t*)(ptr))
+ #define as_s8c(ptr) (*(const int8_t*)(ptr))
+ #define as_s16c(ptr) (*(const int16_t*)(ptr))
+ #define as_s32c(ptr) (*(const int32_t*)(ptr))
+@@ -57,18 +57,18 @@ static inline u_int32_t sx24s(u_int32_t
+ #define as_floatc(ptr) (*(const float_t*)(ptr))
+ #define as_doublec(ptr) (*(const double_t*)(ptr))
+
+-#define _get_triple_le(ptr) (*(u_int8_t*)(ptr) | (u_int32_t)*((u_int8_t*)(ptr) + 1) << 8 | (u_int32_t)*((u_int8_t*)(ptr) + 2) << 16)
+-#define _get_triple_be(ptr) ((u_int32_t)*(u_int8_t*)(ptr) << 16 | (u_int32_t)*((u_int8_t*)(ptr) + 1) << 8 | *((u_int8_t*)(ptr) + 2))
++#define _get_triple_le(ptr) (*(uint8_t*)(ptr) | (uint32_t)*((uint8_t*)(ptr) + 1) << 8 | (uint32_t)*((uint8_t*)(ptr) + 2) << 16)
++#define _get_triple_be(ptr) ((uint32_t)*(uint8_t*)(ptr) << 16 | (uint32_t)*((uint8_t*)(ptr) + 1) << 8 | *((uint8_t*)(ptr) + 2))
+ #define _put_triple_le(ptr,val) do { \
+- u_int8_t *_tmp = (u_int8_t *)(ptr); \
+- u_int32_t _val = (val); \
++ uint8_t *_tmp = (uint8_t *)(ptr); \
++ uint32_t _val = (val); \
+ _tmp[0] = _val; \
+ _tmp[1] = _val >> 8; \
+ _tmp[2] = _val >> 16; \
+ } while(0)
+ #define _put_triple_be(ptr,val) do { \
+- u_int8_t *_tmp = (u_int8_t *)(ptr); \
+- u_int32_t _val = (val); \
++ uint8_t *_tmp = (uint8_t *)(ptr); \
++ uint32_t _val = (val); \
+ _tmp[0] = _val >> 16; \
+ _tmp[1] = _val >> 8; \
+ _tmp[2] = _val; \
+@@ -243,45 +243,45 @@ static void *const conv_labels[4 * 2 * 2
+ #ifdef CONV_END
+ while(0) {
+ conv_xxx1_xxx1: as_u8(dst) = as_u8c(src); goto CONV_END;
+-conv_xxx1_xx10: as_u16(dst) = (u_int16_t)as_u8c(src) << 8; goto CONV_END;
+-conv_xxx1_xx01: as_u16(dst) = (u_int16_t)as_u8c(src); goto CONV_END;
+-conv_xxx1_x100: as_u32(dst) = sx24((u_int32_t)as_u8c(src) << 16); goto CONV_END;
+-conv_xxx1_001x: as_u32(dst) = sx24s((u_int32_t)as_u8c(src) << 8); goto CONV_END;
+-conv_xxx1_1000: as_u32(dst) = (u_int32_t)as_u8c(src) << 24; goto CONV_END;
+-conv_xxx1_0001: as_u32(dst) = (u_int32_t)as_u8c(src); goto CONV_END;
++conv_xxx1_xx10: as_u16(dst) = (uint16_t)as_u8c(src) << 8; goto CONV_END;
++conv_xxx1_xx01: as_u16(dst) = (uint16_t)as_u8c(src); goto CONV_END;
++conv_xxx1_x100: as_u32(dst) = sx24((uint32_t)as_u8c(src) << 16); goto CONV_END;
++conv_xxx1_001x: as_u32(dst) = sx24s((uint32_t)as_u8c(src) << 8); goto CONV_END;
++conv_xxx1_1000: as_u32(dst) = (uint32_t)as_u8c(src) << 24; goto CONV_END;
++conv_xxx1_0001: as_u32(dst) = (uint32_t)as_u8c(src); goto CONV_END;
+ conv_xxx1_xxx9: as_u8(dst) = as_u8c(src) ^ 0x80; goto CONV_END;
+-conv_xxx1_xx90: as_u16(dst) = (u_int16_t)(as_u8c(src) ^ 0x80) << 8; goto CONV_END;
+-conv_xxx1_xx09: as_u16(dst) = (u_int16_t)(as_u8c(src) ^ 0x80); goto CONV_END;
+-conv_xxx1_x900: as_u32(dst) = sx24((u_int32_t)(as_u8c(src) ^ 0x80) << 16); goto CONV_END;
+-conv_xxx1_009x: as_u32(dst) = sx24s((u_int32_t)(as_u8c(src) ^ 0x80) << 8); goto CONV_END;
+-conv_xxx1_9000: as_u32(dst) = (u_int32_t)(as_u8c(src) ^ 0x80) << 24; goto CONV_END;
+-conv_xxx1_0009: as_u32(dst) = (u_int32_t)(as_u8c(src) ^ 0x80); goto CONV_END;
++conv_xxx1_xx90: as_u16(dst) = (uint16_t)(as_u8c(src) ^ 0x80) << 8; goto CONV_END;
++conv_xxx1_xx09: as_u16(dst) = (uint16_t)(as_u8c(src) ^ 0x80); goto CONV_END;
++conv_xxx1_x900: as_u32(dst) = sx24((uint32_t)(as_u8c(src) ^ 0x80) << 16); goto CONV_END;
++conv_xxx1_009x: as_u32(dst) = sx24s((uint32_t)(as_u8c(src) ^ 0x80) << 8); goto CONV_END;
++conv_xxx1_9000: as_u32(dst) = (uint32_t)(as_u8c(src) ^ 0x80) << 24; goto CONV_END;
++conv_xxx1_0009: as_u32(dst) = (uint32_t)(as_u8c(src) ^ 0x80); goto CONV_END;
+ conv_xx12_xxx1: as_u8(dst) = as_u16c(src) >> 8; goto CONV_END;
+ conv_xx12_xx12: as_u16(dst) = as_u16c(src); goto CONV_END;
+ conv_xx12_xx21: as_u16(dst) = bswap_16(as_u16c(src)); goto CONV_END;
+-conv_xx12_x120: as_u32(dst) = sx24((u_int32_t)as_u16c(src) << 8); goto CONV_END;
+-conv_xx12_021x: as_u32(dst) = sx24s((u_int32_t)bswap_16(as_u16c(src)) << 8); goto CONV_END;
+-conv_xx12_1200: as_u32(dst) = (u_int32_t)as_u16c(src) << 16; goto CONV_END;
+-conv_xx12_0021: as_u32(dst) = (u_int32_t)bswap_16(as_u16c(src)); goto CONV_END;
++conv_xx12_x120: as_u32(dst) = sx24((uint32_t)as_u16c(src) << 8); goto CONV_END;
++conv_xx12_021x: as_u32(dst) = sx24s((uint32_t)bswap_16(as_u16c(src)) << 8); goto CONV_END;
++conv_xx12_1200: as_u32(dst) = (uint32_t)as_u16c(src) << 16; goto CONV_END;
++conv_xx12_0021: as_u32(dst) = (uint32_t)bswap_16(as_u16c(src)); goto CONV_END;
+ conv_xx12_xxx9: as_u8(dst) = (as_u16c(src) >> 8) ^ 0x80; goto CONV_END;
+ conv_xx12_xx92: as_u16(dst) = as_u16c(src) ^ 0x8000; goto CONV_END;
+ conv_xx12_xx29: as_u16(dst) = bswap_16(as_u16c(src)) ^ 0x80; goto CONV_END;
+-conv_xx12_x920: as_u32(dst) = sx24((u_int32_t)(as_u16c(src) ^ 0x8000) << 8); goto CONV_END;
+-conv_xx12_029x: as_u32(dst) = sx24s((u_int32_t)(bswap_16(as_u16c(src)) ^ 0x80) << 8); goto CONV_END;
+-conv_xx12_9200: as_u32(dst) = (u_int32_t)(as_u16c(src) ^ 0x8000) << 16; goto CONV_END;
+-conv_xx12_0029: as_u32(dst) = (u_int32_t)(bswap_16(as_u16c(src)) ^ 0x80); goto CONV_END;
++conv_xx12_x920: as_u32(dst) = sx24((uint32_t)(as_u16c(src) ^ 0x8000) << 8); goto CONV_END;
++conv_xx12_029x: as_u32(dst) = sx24s((uint32_t)(bswap_16(as_u16c(src)) ^ 0x80) << 8); goto CONV_END;
++conv_xx12_9200: as_u32(dst) = (uint32_t)(as_u16c(src) ^ 0x8000) << 16; goto CONV_END;
++conv_xx12_0029: as_u32(dst) = (uint32_t)(bswap_16(as_u16c(src)) ^ 0x80); goto CONV_END;
+ conv_xx12_xxx2: as_u8(dst) = as_u16c(src) & 0xff; goto CONV_END;
+-conv_xx12_x210: as_u32(dst) = sx24((u_int32_t)bswap_16(as_u16c(src)) << 8); goto CONV_END;
+-conv_xx12_012x: as_u32(dst) = sx24s((u_int32_t)as_u16c(src) << 8); goto CONV_END;
+-conv_xx12_2100: as_u32(dst) = (u_int32_t)bswap_16(as_u16c(src)) << 16; goto CONV_END;
+-conv_xx12_0012: as_u32(dst) = (u_int32_t)as_u16c(src); goto CONV_END;
++conv_xx12_x210: as_u32(dst) = sx24((uint32_t)bswap_16(as_u16c(src)) << 8); goto CONV_END;
++conv_xx12_012x: as_u32(dst) = sx24s((uint32_t)as_u16c(src) << 8); goto CONV_END;
++conv_xx12_2100: as_u32(dst) = (uint32_t)bswap_16(as_u16c(src)) << 16; goto CONV_END;
++conv_xx12_0012: as_u32(dst) = (uint32_t)as_u16c(src); goto CONV_END;
+ conv_xx12_xxxA: as_u8(dst) = (as_u16c(src) ^ 0x80) & 0xff; goto CONV_END;
+ conv_xx12_xxA1: as_u16(dst) = bswap_16(as_u16c(src) ^ 0x80); goto CONV_END;
+ conv_xx12_xx1A: as_u16(dst) = as_u16c(src) ^ 0x80; goto CONV_END;
+-conv_xx12_xA10: as_u32(dst) = sx24((u_int32_t)bswap_16(as_u16c(src) ^ 0x80) << 8); goto CONV_END;
+-conv_xx12_01Ax: as_u32(dst) = sx24s((u_int32_t)(as_u16c(src) ^ 0x80) << 8); goto CONV_END;
+-conv_xx12_A100: as_u32(dst) = (u_int32_t)bswap_16(as_u16c(src) ^ 0x80) << 16; goto CONV_END;
+-conv_xx12_001A: as_u32(dst) = (u_int32_t)(as_u16c(src) ^ 0x80); goto CONV_END;
++conv_xx12_xA10: as_u32(dst) = sx24((uint32_t)bswap_16(as_u16c(src) ^ 0x80) << 8); goto CONV_END;
++conv_xx12_01Ax: as_u32(dst) = sx24s((uint32_t)(as_u16c(src) ^ 0x80) << 8); goto CONV_END;
++conv_xx12_A100: as_u32(dst) = (uint32_t)bswap_16(as_u16c(src) ^ 0x80) << 16; goto CONV_END;
++conv_xx12_001A: as_u32(dst) = (uint32_t)(as_u16c(src) ^ 0x80); goto CONV_END;
+ conv_x123_xxx1: as_u8(dst) = as_u32c(src) >> 16; goto CONV_END;
+ conv_x123_xx12: as_u16(dst) = as_u32c(src) >> 8; goto CONV_END;
+ conv_x123_xx21: as_u16(dst) = bswap_16(as_u32c(src) >> 8); goto CONV_END;
+@@ -376,8 +376,8 @@ static void *const get16_labels[4 * 2 *
+
+ #ifdef GET16_END
+ while(0) {
+-get16_1_10: sample = (u_int16_t)as_u8c(src) << 8; goto GET16_END;
+-get16_1_90: sample = (u_int16_t)(as_u8c(src) ^ 0x80) << 8; goto GET16_END;
++get16_1_10: sample = (uint16_t)as_u8c(src) << 8; goto GET16_END;
++get16_1_90: sample = (uint16_t)(as_u8c(src) ^ 0x80) << 8; goto GET16_END;
+ get16_12_12: sample = as_u16c(src); goto GET16_END;
+ get16_12_92: sample = as_u16c(src) ^ 0x8000; goto GET16_END;
+ get16_12_21: sample = bswap_16(as_u16c(src)); goto GET16_END;
+@@ -448,26 +448,26 @@ put16_12_12: as_u16(dst) = sample; goto
+ put16_12_92: as_u16(dst) = sample ^ 0x8000; goto PUT16_END;
+ put16_12_21: as_u16(dst) = bswap_16(sample); goto PUT16_END;
+ put16_12_29: as_u16(dst) = bswap_16(sample) ^ 0x80; goto PUT16_END;
+-put16_12_0120: as_u32(dst) = sx24((u_int32_t)sample << 8); goto PUT16_END;
+-put16_12_0920: as_u32(dst) = sx24((u_int32_t)(sample ^ 0x8000) << 8); goto PUT16_END;
+-put16_12_0210: as_u32(dst) = sx24s((u_int32_t)bswap_16(sample) << 8); goto PUT16_END;
+-put16_12_0290: as_u32(dst) = sx24s((u_int32_t)(bswap_16(sample) ^ 0x80) << 8); goto PUT16_END;
+-put16_12_1200: as_u32(dst) = (u_int32_t)sample << 16; goto PUT16_END;
+-put16_12_9200: as_u32(dst) = (u_int32_t)(sample ^ 0x8000) << 16; goto PUT16_END;
+-put16_12_0021: as_u32(dst) = (u_int32_t)bswap_16(sample); goto PUT16_END;
+-put16_12_0029: as_u32(dst) = (u_int32_t)bswap_16(sample) ^ 0x80; goto PUT16_END;
+-put16_12_120: _put_triple(dst, (u_int32_t)sample << 8); goto PUT16_END;
+-put16_12_920: _put_triple(dst, (u_int32_t)(sample ^ 0x8000) << 8); goto PUT16_END;
+-put16_12_021: _put_triple_s(dst, (u_int32_t)sample << 8); goto PUT16_END;
+-put16_12_029: _put_triple_s(dst, (u_int32_t)(sample ^ 0x8000) << 8); goto PUT16_END;
+-put16_12_120_20: _put_triple(dst, (u_int32_t)sample << 4); goto PUT16_END;
+-put16_12_920_20: _put_triple(dst, (u_int32_t)(sample ^ 0x8000) << 4); goto PUT16_END;
+-put16_12_021_20: _put_triple_s(dst, (u_int32_t)sample << 4); goto PUT16_END;
+-put16_12_029_20: _put_triple_s(dst, (u_int32_t)(sample ^ 0x8000) << 4); goto PUT16_END;
+-put16_12_120_18: _put_triple(dst, (u_int32_t)sample << 2); goto PUT16_END;
+-put16_12_920_18: _put_triple(dst, (u_int32_t)(sample ^ 0x8000) << 2); goto PUT16_END;
+-put16_12_021_18: _put_triple_s(dst, (u_int32_t)sample << 2); goto PUT16_END;
+-put16_12_029_18: _put_triple_s(dst, (u_int32_t)(sample ^ 0x8000) << 2); goto PUT16_END;
++put16_12_0120: as_u32(dst) = sx24((uint32_t)sample << 8); goto PUT16_END;
++put16_12_0920: as_u32(dst) = sx24((uint32_t)(sample ^ 0x8000) << 8); goto PUT16_END;
++put16_12_0210: as_u32(dst) = sx24s((uint32_t)bswap_16(sample) << 8); goto PUT16_END;
++put16_12_0290: as_u32(dst) = sx24s((uint32_t)(bswap_16(sample) ^ 0x80) << 8); goto PUT16_END;
++put16_12_1200: as_u32(dst) = (uint32_t)sample << 16; goto PUT16_END;
++put16_12_9200: as_u32(dst) = (uint32_t)(sample ^ 0x8000) << 16; goto PUT16_END;
++put16_12_0021: as_u32(dst) = (uint32_t)bswap_16(sample); goto PUT16_END;
++put16_12_0029: as_u32(dst) = (uint32_t)bswap_16(sample) ^ 0x80; goto PUT16_END;
++put16_12_120: _put_triple(dst, (uint32_t)sample << 8); goto PUT16_END;
++put16_12_920: _put_triple(dst, (uint32_t)(sample ^ 0x8000) << 8); goto PUT16_END;
++put16_12_021: _put_triple_s(dst, (uint32_t)sample << 8); goto PUT16_END;
++put16_12_029: _put_triple_s(dst, (uint32_t)(sample ^ 0x8000) << 8); goto PUT16_END;
++put16_12_120_20: _put_triple(dst, (uint32_t)sample << 4); goto PUT16_END;
++put16_12_920_20: _put_triple(dst, (uint32_t)(sample ^ 0x8000) << 4); goto PUT16_END;
++put16_12_021_20: _put_triple_s(dst, (uint32_t)sample << 4); goto PUT16_END;
++put16_12_029_20: _put_triple_s(dst, (uint32_t)(sample ^ 0x8000) << 4); goto PUT16_END;
++put16_12_120_18: _put_triple(dst, (uint32_t)sample << 2); goto PUT16_END;
++put16_12_920_18: _put_triple(dst, (uint32_t)(sample ^ 0x8000) << 2); goto PUT16_END;
++put16_12_021_18: _put_triple_s(dst, (uint32_t)sample << 2); goto PUT16_END;
++put16_12_029_18: _put_triple_s(dst, (uint32_t)(sample ^ 0x8000) << 2); goto PUT16_END;
+ }
+ #endif
+
+@@ -517,12 +517,12 @@ static void *const get32_labels[4 * 2 *
+
+ #ifdef GET32_END
+ while (0) {
+-get32_1_1000: sample = (u_int32_t)as_u8c(src) << 24; goto GET32_END;
+-get32_1_9000: sample = (u_int32_t)(as_u8c(src) ^ 0x80) << 24; goto GET32_END;
+-get32_12_1200: sample = (u_int32_t)as_u16c(src) << 16; goto GET32_END;
+-get32_12_9200: sample = (u_int32_t)(as_u16c(src) ^ 0x8000) << 16; goto GET32_END;
+-get32_12_2100: sample = (u_int32_t)bswap_16(as_u16c(src)) << 16; goto GET32_END;
+-get32_12_A100: sample = (u_int32_t)bswap_16(as_u16c(src) ^ 0x80) << 16; goto GET32_END;
++get32_1_1000: sample = (uint32_t)as_u8c(src) << 24; goto GET32_END;
++get32_1_9000: sample = (uint32_t)(as_u8c(src) ^ 0x80) << 24; goto GET32_END;
++get32_12_1200: sample = (uint32_t)as_u16c(src) << 16; goto GET32_END;
++get32_12_9200: sample = (uint32_t)(as_u16c(src) ^ 0x8000) << 16; goto GET32_END;
++get32_12_2100: sample = (uint32_t)bswap_16(as_u16c(src)) << 16; goto GET32_END;
++get32_12_A100: sample = (uint32_t)bswap_16(as_u16c(src) ^ 0x80) << 16; goto GET32_END;
+ get32_0123_1230: sample = as_u32c(src) << 8; goto GET32_END;
+ get32_0123_9230: sample = (as_u32c(src) << 8) ^ 0x80000000; goto GET32_END;
+ get32_1230_3210: sample = bswap_32(as_u32c(src) >> 8); goto GET32_END;
+@@ -786,18 +786,18 @@ static inline void _norms(const void *sr
+ s += (1U << (dst_wid - 1));
+ switch (dst_wid) {
+ case 8:
+- *(u_int8_t*)dst = s;
++ *(uint8_t*)dst = s;
+ break;
+ case 16:
+ if (dst_end)
+ s = bswap_16(s);
+- *(u_int16_t*)dst = s;
++ *(uint16_t*)dst = s;
+ break;
+ case 24:
+ case 32:
+ if (dst_end)
+ s = bswap_32(s);
+- *(u_int32_t*)dst = s;
++ *(uint32_t*)dst = s;
+ break;
+ }
+ return;
+@@ -806,27 +806,27 @@ static inline void _norms(const void *sr
+ switch (dst_wid) {
+ case 8:
+ if (dst_sign)
+- *(u_int8_t*)dst = 0x80;
++ *(uint8_t*)dst = 0x80;
+ else
+- *(u_int8_t*)dst = 0;
++ *(uint8_t*)dst = 0;
+ break;
+ case 16:
+ if (dst_sign)
+- *(u_int16_t*)dst = dst_end ? 0x0080 : 0x8000;
++ *(uint16_t*)dst = dst_end ? 0x0080 : 0x8000;
+ else
+- *(u_int16_t*)dst = 0;
++ *(uint16_t*)dst = 0;
+ break;
+ case 24:
+ if (dst_sign)
+- *(u_int32_t*)dst = dst_end ? 0x00008000 : 0x00800000;
++ *(uint32_t*)dst = dst_end ? 0x00008000 : 0x00800000;
+ else
+- *(u_int32_t*)dst = 0;
++ *(uint32_t*)dst = 0;
+ break;
+ case 32:
+ if (dst_sign)
+- *(u_int32_t*)dst = dst_end ? 0x00000080 : 0x80000000;
++ *(uint32_t*)dst = dst_end ? 0x00000080 : 0x80000000;
+ else
+- *(u_int32_t*)dst = 0;
++ *(uint32_t*)dst = 0;
+ break;
+ default:
+ assert(0);
+@@ -838,27 +838,27 @@ static inline void _norms(const void *sr
+ switch (dst_wid) {
+ case 8:
+ if (dst_sign)
+- *(u_int8_t*)dst = 0x7f;
++ *(uint8_t*)dst = 0x7f;
+ else
+- *(u_int8_t*)dst = 0xff;
++ *(uint8_t*)dst = 0xff;
+ break;
+ case 16:
+ if (dst_sign)
+- *(u_int16_t*)dst = dst_end ? 0xff7f : 0x7fff;
++ *(uint16_t*)dst = dst_end ? 0xff7f : 0x7fff;
+ else
+- *(u_int16_t*)dst = 0;
++ *(uint16_t*)dst = 0;
+ break;
+ case 24:
+ if (dst_sign)
+- *(u_int32_t*)dst = dst_end ? 0xffff7f00 : 0x007fffff;
++ *(uint32_t*)dst = dst_end ? 0xffff7f00 : 0x007fffff;
+ else
+- *(u_int32_t*)dst = 0;
++ *(uint32_t*)dst = 0;
+ break;
+ case 32:
+ if (dst_sign)
+- *(u_int32_t*)dst = dst_end ? 0xffffff7f : 0x7fffffff;
++ *(uint32_t*)dst = dst_end ? 0xffffff7f : 0x7fffffff;
+ else
+- *(u_int32_t*)dst = 0;
++ *(uint32_t*)dst = 0;
+ break;
+ default:
+ assert(0);
Home |
Main Index |
Thread Index |
Old Index