sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Message type for INPUT_SETLEDS

Browse source 
Change-Id: I84ee6ee43d771409526468ce45f1ddc27e9ca986
This commit is contained in:
Lionel Sambuc 2014-05-19 10:39:55 +02:00
parent 4ed3f29e7f
commit 1a943bea52
5 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/tty/arch/i386/keyboard.c
View file

@ -378,7 +378,7 @@ static void set_leds(void)
memset(&m, 0, sizeof(m));
m.m_type = INPUT_SETLEDS;
m.INPUT_LED_MASK = locks[ccurrent] & ~ALT_LOCK;
m.m_input_linputdriver_setleds.led_mask = locks[ccurrent] & ~ALT_LOCK;
if ((r = asynsend3(input_endpt, &m, AMF_NOREPLY)) != OK)
printf("TTY: asynsend to INPUT %u failed (%d)\n", input_endpt, r);

2
include/minix/com.h
View file

@ -1084,9 +1084,7 @@
#define INPUT_RS_BASE 0x1580 /* from input driver to input server */
#define INPUT_CONF (INPUT_RQ_BASE + 0) /* configure driver */
#define INPUT_SETLEDS (INPUT_RQ_BASE + 1) /* set keyboard LEDs */
# define INPUT_LED_MASK m7_i1 /* status mask of LEDs */
#define INPUT_EVENT (INPUT_RS_BASE + 0) /* send input event */

8
include/minix/ipc.h
View file

@ -640,6 +640,13 @@ typedef struct {
} mess_input_linputdriver_input_conf;
_ASSERT_MSG_SIZE(mess_input_linputdriver_input_conf);
typedef struct {
uint32_t led_mask;
uint8_t padding[52];
} mess_input_linputdriver_setleds;
_ASSERT_MSG_SIZE(mess_input_linputdriver_setleds);
typedef struct {
int id;
int page;
@ -1271,6 +1278,7 @@ typedef struct {
mess_i2c_li2cdriver_busc_i2c_reserve m_i2c_li2cdriver_busc_i2c_reserve;
mess_input_linputdriver_input_conf m_input_linputdriver_input_conf;
mess_input_linputdriver_setleds m_input_linputdriver_setleds;
mess_lc_pm_exec m_lc_pm_exec;
mess_lc_pm_exit m_lc_pm_exit;

2
lib/libinputdriver/inputdriver.c
View file

@ -128,7 +128,7 @@ do_setleds(struct inputdriver *idp, message *m_ptr)
return;
}
mask = m_ptr->INPUT_LED_MASK;
mask = m_ptr->m_input_linputdriver_setleds.led_mask;
if (idp->idr_leds)
idp->idr_leds(mask);

4
servers/input/input.c
View file

@ -212,7 +212,7 @@ input_set_leds(devminor_t minor, unsigned int mask)
memset(&m, 0, sizeof(m));
m.m_type = INPUT_SETLEDS;
m.INPUT_LED_MASK = mask;
m.m_input_linputdriver_setleds.led_mask = mask;
/*
* Send the request to all matching keyboard devices. As side effect,
@ -621,7 +621,7 @@ input_other(message *m, int ipc_status)
case INPUT_SETLEDS:
if (m->m_source == TTY_PROC_NR) {
input_set_leds(KBDMUX_MINOR, m->INPUT_LED_MASK);
input_set_leds(KBDMUX_MINOR, m->m_input_linputdriver_setleds.led_mask);
break;
}