February 2013 - Alsa-devel - mailman.alsa-project.org

Re: [alsa-devel] [PATCH] ALSA: emu10k1: Load firmware when it was already cached
by Takashi Iwai 25 Feb '13

25 Feb '13

At Sat, 23 Feb 2013 15:36:29 +0100, Florian Zeitz wrote: > > This expands the regression fix from > d28215996b0c3a900411769039aa3c54cf7008ab. > The firmware also needs to be loaded when it was already cached. > > Signed-off-by: Florian Zeitz <florob(a)babelmonkeys.de> Thanks, applied now. Takashi > --- > sound/pci/emu10k1/emu10k1_main.c | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > > [2 0001-ALSA-emu10k1-Load-firmware-when-it-was-already-cache.patch <text/x-patch (7bit)>] > diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c > index 5115f11..e6b0166 100644 > --- a/sound/pci/emu10k1/emu10k1_main.c > +++ b/sound/pci/emu10k1/emu10k1_main.c > @@ -860,11 +860,12 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) > } > snd_printk(KERN_INFO "emu1010: firmware file = %s, size = 0x%zx\n", > filename, emu->firmware->size); > - err = snd_emu1010_load_firmware(emu); > - if (err != 0) { > - snd_printk(KERN_INFO "emu1010: Loading Firmware file %s failed\n", filename); > - return err; > - } > + } > + > + err = snd_emu1010_load_firmware(emu); > + if (err != 0) { > + snd_printk(KERN_INFO "emu1010: Loading Firmware failed\n"); > + return err; > } > > /* ID, should read & 0x7f = 0x55 when FPGA programmed. */ >

1 0

[alsa-devel] Bug#701498: hda: Internal mic does not work on Thinkpad T420s (CX20590 codec)
by Ben Hutchings 25 Feb '13

25 Feb '13

On Sat, 2013-02-23 at 20:42 +0100, Adrian Lang wrote: > Package: src:linux > Version: 3.2.35-2 > Severity: normal > > There are two microphones in alsamixer and Gnome 3 audio settings (i. e., > pulseaudio), but I can't get any sound using either of them. I think that's the > same problem as reported to [openSUSE] and [Ubuntu]. > > The problem persists with 3.7 (3.7.8-1~experimental.1) from > experimental. > > [openSUSE] > http://forums.opensuse.org/english/get-technical-help-here/laptop/469210-op… > [Ubuntu] > https://bugs.launchpad.net/ubuntu/+source/alsa-driver/+bug/938644 I happen to have a Thinkpad T420 with the same audio codec, and the internal mic works fine. (There does seem to be a problem with external mics, now that I check, but let's ignore that for now.) So this is more board-specific, not chip-specific, behaviour. [...] > ** Model information > sys_vendor: LENOVO > product_name: 4171CTO > product_version: ThinkPad T420s [...] Does the T420s also have a single socket that can be used with either headphones or headset? [I'm copying your alsa-info.txt as an attachment for the benefit of alsa-devel.] Ben. -- Ben Hutchings Absolutum obsoletum. (If it works, it's out of date.) - Stafford Beer

3 2

[alsa-devel] [PATCH 1/5] ASoC: max98090: Remove unneeded version.h header include
by Sachin Kamat 25 Feb '13

25 Feb '13

version.h header file inclusion is not required as detected by versioncheck. Signed-off-by: Sachin Kamat <sachin.kamat(a)linaro.org> --- All patches in this series are build tested and based on for-next branch of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git tree. --- sound/soc/codecs/max98090.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c index fc17604..9ea73aa 100755 --- a/sound/soc/codecs/max98090.c +++ b/sound/soc/codecs/max98090.c @@ -23,8 +23,6 @@ #include <sound/max98090.h> #include "max98090.h" -#include <linux/version.h> - #define DEBUG #define EXTMIC_METHOD #define EXTMIC_METHOD_TEST -- 1.7.4.1

2 10

[alsa-devel] [ANNOUNCE]: tinycompress: release 0.1.0
by Vinod Koul 24 Feb '13

