Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

hosted: Consolidate common /dev/input code shared by the hiby targets

Browse source 
* Enable dynamic number of input devices, needed for bluetooth support

Change-Id: Ic2425834eb9b0fff298899ab45f3115ce1d95e91
This commit is contained in:
Solomon Peachy 2020-10-29 09:37:57 -04:00
parent dd82f13fa1
commit 125e97b0bf
9 changed files with 144 additions and 274 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
firmware/SOURCES
View file

@ -145,6 +145,7 @@ target/hosted/xduoo/powermgmt-xduoo.c
#if defined(HIBY_LINUX) && !defined(SIMULATOR)
target/hosted/usb-hiby.c
target/hosted/button-devinput.c
#endif
#if (defined(FIIO_M3K)) && !defined(SIMULATOR)

84
firmware/target/hosted/agptek/button-agptek.c
View file

@ -17,25 +17,13 @@
* KIND, either express or implied.
*
****************************************************************************/
#include <poll.h>
//#include <dir.h>
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
#include <linux/input.h>
#include <fcntl.h>
#include <string.h>
#include <stdlib.h>
#include "sysfs.h"
#include "button.h"
#include "button-target.h"
#include "panic.h"
#define NR_POLL_DESC 2
static struct pollfd poll_fds[NR_POLL_DESC];
static int button_map(int keycode)
int button_map(int keycode)
{
switch(keycode)
{
@ -68,67 +56,6 @@ static int button_map(int keycode)
}
}
void button_init_device(void)
{
const char * const input_devs[NR_POLL_DESC] = {
"/dev/input/event0",
"/dev/input/event1"
};
for(int i = 0; i < NR_POLL_DESC; i++)
{
int fd = open(input_devs[i], O_RDONLY | O_CLOEXEC);
if(fd < 0)
{
panicf("Cannot open input device: %s\n", input_devs[i]);
}
poll_fds[i].fd = fd;
poll_fds[i].events = POLLIN;
poll_fds[i].revents = 0;
}
}
int button_read_device(void)
{
static int button_bitmap = 0;
struct input_event event;
/* check if there are any events pending and process them */
while(poll(poll_fds, NR_POLL_DESC, 0))
{
for(int i = 0; i < NR_POLL_DESC; i++)
{
/* read only if non-blocking */
if(poll_fds[i].revents & POLLIN)
{
int size = read(poll_fds[i].fd, &event, sizeof(event));
if(size == (int)sizeof(event))
{
int keycode = event.code;
/* event.value == 0x10000 means press
* event.value == 0 means release
*/
bool press = event.value ? true : false;
/* map linux event code to rockbox button bitmap */
if(press)
{
button_bitmap |= button_map(keycode);
}
else
{
button_bitmap &= ~button_map(keycode);
}
}
}
}
}
return button_bitmap;
}
bool headphones_inserted(void)
{
int status = 0;
@ -137,12 +64,3 @@ bool headphones_inserted(void)
return status ? true : false;
}
void button_close_device(void)
{
/* close descriptors */
for(int i = 0; i < NR_POLL_DESC; i++)
{
close(poll_fds[i].fd);
}
}

2
firmware/target/hosted/agptek/button-target.h
View file

@ -39,5 +39,7 @@
#define POWEROFF_BUTTON BUTTON_POWER
#define POWEROFF_COUNT 25
int button_map(int keycode);
#endif /* _BUTTON_TARGET_H_ */

106
firmware/target/hosted/aigo/button-erosq.c
View file

