mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmkbd: get rid of support for ancient kernels

Browse source
This commit is contained in:
Lennart Poettering 2009-04-13 04:43:11 +02:00
parent f1d3dfb118
commit 66d21849e6
1 changed files with 5 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/modules/module-mmkbd-evdev.c
View file

@ -52,17 +52,6 @@ PA_MODULE_USAGE("device=<evdev device> sink=<sink name>");
#define DEFAULT_DEVICE "/dev/input/event0"
/*
* This isn't defined in older kernel headers and there is no way of
* detecting it.
*/
struct _input_id {
__u16 bustype;
__u16 vendor;
__u16 product;
__u16 version;
};
static const char* const valid_modargs[] = {
"device",
"sink",
@ -169,7 +158,7 @@ int pa__init(pa_module*m) {
pa_modargs *ma = NULL;
struct userdata *u;
int version;
struct _input_id input_id;
struct input_id input_id;
char name[256];
uint8_t evtype_bitmask[EV_MAX/8 + 1];
@ -180,15 +169,15 @@ int pa__init(pa_module*m) {
goto fail;
}
m->userdata = u = pa_xnew(struct userdata,1);
m->userdata = u = pa_xnew(struct userdata, 1);
u->module = m;
u->io = NULL;
u->sink_name = pa_xstrdup(pa_modargs_get_value(ma, "sink", NULL));
u->fd = -1;
u->fd_type = 0;
if ((u->fd = open(pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), O_RDONLY)) < 0) {
pa_log("failed to open evdev device: %s", pa_cstrerror(errno));
if ((u->fd = open(pa_modargs_get_value(ma, "device", DEFAULT_DEVICE), O_RDONLY|O_NOCTTY)) < 0) {
pa_log("Failed to open evdev device: %s", pa_cstrerror(errno));
goto fail;
}
@ -208,7 +197,7 @@ int pa__init(pa_module*m) {
input_id.vendor, input_id.product, input_id.version, input_id.bustype);
memset(name, 0, sizeof(name));
if(ioctl(u->fd, EVIOCGNAME(sizeof(name)), name) < 0) {
if (ioctl(u->fd, EVIOCGNAME(sizeof(name)), name) < 0) {
pa_log("EVIOCGNAME failed: %s", pa_cstrerror(errno));
goto fail;
}