michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mgmt/osdp: CP: Unify osdp_cp_send_cmd_*() as osdp_cp_send_command()

Browse source 
Minimize number of exported methods by unifying all osdp_cp_send_cmd_*()
as osdp_cp_send_command().

Signed-off-by: Siddharth Chandrasekaran <siddharth@embedjournal.com>
This commit is contained in:
Siddharth Chandrasekaran 2020-09-04 19:43:43 +05:30 • committed by Carles Cufí
commit d6437c1aa1
4 changed files with 41 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/mgmt/osdp.h
View file

@ -227,11 +227,7 @@ int osdp_cp_set_callback_key_press(
int (*cb)(int address, uint8_t key));
int osdp_cp_set_callback_card_read(
int (*cb)(int address, int format, uint8_t *data, int len));
int osdp_cp_send_cmd_output(int pd, struct osdp_cmd_output *p);
int osdp_cp_send_cmd_led(int pd, struct osdp_cmd_led *p);
int osdp_cp_send_cmd_buzzer(int pd, struct osdp_cmd_buzzer *p);
int osdp_cp_send_cmd_text(int pd, struct osdp_cmd_text *p);
int osdp_cp_send_cmd_comset(int pd, struct osdp_cmd_comset *p);
int osdp_cp_send_command(int pd, struct osdp_cmd *cmd);
#endif /* CONFIG_OSDP_MODE_PD */

11
samples/subsys/mgmt/osdp/src/cp_main.c
View file

@ -64,10 +64,11 @@ void main(void)
int ret, led_state;
uint32_t cnt = 0;
const struct device *dev;
struct osdp_cmd_output pulse_output = {
.output_no = 0, /* First output */
.control_code = 5, /* Temporarily turn on output */
.timer_count = 10, /* Timer: 10 * 100ms = 1 second */
struct osdp_cmd pulse_output = {
.id = OSDP_CMD_OUTPUT,
.output.output_no = 0, /* First output */
.output.control_code = 5, /* Temporarily turn on output */
.output.timer_count = 10, /* Timer: 10 * 100ms = 1 second */
};
dev = device_get_binding(LED0);
@ -92,7 +93,7 @@ void main(void)
led_state = !led_state;
}
if ((cnt % COMMAND_WAIT_COUNT) == 0) {
osdp_cp_send_cmd_output(OSDP_PD_0, &pulse_output);
osdp_cp_send_command(OSDP_PD_0, &pulse_output);
}
gpio_pin_set(dev, PIN, led_state);
k_msleep(SLEEP_TIME_MS);

139
subsys/mgmt/osdp/src/osdp_cp.c
View file

