Deleted Added
full compact
mixer.c (269228) mixer.c (274035)
1/*-
2 * Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
3 * Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
4 * Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 21 unchanged lines hidden (view full) ---

30#include "opt_snd.h"
31#endif
32
33#include <dev/sound/pcm/sound.h>
34
35#include "feeder_if.h"
36#include "mixer_if.h"
37
1/*-
2 * Copyright (c) 2005-2009 Ariff Abdullah <ariff@FreeBSD.org>
3 * Portions Copyright (c) Ryan Beasley <ryan.beasley@gmail.com> - GSoC 2006
4 * Copyright (c) 1999 Cameron Grant <cg@FreeBSD.org>
5 * All rights reserved.
6 *
7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions

--- 21 unchanged lines hidden (view full) ---

30#include "opt_snd.h"
31#endif
32
33#include <dev/sound/pcm/sound.h>
34
35#include "feeder_if.h"
36#include "mixer_if.h"
37
38SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/mixer.c 269228 2014-07-29 08:31:10Z mav $");
38SND_DECLARE_FILE("$FreeBSD: head/sys/dev/sound/pcm/mixer.c 274035 2014-11-03 11:11:45Z bapt $");
39
40static MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
41
42static int mixer_bypass = 1;
43SYSCTL_INT(_hw_snd, OID_AUTO, vpc_mixer_bypass, CTLFLAG_RWTUN,
44 &mixer_bypass, 0,
45 "control channel pcm/rec volume, bypassing real mixer device");
46

--- 1276 unchanged lines hidden (view full) ---

1323 }
1324done:
1325 snd_mtxunlock(m->lock);
1326 return (ret);
1327}
1328
1329static void
1330mixer_clone(void *arg,
39
40static MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
41
42static int mixer_bypass = 1;
43SYSCTL_INT(_hw_snd, OID_AUTO, vpc_mixer_bypass, CTLFLAG_RWTUN,
44 &mixer_bypass, 0,
45 "control channel pcm/rec volume, bypassing real mixer device");
46

--- 1276 unchanged lines hidden (view full) ---

1323 }
1324done:
1325 snd_mtxunlock(m->lock);
1326 return (ret);
1327}
1328
1329static void
1330mixer_clone(void *arg,
1331#if __FreeBSD_version >= 600034
1332 struct ucred *cred,
1331 struct ucred *cred,
1333#endif
1334 char *name, int namelen, struct cdev **dev)
1335{
1336 struct snddev_info *d;
1337
1338 if (*dev != NULL)
1339 return;
1340 if (strcmp(name, "mixer") == 0) {
1341 d = devclass_get_softc(pcm_devclass, snd_unit);

--- 209 unchanged lines hidden ---
1332 char *name, int namelen, struct cdev **dev)
1333{
1334 struct snddev_info *d;
1335
1336 if (*dev != NULL)
1337 return;
1338 if (strcmp(name, "mixer") == 0) {
1339 d = devclass_get_softc(pcm_devclass, snd_unit);

--- 209 unchanged lines hidden ---