@ -6,7 +6,6 @@
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
*
* Copyright (C) 2017 Marcin Bukat
* Copyright (C) 2020 Solomon Peachy
*
* This program is free software; you can redistribute it and/or
@ -18,30 +17,20 @@
* KIND, either express or implied.
*
****************************************************************************/
#include <poll.h>
//#include <dir.h>
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
#include <linux/input.h>
#include <fcntl.h>
#include <string.h>
#include <stdlib.h>
#include "sysfs.h"
#include "button.h"
#include "button-target.h"
#include "panic.h"
#include "kernel.h"
#include "backlight.h"
#include "backlight-target.h"
#include "erosqlinux_codec.h"
#define NR_POLL_DESC 2
static struct pollfd poll_fds[NR_POLL_DESC];
/*
/dev/input/event0: rotary encoder
/dev/input/event1: all keys
*/
static int button_map(int keycode)
int button_map(int keycode)
{
switch(keycode)
{
@ -80,82 +69,6 @@ static int button_map(int keycode)
}
}
void button_init_device(void)
{
const char * const input_devs[NR_POLL_DESC] = {
"/dev/input/event0", // Rotary encoder
"/dev/input/event1" // Keys
};
for(int i = 0; i < NR_POLL_DESC; i++)
{
int fd = open(input_devs[i], O_RDONLY | O_CLOEXEC);
if(fd < 0)
{
panicf("Cannot open input device: %s (%d)\n", input_devs[i], errno);
}
poll_fds[i].fd = fd;
poll_fds[i].events = POLLIN;
poll_fds[i].revents = 0;
}
}
int button_read_device(void)
{
static int button_bitmap = 0;
struct input_event event;
// FIXME TODO: Make this work via HAVE_SCROLL_WHEEL instead
/* Wheel gives us press+release back to back, clear them after time elapses */
static long last_tick = 0;
if (button_bitmap & (BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD) &&
current_tick - last_tick >= 2)
{
button_bitmap &= ~(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD);
}
/* check if there are any events pending and process them */
while(poll(poll_fds, NR_POLL_DESC, 0))
{
for(int i = 0; i < NR_POLL_DESC; i++)
{
/* read only if non-blocking */
if(poll_fds[i].revents & POLLIN)
{
int size = read(poll_fds[i].fd, &event, sizeof(event));
if(size == (int)sizeof(event))
{
int keycode = event.code;
/* event.value == 1 means press
* event.value == 0 means release
*/
bool press = event.value ? true : false;
/* map linux event code to rockbox button bitmap */
if(press)
{
int bmap = button_map(keycode);
if (bmap & (BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD))
last_tick = current_tick;
button_bitmap |= bmap;
}
else
{
/* Wheel gives us press+release back to back; ignore the release */
int bmap = button_map(keycode) & ~(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD);
button_bitmap &= ~bmap;
}
}
}
}
}
return button_bitmap;
}
bool headphones_inserted(void)
{
#ifdef BOOTLOADER
@ -177,12 +90,3 @@ bool lineout_inserted(void)
return (ps == 1);
}
void button_close_device(void)
{
/* close descriptors */
for(int i = 0; i < NR_POLL_DESC; i++)
{
close(poll_fds[i].fd);
}
}

2
firmware/target/hosted/aigo/button-target.h
View file

@ -42,4 +42,6 @@
#define POWEROFF_BUTTON BUTTON_POWER
#define POWEROFF_COUNT 25
int button_map(int keycode);
#endif /* _BUTTON_TARGET_H_ */

130
firmware/target/hosted/button-devinput.c Normal file
View file

@ -0,0 +1,130 @@
/***************************************************************************
* __________ __ ___
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
*
* Copyright (C) 2017 Marcin Bukat
* Copyright (C) 2020 Solomon Peachy
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#include <poll.h>
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
#include <linux/input.h>
#include <fcntl.h>
#include <string.h>
#include <stdlib.h>
#include "kernel.h"
#include "sysfs.h"
#include "button.h"
#include "panic.h"
#define NR_POLL_DESC 4
static int num_devices = 0;
static struct pollfd poll_fds[NR_POLL_DESC];
void button_init_device(void)
{
const char * const input_devs[NR_POLL_DESC] = {
"/dev/input/event0",
"/dev/input/event1",
"/dev/input/event2",
"/dev/input/event3",
};
for(int i = 0; i < NR_POLL_DESC; i++)
{
int fd = open(input_devs[i], O_RDONLY | O_CLOEXEC);
if(fd >= 0)
{
poll_fds[num_devices].fd = fd;
poll_fds[num_devices].events = POLLIN;
poll_fds[num_devices].revents = 0;
num_devices++;
}
}
}
void button_close_device(void)
{
/* close descriptors */
for(int i = 0; i < num_devices; i++)
{
close(poll_fds[i].fd);
}
num_devices = 0;
}
int button_read_device(void)
{
static int button_bitmap = 0;
struct input_event event;
#if defined(BUTTON_SCROLL_BACK)
// FIXME TODO: Make this work via HAVE_SCROLL_WHEEL instead
/* Wheel gives us press+release back to back, clear them after time elapses */
static long last_tick = 0;
if (button_bitmap & (BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD) &&
current_tick - last_tick >= 2)
{
button_bitmap &= ~(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD);
}
#endif
/* check if there are any events pending and process them */
while(poll(poll_fds, num_devices, 0))
{
for(int i = 0; i < num_devices; i++)
{
/* read only if non-blocking */
if(poll_fds[i].revents & POLLIN)
{
int size = read(poll_fds[i].fd, &event, sizeof(event));
if(size == (int)sizeof(event))
{
int keycode = event.code;
/* event.value == 0x10000 means press
* event.value == 0 means release
*/
bool press = event.value ? true : false;
/* map linux event code to rockbox button bitmap */
if(press)
{
button_bitmap |= button_map(keycode);
}
else
{
#if defined(BUTTON_SCROLL_BACK)
/* Wheel gives us press+release back to back; ignore the release */
int bmap = button_map(keycode) & ~(BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD);
button_bitmap &= ~bmap;
#else
button_bitmap &= ~button_map(keycode);
#endif
}
}
}
}
}
return button_bitmap;
}

