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

Message type for BUSC_I2C_RESERVE

Browse source 
Change-Id: Iedc2615b41c65f826868a70448fb1143bd85670f
This commit is contained in:
Lionel Sambuc 2014-05-15 16:14:21 +02:00
parent ff905e5276
commit b8e631ff13
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/i2c/i2c.c
View file

@ -323,7 +323,7 @@ i2c_other(message * m, int ipc_status)
switch (m->m_type) {
case BUSC_I2C_RESERVE:
/* reserve a device on the bus for exclusive access */
r = do_reserve(m->m_source, m->BUSC_I2C_ADDR);
r = do_reserve(m->m_source, m->m_li2cdriver_i2c_busc_i2c_reserve.addr);
break;
case BUSC_I2C_EXEC:
/* handle request from another driver */

1
include/minix/com.h
View file

@ -154,7 +154,6 @@
*/
#define BUSC_I2C_RESERVE (BUSC_RQ_BASE + 64) /* reserve i2c device */
#define BUSC_I2C_ADDR m2_i1 /* slave address */
#define BUSC_I2C_EXEC (BUSC_RQ_BASE + 65) /* perform i2c action */
#define BUSC_I2C_GRANT m2_i1 /* grant for request */

19
include/minix/ipc.h
View file

@ -587,6 +587,21 @@ typedef struct {
} mess_pm_lexec_exec_new;
_ASSERT_MSG_SIZE(mess_pm_lexec_exec_new);
typedef struct {
uint16_t addr; /* FIXME: strictly speaking this is an i2c_addr_t, but
to get it I would need to include
sys/dev/i2c/i2c_io.h, which I am not sure is a good
idea to have everywhere. */
uint8_t padding[54];
} mess_li2cdriver_i2c_busc_i2c_reserve;
_ASSERT_MSG_SIZE(mess_li2cdriver_i2c_busc_i2c_reserve);
typedef struct {
uint8_t padding[56];
} mess_i2c_li2cdriver_busc_i2c_reserve;
_ASSERT_MSG_SIZE(mess_i2c_li2cdriver_busc_i2c_reserve);
typedef struct {
uint32_t flags;
endpoint_t endpoint;
@ -1203,6 +1218,8 @@ typedef struct {
mess_fs_vfs_readsuper m_fs_vfs_readsuper;
mess_fs_vfs_readwrite m_fs_vfs_readwrite;
mess_i2c_li2cdriver_busc_i2c_reserve m_i2c_li2cdriver_busc_i2c_reserve;
mess_lc_pm_exec m_lc_pm_exec;
mess_lc_pm_exit m_lc_pm_exit;
mess_lc_pm_getsid m_lc_pm_getsid;
@ -1247,6 +1264,8 @@ typedef struct {
mess_lexec_pm_exec_new m_lexec_pm_exec_new;
mess_li2cdriver_i2c_busc_i2c_reserve m_li2cdriver_i2c_busc_i2c_reserve;
mess_lsys_krn_schedctl m_lsys_krn_schedctl;
mess_lsys_krn_schedule m_lsys_krn_schedule;

2
lib/libi2cdriver/i2cdriver.c
View file

@ -159,7 +159,7 @@ i2cdriver_reserve_device(endpoint_t bus_endpoint, i2c_addr_t address)
message m;
m.m_type = BUSC_I2C_RESERVE;
m.BUSC_I2C_ADDR = address;
m.m_li2cdriver_i2c_busc_i2c_reserve.addr = address;
r = ipc_sendrec(bus_endpoint, &m);
if (r != OK) {