24 Feb '13

Hi, tinycompress library - the user mode library for using the ALSA compressed APIs has seen some good testing, which brings few fixes and new feature for gapless playback. This library supports both Android and Linux OSes. Along with we have a player, cplay- which can be used for mp3 offload playback Number of fixes and cleanups along the way as seen by below changelog and diffstat. So time to bump up the version to 0.1.0 Charles Keepax (4): compress: Extend limit on error messages compress: Return error when failing to allocate compress struct compress: Return error messages correctly from compress_open compress: Do not put newlines on error messages Namarta Kohli (1): compress: add compress_resume Richard Fitzgerald (12): compress: Add function to get timestamp in samples compress: Change compress_write() to take buffer as const void * compress: Remove unused buffer_size member from struct compress compress: Change running from bitfield to plain int compress: Fix incorrect error message on compress_resume() compress: Remove hardcoded limit on length of poll() wait compress: Handle case of pause() during compress_write() compress: Allow client to pass "don't care" for fragment size/number compress: Block if unable to write all data in single write() compress: Add missing header includes compress: Add makefile for building under standard linux cplay: support auto-configuration of fragment size and count Vinod Koul (9): initial creation compress: fix the timestamp calculation compress: write when we have a fragment to write compress: make variable 'running' as unsigned compress: remove unused variables compress: cache the config values passed tinycompress: add gapless meta data APIs tinycompres: remove unused variable tinycompress: version 0.1.0 Xuemin Su (1): compress: fix arithmetic exception in compress_get_hpointer Android.mk | 22 ++ README | 31 ++- compress.c | 539 +++++++++++++++++++++++++++++++++++ cplay.c | 368 ++++++++++++++++++++++++ include/sound/compress_offload.h | 95 ++++++ include/sound/compress_params.h | 230 +++++++++++++++ include/tinycompress/tinycompress.h | 270 ++++++++++++++++++ include/tinycompress/tinymp3.h | 106 +++++++ include/tinycompress/version.h | 70 +++++ makefile.linux | 35 +++ 10 files changed, 1765 insertions(+), 1 deletions(-) create mode 100644 Android.mk create mode 100644 compress.c create mode 100644 cplay.c create mode 100644 include/sound/compress_offload.h create mode 100644 include/sound/compress_params.h create mode 100644 include/tinycompress/tinycompress.h create mode 100644 include/tinycompress/tinymp3.h create mode 100644 include/tinycompress/version.h create mode 100644 makefile.linux -- ~Vinod

1 0

[alsa-devel] [PATCH] tinycompres: remove unused variable
by Vinod Koul 24 Feb '13

24 Feb '13