3
firmware/target/hosted/fiio/button-fiio.c
View file

@ -19,7 +19,6 @@
*
****************************************************************************/
#include <poll.h>
//#include <dir.h>
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
@ -34,8 +33,6 @@
#include "panic.h"
#include "kernel.h"
#include "backlight.h"
#include "backlight-target.h"
static int key_enter_delay = 0;
static int key_right_delay = 0;

2
firmware/target/hosted/xduoo/button-target.h
View file

@ -40,4 +40,6 @@
#define POWEROFF_BUTTON BUTTON_POWER
#define POWEROFF_COUNT 25
int button_map(int keycode);
#endif /* _BUTTON_TARGET_H_ */

88
firmware/target/hosted/xduoo/button-xduoo.c
View file

@ -18,30 +18,15 @@
* KIND, either express or implied.
*
****************************************************************************/
#include <poll.h>
//#include <dir.h>
#include <errno.h>
#include <unistd.h>
#include <sys/types.h>
#include <linux/input.h>
#include <fcntl.h>
#include <string.h>
#include <stdlib.h>
#include "sysfs.h"
#include "button.h"
#include "button-target.h"
#include "panic.h"
#include "kernel.h"
#include "backlight.h"
#include "backlight-target.h"
#include "xduoolinux_codec.h"
#define NR_POLL_DESC 3
static struct pollfd poll_fds[NR_POLL_DESC];
static int button_map(int keycode)
int button_map(int keycode)
{
switch(keycode)
{
@ -74,68 +59,6 @@ static int button_map(int keycode)
}
}
void button_init_device(void)
{
const char * const input_devs[NR_POLL_DESC] = {
"/dev/input/event0",
"/dev/input/event1",
"/dev/input/event2"
};
for(int i = 0; i < NR_POLL_DESC; i++)
{
int fd = open(input_devs[i], O_RDONLY | O_CLOEXEC);
if(fd < 0)
{
panicf("Cannot open input device: %s\n", input_devs[i]);
}
poll_fds[i].fd = fd;
poll_fds[i].events = POLLIN;
poll_fds[i].revents = 0;
}
}
int button_read_device(void)
{
static int button_bitmap = 0;
struct input_event event;
/* check if there are any events pending and process them */
while(poll(poll_fds, NR_POLL_DESC, 0))
{
for(int i = 0; i < NR_POLL_DESC; i++)
{
/* read only if non-blocking */
if(poll_fds[i].revents & POLLIN)
{
int size = read(poll_fds[i].fd, &event, sizeof(event));
if(size == (int)sizeof(event))
{
int keycode = event.code;
/* event.value == 1 means press
* event.value == 0 means release
*/
bool press = event.value ? true : false;
/* map linux event code to rockbox button bitmap */
if(press)
{
button_bitmap |= button_map(keycode);
}
else
{
button_bitmap &= ~button_map(keycode);
}
}
}
}
}
return button_bitmap;
}
bool headphones_inserted(void)
{
#ifdef BOOTLOADER
@ -156,12 +79,3 @@ bool lineout_inserted(void)
#endif
return (ps == 1);
}
void button_close_device(void)
{
/* close descriptors */
for(int i = 0; i < NR_POLL_DESC; i++)
{
close(poll_fds[i].fd);
}
}