@ -878,7 +878,7 @@ static int state_update(struct osdp_pd *pd)
}
#ifdef CONFIG_OSDP_SC_ENABLED
static int osdp_cp_send_cmd_keyset(struct osdp_cmd_keyset *cmd)
static int osdp_cp_send_command_keyset(struct osdp_cmd_keyset *cmd)
{
int i;
struct osdp_cmd *p;
@ -931,6 +931,8 @@ int osdp_setup(struct osdp *ctx, uint8_t *key)
return 0;
}
/* --- Exported Methods --- */
int osdp_cp_set_callback_key_press(int (*cb)(int address, uint8_t key))
{
struct osdp *ctx = osdp_get_ctx();
@ -950,127 +952,50 @@ int osdp_cp_set_callback_card_read(
return 0;
}
int osdp_cp_send_cmd_output(int pd, struct osdp_cmd_output *p)
int osdp_cp_send_command(int pd, struct osdp_cmd *cmd)
{
struct osdp *ctx = osdp_get_ctx();
struct osdp_cmd *cmd;
struct osdp_cmd *p;
int cmd_id;
if (TO_PD(ctx, pd)->state != OSDP_CP_STATE_ONLINE) {
LOG_WRN(TAG "PD not online");
return -1;
}
if (pd < 0 || pd >= NUM_PD(ctx)) {
LOG_ERR(TAG "Invalid PD number");
return -1;
}
cmd = osdp_cmd_alloc(TO_PD(ctx, pd));
if (cmd == NULL) {
return -1;
}
cmd->id = CMD_OUT;
memcpy(&cmd->output, p, sizeof(struct osdp_cmd_output));
osdp_cmd_enqueue(TO_PD(ctx, pd), cmd);
return 0;
}
int osdp_cp_send_cmd_led(int pd, struct osdp_cmd_led *p)
{
struct osdp *ctx = osdp_get_ctx();
struct osdp_cmd *cmd;
if (TO_PD(ctx, pd)->state != OSDP_CP_STATE_ONLINE) {
LOG_WRN(TAG "PD not online");
return -1;
}
if (pd < 0 || pd >= NUM_PD(ctx)) {
LOG_ERR(TAG "Invalid PD number");
switch (cmd->id) {
case OSDP_CMD_OUTPUT:
cmd_id = CMD_OUT;
break;
case OSDP_CMD_LED:
cmd_id = CMD_LED;
break;
case OSDP_CMD_BUZZER:
cmd_id = CMD_BUZ;
break;
case OSDP_CMD_TEXT:
cmd_id = CMD_TEXT;
break;
case OSDP_CMD_COMSET:
cmd_id = CMD_COMSET;
break;
case OSDP_CMD_KEYSET:
return osdp_cp_send_command_keyset(&cmd->keyset);
default:
LOG_ERR(TAG "Invalid command ID %d", cmd->id);
return -1;
}
cmd = osdp_cmd_alloc(TO_PD(ctx, pd));
if (cmd == NULL) {
p = osdp_cmd_alloc(TO_PD(ctx, pd));
if (p == NULL) {
return -1;
}
cmd->id = CMD_LED;
memcpy(&cmd->led, p, sizeof(struct osdp_cmd_led));
osdp_cmd_enqueue(TO_PD(ctx, pd), cmd);
return 0;
}
int osdp_cp_send_cmd_buzzer(int pd, struct osdp_cmd_buzzer *p)
{
struct osdp *ctx = osdp_get_ctx();
struct osdp_cmd *cmd;
if (TO_PD(ctx, pd)->state != OSDP_CP_STATE_ONLINE) {
LOG_WRN(TAG "PD not online");
return -1;
}
if (pd < 0 || pd >= NUM_PD(ctx)) {
LOG_ERR(TAG "Invalid PD number");
return -1;
}
cmd = osdp_cmd_alloc(TO_PD(ctx, pd));
if (cmd == NULL) {
return -1;
}
cmd->id = CMD_BUZ;
memcpy(&cmd->buzzer, p, sizeof(struct osdp_cmd_buzzer));
osdp_cmd_enqueue(TO_PD(ctx, pd), cmd);
return 0;
}
int osdp_cp_send_cmd_text(int pd, struct osdp_cmd_text *p)
{
struct osdp *ctx = osdp_get_ctx();
struct osdp_cmd *cmd;
if (TO_PD(ctx, pd)->state != OSDP_CP_STATE_ONLINE) {
LOG_WRN(TAG "PD not online");
return -1;
}
if (pd < 0 || pd >= NUM_PD(ctx)) {
LOG_ERR(TAG "Invalid PD number");
return -1;
}
cmd = osdp_cmd_alloc(TO_PD(ctx, pd));
if (cmd == NULL) {
return -1;
}
cmd->id = CMD_TEXT;
memcpy(&cmd->text, p, sizeof(struct osdp_cmd_text));
osdp_cmd_enqueue(TO_PD(ctx, pd), cmd);
return 0;
}
int osdp_cp_send_cmd_comset(int pd, struct osdp_cmd_comset *p)
{
struct osdp *ctx = osdp_get_ctx();
struct osdp_cmd *cmd;
if (TO_PD(ctx, pd)->state != OSDP_CP_STATE_ONLINE) {
LOG_WRN(TAG "PD not online");
return -1;
}
if (pd < 0 || pd >= NUM_PD(ctx)) {
LOG_ERR(TAG "Invalid PD number");
return -1;
}
cmd = osdp_cmd_alloc(TO_PD(ctx, pd));
if (cmd == NULL) {
return -1;
}
cmd->id = CMD_COMSET;
memcpy(&cmd->text, p, sizeof(struct osdp_cmd_comset));
osdp_cmd_enqueue(TO_PD(ctx, pd), cmd);
memcpy(p, cmd, sizeof(struct osdp_cmd));
p->id = cmd_id; /* translate to internal */
osdp_cmd_enqueue(TO_PD(ctx, pd), p);
return 0;
}

2
subsys/mgmt/osdp/src/osdp_pd.c
View file

@ -794,6 +794,8 @@ int osdp_setup(struct osdp *ctx, uint8_t *key)
return 0;
}
/* --- Exported Methods --- */
int osdp_pd_get_cmd(struct osdp_cmd *cmd)
{
struct osdp_cmd *c;