cplay.c:210: warning: unused variable i Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- cplay.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cplay.c b/cplay.c index e52d641..5b4e83e 100644 --- a/cplay.c +++ b/cplay.c @@ -207,7 +207,7 @@ void play_samples(char *name, unsigned int card, unsigned int device, FILE *file; char *buffer; int size, num_read, wrote; - unsigned int i, channels, rate, bits; + unsigned int channels, rate, bits; if (verbose) printf("%s: entry\n", __func__); -- 1.7.0.4

1 1

[alsa-devel] [PATCH] tinycompress: add gapless meta data APIs
by Vinod Koul 24 Feb '13

24 Feb '13

Based on newly introduced kernel API, we add gapless metatdata to the library. Since kernel can recieve only key/value pairs for metadata we add a structure for gapless_metdata and handle this in library Signed-off-by: Vinod Koul <vinod.koul(a)intel.com> --- compress.c | 71 +++++++++++++++++++++++++++++++++++ include/sound/compress_offload.h | 18 ++++++++- include/tinycompress/tinycompress.h | 37 ++++++++++++++++++ include/tinycompress/version.h | 4 +- 4 files changed, 126 insertions(+), 4 deletions(-) diff --git a/compress.c b/compress.c index d44d5fe..5b600c3 100644 --- a/compress.c +++ b/compress.c @@ -85,6 +85,8 @@ struct compress { char error[COMPR_ERR_MAX]; struct compr_config *config; unsigned int running:1; + unsigned int gapless_metadata; + unsigned int next_track; }; static int oops(struct compress *compress, int e, const char *fmt, ...) @@ -121,6 +123,17 @@ int is_compress_ready(struct compress *compress) return (compress->fd > 0) ? 1 : 0; } +static int get_compress_version(struct compress *compress) +{ + int version = 0; + + if (ioctl(compress->fd, SNDRV_COMPRESS_IOCTL_VERSION, &version)) { + oops(compress, errno, "cant read version"); + return -1; + } + return version; +} + static bool _is_codec_supported(struct compress *compress, struct compr_config *config) { struct snd_compr_caps caps; @@ -212,6 +225,8 @@ struct compress *compress_open(unsigned int card, unsigned int device, return &bad_compress; } + compress->next_track = 0; + compress->gapless_metadata = 0; compress->config = calloc(1, sizeof(*config)); if (!compress->config) goto input_fail; @@ -401,6 +416,62 @@ int compress_drain(struct compress *compress) return 0; } +int compress_partial_drain(struct compress *compress) +{ + if (!is_compress_running(compress)) + return oops(compress, -ENODEV, "device not ready"); + + if (!compress->next_track) + return oops(compress, -EPERM, "next track not signalled"); + if (ioctl(compress->fd, SNDRV_COMPRESS_PARTIAL_DRAIN)) + return oops(compress, errno, "cannot drain the stream\n"); + compress->next_track = 0; + return 0; +} + +int compress_next_track(struct compress *compress) +{ + if (!is_compress_running(compress)) + return oops(compress, -ENODEV, "device not ready"); + + if (!compress->gapless_metadata) + return oops(compress, -EPERM, "metadata not set"); + if (ioctl(compress->fd, SNDRV_COMPRESS_NEXT_TRACK)) + return oops(compress, errno, "cannot set next track\n"); + compress->next_track = 1; + compress->gapless_metadata = 0; + return 0; +} + +int compress_set_gapless_metadata(struct compress *compress, + struct compr_gapless_mdata *mdata) +{ + struct snd_compr_metadata metadata; + int version; + + if (!is_compress_ready(compress)) + return oops(compress, -ENODEV, "device not ready"); + + version = get_compress_version(compress); + if (version <= 0) + return -1; + + if (version < SNDRV_PROTOCOL_VERSION(0, 1, 1)) + return oops(compress, -ENXIO, "gapless apis not supported in kernel"); + + metadata.key = SNDRV_COMPRESS_ENCODER_PADDING; + metadata.value[0] = mdata->encoder_padding; + if (ioctl(compress->fd, SNDRV_COMPRESS_SET_METADATA, &metadata)) + return oops(compress, errno, "can't set metadata for stream\n"); + + metadata.key = SNDRV_COMPRESS_ENCODER_DELAY; + metadata.value[0] = mdata->encoder_delay; + if (ioctl(compress->fd, SNDRV_COMPRESS_SET_METADATA, &metadata)) + return oops(compress, errno, "can't set metadata for stream\n"); + compress->gapless_metadata = 1; + return 0; +} + bool is_codec_supported(unsigned int card, unsigned int device, unsigned int flags, struct snd_codec *codec) { diff --git a/include/sound/compress_offload.h b/include/sound/compress_offload.h index bbb09bc..17377df 100644 --- a/include/sound/compress_offload.h +++ b/include/sound/compress_offload.h @@ -16,7 +16,7 @@ #include <sound/asound.h> //#include <sound/compress_params.h> -#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 0) +#define SNDRV_COMPRESS_VERSION SNDRV_PROTOCOL_VERSION(0, 1, 1) struct snd_compressed_buffer { __u32 fragment_size; @@ -64,11 +64,23 @@ struct snd_compr_codec_caps { struct snd_codec_desc descriptor[MAX_NUM_CODEC_DESCRIPTORS]; }; +enum { + SNDRV_COMPRESS_ENCODER_PADDING = 1, + SNDRV_COMPRESS_ENCODER_DELAY = 2, +}; + +struct snd_compr_metadata { + __u32 key; + __u32 value[8]; +}; + #define SNDRV_COMPRESS_IOCTL_VERSION _IOR('C', 0x00, int) #define SNDRV_COMPRESS_GET_CAPS _IOWR('C', 0x10, struct snd_compr_caps) #define SNDRV_COMPRESS_GET_CODEC_CAPS _IOWR('C', 0x11, struct snd_compr_codec_caps) #define SNDRV_COMPRESS_SET_PARAMS _IOW('C', 0x12, struct snd_compr_params) #define SNDRV_COMPRESS_GET_PARAMS _IOR('C', 0x13, struct snd_codec) +#define SNDRV_COMPRESS_SET_METADATA _IOW('C', 0x14, struct snd_compr_metadata) +#define SNDRV_COMPRESS_GET_METADATA _IOWR('C', 0x15, struct snd_compr_metadata) #define SNDRV_COMPRESS_TSTAMP _IOR('C', 0x20, struct snd_compr_tstamp) #define SNDRV_COMPRESS_AVAIL _IOR('C', 0x21, struct snd_compr_avail) #define SNDRV_COMPRESS_PAUSE _IO('C', 0x30) @@ -76,6 +88,8 @@ struct snd_compr_codec_caps { #define SNDRV_COMPRESS_START _IO('C', 0x32) #define SNDRV_COMPRESS_STOP _IO('C', 0x33) #define SNDRV_COMPRESS_DRAIN _IO('C', 0x34) - +#define SNDRV_COMPRESS_NEXT_TRACK _IO('C', 0x35) +#define SNDRV_COMPRESS_PARTIAL_DRAIN _IO('C', 0x36) #define SND_COMPR_TRIGGER_DRAIN 7 +#define SND_COMPR_TRIGGER_PARTIAL_DRAIN 8 #endif diff --git a/include/tinycompress/tinycompress.h b/include/tinycompress/tinycompress.h index 13dea3e..e129817 100644 --- a/include/tinycompress/tinycompress.h +++ b/include/tinycompress/tinycompress.h @@ -69,6 +69,11 @@ struct compr_config { struct snd_codec *codec; }; +struct compr_gapless_mdata { + __u32 encoder_delay; + __u32 encoder_padding; +}; + #define COMPRESS_OUT 0x00000000 #define COMPRESS_IN 0x10000000 @@ -165,6 +170,38 @@ int compress_resume(struct compress *compress); int compress_drain(struct compress *compress); /* + * compress_next_track: set the next track for stream + * + * return 0 on success, negative on error + * + * @compress: compress stream to be transistioned to next track + */ +int compress_next_track(struct compress *compress); + +/* + * compress_partial_drain: drain will return after the last frame is decoded + * by DSP and will play the , All the data written into compressed + * ring buffer is decoded + * + * return 0 on success, negative on error + * + * @compress: compress stream to be drain + */ +int compress_partial_drain(struct compress *compress); + +/* + * compress_set_gapless_metadata: set gapless metadata of a compress strem + * + * return 0 on success, negative on error + * + * @compress: compress stream for which metadata has to set + * @mdata: metadata encoder delay and padding + */ + +int compress_set_gapless_metadata(struct compress *compress, + struct compr_gapless_mdata *mdata); + +/* * is_codec_supported:check if the given codec is supported * returns true when supported, false if not * diff --git a/include/tinycompress/version.h b/include/tinycompress/version.h index 89f0f4e..db191d6 100644 --- a/include/tinycompress/version.h +++ b/include/tinycompress/version.h @@ -56,7 +56,7 @@ #define TINYCOMPRESS_LIB_MAJOR 0 /* major number of library version */ #define TINYCOMPRESS_LIB_MINOR 0 /* minor number of library version */ -#define TINYCOMPRESS_LIB_SUBMINOR 1 /* subminor number of library version */ +#define TINYCOMPRESS_LIB_SUBMINOR 2 /* subminor number of library version */ /** library version */ #define TINYCOMPRESS_LIB_VERSION \ @@ -65,6 +65,6 @@ TINYCOMPRESS_LIB_SUBMINOR) /** library version (string) */ -#define TINYCOMPRESS_LIB_VERSION_STR "0.0.1" +#define TINYCOMPRESS_LIB_VERSION_STR "0.0.2" #endif -- 1.7.0.4

2 3

[alsa-devel] [PATCH] ASoC: dapm: Fix handling of loops
by Mark Brown 22 Feb '13

22 Feb '13

Currently if a path loops back on itself we correctly skip over it to avoid going into an infinite loop but this causes us to ignore the need to power up the path as we don't count the loop for the purposes of counting inputs and outputs. This means that internal loopbacks within a device that have powered devices on them won't be powered up. Fix this by treating any path that is currently in the process of being recursed as having a single input or output so that it is counted for the purposes of power decisions. Signed-off-by: Mark Brown <broonie(a)opensource.wolfsonmicro.com> --- include/sound/soc-dapm.h | 1 + sound/soc/soc-dapm.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 617ac36..38fd652 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -491,6 +491,7 @@ struct snd_soc_dapm_path { /* status */ u32 connect:1; /* source and sink widgets are connected */ u32 walked:1; /* path has been walked */ + u32 walking:1; /* path is in the process of being walked */ u32 weak:1; /* path ignored for power management */ int (*connected)(struct snd_soc_dapm_widget *source, diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 1dc5b72..11047ba 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -821,6 +821,7 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget, (widget->id == snd_soc_dapm_line && !list_empty(&widget->sources))) { widget->outputs = snd_soc_dapm_suspend_check(widget); + path->walking = 0; return widget->outputs; } } @@ -831,6 +832,9 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget, if (path->weak) continue; + if (path->walking) + return 1; + if (path->walked) continue; @@ -838,6 +842,7 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget, if (path->sink && path->connect) { path->walked = 1; + path->walking = 1; /* do we need to add this widget to the list ? */ if (list) { @@ -847,11 +852,14 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget, dev_err(widget->dapm->dev, "ASoC: could not add widget %s\n", widget->name); + path->walking = 0; return con; } } con += is_connected_output_ep(path->sink, list); + + path->walking = 0; } } @@ -931,6 +939,9 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget, if (path->weak) continue; + if (path->walking) + return 1; + if (path->walked) continue; @@ -938,6 +949,7 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget, if (path->source && path->connect) { path->walked = 1; + path->walking = 1; /* do we need to add this widget to the list ? */ if (list) { @@ -947,11 +959,14 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget, dev_err(widget->dapm->dev, "ASoC: could not add widget %s\n", widget->name); + path->walking = 0; return con; } } con += is_connected_input_ep(path->source, list); + + path->walking = 0; } } -- 1.7.10.4

