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

Message type for BUSC_I2C_EXEC

Browse source 
Change-Id: I4b6e33df2dd70d40af4a2f2c899324a40107c56a
This commit is contained in:
Lionel Sambuc 2014-05-15 16:39:51 +02:00
parent b8e631ff13
commit 3a82a3f90a
4 changed files with 16 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

@ -327,7 +327,7 @@ i2c_other(message * m, int ipc_status)
break; break;
case BUSC_I2C_EXEC: case BUSC_I2C_EXEC:
/* handle request from another driver */ /* handle request from another driver */
r = do_i2c_ioctl_exec(m->m_source, m->BUSC_I2C_GRANT); r = do_i2c_ioctl_exec(m->m_source, m->m_li2cdriver_i2c_busc_i2c_exec.grant);
break; break;
default: default:
log_warn(&log, "Invalid message type (0x%x)\n", m->m_type); log_warn(&log, "Invalid message type (0x%x)\n", m->m_type);

1
include/minix/com.h
View file

@ -155,7 +155,6 @@
#define BUSC_I2C_RESERVE (BUSC_RQ_BASE + 64) /* reserve i2c device */ #define BUSC_I2C_RESERVE (BUSC_RQ_BASE + 64) /* reserve i2c device */
#define BUSC_I2C_EXEC (BUSC_RQ_BASE + 65) /* perform i2c action */ #define BUSC_I2C_EXEC (BUSC_RQ_BASE + 65) /* perform i2c action */
#define BUSC_I2C_GRANT m2_i1 /* grant for request */
/*===========================================================================* /*===========================================================================*
* Messages for networking layer * * Messages for networking layer *

14
include/minix/ipc.h
View file

@ -587,6 +587,18 @@ typedef struct {
} mess_pm_lexec_exec_new; } mess_pm_lexec_exec_new;
_ASSERT_MSG_SIZE(mess_pm_lexec_exec_new); _ASSERT_MSG_SIZE(mess_pm_lexec_exec_new);
typedef struct {
cp_grant_id_t grant;
uint8_t padding[52];
} mess_li2cdriver_i2c_busc_i2c_exec;
_ASSERT_MSG_SIZE(mess_li2cdriver_i2c_busc_i2c_exec);
typedef struct {
uint8_t padding[56];
} mess_i2c_li2cdriver_busc_i2c_exec;
_ASSERT_MSG_SIZE(mess_i2c_li2cdriver_busc_i2c_exec);
typedef struct { typedef struct {
uint16_t addr; /* FIXME: strictly speaking this is an i2c_addr_t, but uint16_t addr; /* FIXME: strictly speaking this is an i2c_addr_t, but
to get it I would need to include to get it I would need to include
@ -1218,6 +1230,7 @@ typedef struct {
mess_fs_vfs_readsuper m_fs_vfs_readsuper; mess_fs_vfs_readsuper m_fs_vfs_readsuper;
mess_fs_vfs_readwrite m_fs_vfs_readwrite; mess_fs_vfs_readwrite m_fs_vfs_readwrite;
mess_i2c_li2cdriver_busc_i2c_exec m_i2c_li2cdriver_busc_i2c_exec;
mess_i2c_li2cdriver_busc_i2c_reserve m_i2c_li2cdriver_busc_i2c_reserve; mess_i2c_li2cdriver_busc_i2c_reserve m_i2c_li2cdriver_busc_i2c_reserve;
mess_lc_pm_exec m_lc_pm_exec; mess_lc_pm_exec m_lc_pm_exec;
@ -1264,6 +1277,7 @@ typedef struct {
mess_lexec_pm_exec_new m_lexec_pm_exec_new; mess_lexec_pm_exec_new m_lexec_pm_exec_new;
mess_li2cdriver_i2c_busc_i2c_exec m_li2cdriver_i2c_busc_i2c_exec;
mess_li2cdriver_i2c_busc_i2c_reserve m_li2cdriver_i2c_busc_i2c_reserve; mess_li2cdriver_i2c_busc_i2c_reserve m_li2cdriver_i2c_busc_i2c_reserve;
mess_lsys_krn_schedctl m_lsys_krn_schedctl; mess_lsys_krn_schedctl m_lsys_krn_schedctl;

2
lib/libi2cdriver/i2cdriver.c
View file

@ -182,7 +182,7 @@ i2cdriver_exec(endpoint_t bus_endpoint, minix_i2c_ioctl_exec_t * ioctl_exec)
memset(&m, '\0', sizeof(message)); memset(&m, '\0', sizeof(message));
m.m_type = BUSC_I2C_EXEC; m.m_type = BUSC_I2C_EXEC;
m.BUSC_I2C_GRANT = grant_nr; m.m_li2cdriver_i2c_busc_i2c_exec.grant = grant_nr;
r = ipc_sendrec(bus_endpoint, &m); r = ipc_sendrec(bus_endpoint, &m);
cpf_revoke(grant_nr); cpf_revoke(grant_nr);