2 1

[alsa-devel] [PATCH TINYCOMPRESS 1/14] compress: Add function to get timestamp in samples
by Richard Fitzgerald 22 Feb '13

22 Feb '13

The compress_get_hpointer() converts the timestamp into actual time. But Android needs it in samples. To avoid the inefficiency of using compress_get_hpointer() and converting into time and then back into samples, this change adds compress_get_tstamp() which returns the raw struct snd_compr_tstamp. diff --git a/compress.c b/compress.c index faef982..19b9366 100644 --- a/compress.c +++ b/compress.c @@ -287,6 +287,18 @@ int compress_get_hpointer(struct compress *compress, return 0; } +int compress_get_tstamp(struct compress *compress, + struct snd_compr_tstamp *tstamp ) +{ + if (!is_compress_ready(compress)) + return oops(compress, -ENODEV, "device not ready"); + + if (ioctl(compress->fd, SNDRV_COMPRESS_TSTAMP, tstamp)) + return oops(compress, errno, "cannot get avail"); + + return 0; +} + int compress_write(struct compress *compress, char *buf, unsigned int size) { struct snd_compr_avail avail; diff --git a/include/tinycompress/tinycompress.h b/include/tinycompress/tinycompress.h index 13dea3e..8a98527 100644 --- a/include/tinycompress/tinycompress.h +++ b/include/tinycompress/tinycompress.h @@ -73,6 +73,7 @@ struct compr_config { #define COMPRESS_IN 0x10000000 struct compress; +struct snd_compr_tstamp; /* * compress_open: open a new compress stream @@ -103,6 +104,18 @@ void compress_close(struct compress *compress); */ int compress_get_hpointer(struct compress *compress, unsigned int *avail, struct timespec *tstamp); + + +/* + * compress_get_tstamp: get the raw hw timestamp + * return 0 on success, negative on error + * + * @compress: compress stream on which query is made + * @tstamp: timestamp information + */ +int compress_get_tstamp(struct compress *compress, + struct snd_compr_tstamp *tstamp ); + /* * compress_write: write data to the compress stream * return bytes written on success, negative on error -- 1.7.2.5

3 7

[alsa-devel] [PATCH TINYCOMPRESS 14/14] cplay: support auto-configuration of fragment size and count
by Richard Fitzgerald 22 Feb '13

22 Feb '13

Default the fragment size and count to zero to take advantage of the auto-configuration support that was added to tinycompress. If user doesn't override these by specifying -f and -b values on the command line, they will be passed to tinycompress as zero and tinycompress will query the driver for size and count. Signed-off-by: Richard Fitzgerald <rf(a)opensource.wolfsonmicro.com> diff --git a/cplay.c b/cplay.c index 3af6d13..60995a4 100644 --- a/cplay.c +++ b/cplay.c @@ -152,9 +152,9 @@ static int print_time(struct compress *compress) int main(int argc, char **argv) { char *file; - unsigned long buffer_size = 100*1024; + unsigned long buffer_size = 0; int c; - unsigned int card = 0, device = 0, frag = 4; + unsigned int card = 0, device = 0, frag = 0; if (argc < 2) @@ -276,8 +276,14 @@ void play_samples(char *name, unsigned int card, unsigned int device, codec.level = 0; codec.ch_mode = 0; codec.format = 0; - config.fragment_size = buffer_size/frag; - config.fragments = frag; + if ((buffer_size != 0) && (frag != 0)) { + config.fragment_size = buffer_size/frag; + config.fragments = frag; + } else { + /* use driver defaults */ + config.fragment_size = 0; + config.fragments = 0; + } config.codec = &codec; compress = compress_open(card, device, COMPRESS_IN, &config); -- 1.7.2.5

2 5

[alsa-devel] [PATCH TINYCOMPRESS 13/14] compress: Prevent divide-by-zero faults in get_hpointer()
by Richard Fitzgerald 22 Feb '13

22 Feb '13

Do not assume that the returned snd_compr_avail contains a snd_compr_tstamp with a valid sampling_rate. Check for zero before attempting to use it. diff --git a/compress.c b/compress.c index cfd0219..c0e81a3 100644 --- a/compress.c +++ b/compress.c @@ -297,10 +297,15 @@ int compress_get_hpointer(struct compress *compress, if (ioctl(compress->fd, SNDRV_COMPRESS_AVAIL, &kavail)) return oops(compress, errno, "cannot get avail"); *avail = (unsigned int)kavail.avail; - time = kavail.tstamp.pcm_io_frames / kavail.tstamp.sampling_rate; - tstamp->tv_sec = time; - time = kavail.tstamp.pcm_io_frames % kavail.tstamp.sampling_rate; - tstamp->tv_nsec = time * 1000000000 / kavail.tstamp.sampling_rate; + if (kavail.tstamp.sampling_rate != 0) { + time = kavail.tstamp.pcm_io_frames / kavail.tstamp.sampling_rate; + tstamp->tv_sec = time; + time = kavail.tstamp.pcm_io_frames % kavail.tstamp.sampling_rate; + tstamp->tv_nsec = time * 1000000000 / kavail.tstamp.sampling_rate; + } else { + tstamp->tv_sec = 0; + tstamp->tv_nsec = 0; + } return 0; } -- 1.7.2.5

1 1