Skip to content

RDKEMW-22932 : Remove ctrlm IARM calls/events removed from control te… #270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dwolaver wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

RDKEMW-22932 : Remove ctrlm IARM calls/events removed from control te… #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a16daf6
RDKEMW-22932 : Remove ctrlm IARM calls/events removed from control te…
dwolaver Aug 13, 2026
e47925d
remove controller unbind and rib get/set iarm apis
dwolaver Aug 13, 2026
91eda45
remove control service get/set iarm apis
dwolaver Aug 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 0 additions & 70 deletions include/ctrlm_ipc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,10 @@

#define CTRLM_MAIN_IARM_CALL_STATUS_GET "Main_StatusGet" ///< Retrieves Control Manager's Status information
Comment thread
dwolaver marked this conversation as resolved.
#define CTRLM_MAIN_IARM_CALL_NETWORK_STATUS_GET "Main_NetworkStatusGet" ///< Retrieves the network's Status information
#define CTRLM_MAIN_IARM_CALL_PROPERTY_SET "Main_PropertySet" ///< Sets a property of the Control Manager
#define CTRLM_MAIN_IARM_CALL_FACTORY_RESET "Main_FactoryReset" ///< Sets the configuration back to factory default
#define CTRLM_MAIN_IARM_CALL_CONTROLLER_UNBIND "Main_ControllerUnbind" ///< Removes a binding between the target and the specified controller
#define CTRLM_MAIN_IARM_CALL_IR_REMOTE_USAGE_GET "Main_IrRemoteUsageGet" ///< Retrieves the ir remote usage info
#define CTRLM_MAIN_IARM_CALL_LAST_KEY_INFO_GET "Main_LastKeyInfoGet" ///< Retrieves the last key info
#define CTRLM_MAIN_IARM_CALL_LAST_KEYPRESS_GET "Main_LastKeyPressGet" ///< Retrieves the last key press (TODO: replace CTRLM_MAIN_IARM_CALL_LAST_KEY_INFO_GET with this)
#define CTRLM_MAIN_IARM_CALL_CONTROL_SERVICE_SET_VALUES "Main_ControlService_SetValues" ///< IARM Call to set control service values
#define CTRLM_MAIN_IARM_CALL_CONTROL_SERVICE_GET_VALUES "Main_ControlService_GetValues" ///< IARM Call to get control service values
#define CTRLM_MAIN_IARM_CALL_PAIRING_METRICS_GET "Main_PairingMetricsGet" ///< Retrieves the stb's pairing metrics
#define CTRLM_MAIN_IARM_CALL_AUDIO_CAPTURE_START "Main_AudioCaptureStart" ///< Sends message to xraudio to capture mic data, in specified container
#define CTRLM_MAIN_IARM_CALL_AUDIO_CAPTURE_STOP "Main_AudioCaptureStop" ///< Sends message to xraudio to stop capturing mic data
Expand Down Expand Up @@ -80,28 +76,11 @@
#define CTRLM_PROPERTY_ACTIVE_PERIOD_SCREENBIND_VALUE_MIN (5000) ///< Minimum active period (in ms) for screen bind.
#define CTRLM_PROPERTY_ACTIVE_PERIOD_SCREENBIND_VALUE_MAX (600000) ///< Maximum active period (in ms) for screen bind.

#define CTRLM_PROPERTY_VALIDATION_TIMEOUT_MIN (1000) ///< Validation timeout value minimum (in ms)
#define CTRLM_PROPERTY_VALIDATION_TIMEOUT_MAX (45000) ///< Validation timeout value maximum (in ms)
#define CTRLM_PROPERTY_VALIDATION_MAX_ATTEMPTS_MAX (20) ///< Maximum number of validation attempts

#define CTRLM_PROPERTY_CONFIGURATION_TIMEOUT_MIN (1000) ///< Configuration timeout value minimum (in ms)
#define CTRLM_PROPERTY_CONFIGURATION_TIMEOUT_MAX (60000) ///< Configuration timeout value maximum (in ms)

#define CTRLM_AUTOBIND_THRESHOLD_MIN (1) ///< Autobind threshold minimum value
#define CTRLM_AUTOBIND_THRESHOLD_MAX (7) ///< Autobind threshold maximum value

#define CTRLM_MAIN_SOURCE_NAME_MAX_LENGTH (20) ///< Maximum length of source name string (including null termination)

// Bitmask defines for setting the available value in ctrlm_main_iarm_call_control_service_settings_t
#define CTRLM_MAIN_CONTROL_SERVICE_SETTINGS_ASB_ENABLED (0x01) ///< Setting to enable/disable asb
#define CTRLM_MAIN_CONTROL_SERVICE_SETTINGS_OPEN_CHIME_ENABLED (0x02) ///< Setting to enable/disable open chime
#define CTRLM_MAIN_CONTROL_SERVICE_SETTINGS_CLOSE_CHIME_ENABLED (0x04) ///< Setting to enable/disable close chime
#define CTRLM_MAIN_CONTROL_SERVICE_SETTINGS_PRIVACY_CHIME_ENABLED (0x08) ///< Setting to enable/disable privacy chime
#define CTRLM_MAIN_CONTROL_SERVICE_SETTINGS_CONVERSATIONAL_MODE (0x10) ///< Setting for conversational mode (0-6)
#define CTRLM_MAIN_CONTROL_SERVICE_SETTINGS_SET_CHIME_VOLUME (0x20) ///< Setting to set the chime volume
#define CTRLM_MAIN_CONTROL_SERVICE_SETTINGS_SET_IR_COMMAND_REPEATS (0x40) ///< Setting to set the ir command repeats

#define CTRLM_MIN_CONVERSATIONAL_MODE (0)
#define CTRLM_MAX_CONVERSATIONAL_MODE (6)
#define CTRLM_MIN_IR_COMMAND_REPEATS (1)
#define CTRLM_MAX_IR_COMMAND_REPEATS (10)
Expand Down Expand Up @@ -141,26 +120,6 @@ typedef enum {
CTRLM_IARM_CALL_RESULT_INVALID = 6, ///< Invalid call result value
} ctrlm_iarm_call_result_t;

typedef enum {
CTRLM_PROPERTY_BINDING_BUTTON_ACTIVE = 0, ///< (RO) Boolean value indicating whether a front panel button was recently pressed (1) or not (0).
CTRLM_PROPERTY_BINDING_SCREEN_ACTIVE = 1, ///< (RW) Boolean value indicating whether the 'Pairing Description Screen' is being displayed (1) or not (0).
CTRLM_PROPERTY_BINDING_LINE_OF_SIGHT_ACTIVE = 2, ///< (RO) Boolean value indicating whether the STB has received the Line of Sight remote command and is within the active period.
CTRLM_PROPERTY_AUTOBIND_LINE_OF_SIGHT_ACTIVE = 3, ///< (RO) Boolean value indicating that the STB has received the Autobind Line of Sight remote code and is within the active period.
CTRLM_PROPERTY_ACTIVE_PERIOD_BUTTON = 4, ///< (RW) Active period (in ms) for button binding.
CTRLM_PROPERTY_ACTIVE_PERIOD_LINE_OF_SIGHT = 5, ///< (RW) Active period (in ms) for line of sight.
CTRLM_PROPERTY_VALIDATION_TIMEOUT_INITIAL = 6, ///< (RW) Timeout value (in ms) used for the start of the validation period.
CTRLM_PROPERTY_VALIDATION_TIMEOUT_DURING = 7, ///< (RW) Timeout value (in ms) used during the validation period.
CTRLM_PROPERTY_CONFIGURATION_TIMEOUT = 8, ///< (RW) Timeout value (in ms) used during the configuration period.
CTRLM_PROPERTY_VALIDATION_MAX_ATTEMPTS = 9, ///< (RW) Maximum number of validation attempts.
CTRLM_PROPERTY_ACTIVE_PERIOD_SCREENBIND = 10, ///< (RW) Active period (in ms) for screenbind.
CTRLM_PROPERTY_ACTIVE_PERIOD_ONE_TOUCH_AUTOBIND = 11, ///< (RW) Active period (in ms) for one-touch autobind.
CTRLM_PROPERTY_REMOTE_REVERSE_CMD_ACTIVE = 12, ///< (RW) Boolean value indicating whether the 'Remote Reverse Command' feature is enabled (1) or not (0).
CTRLM_PROPERTY_MAC_POLLING_INTERVAL = 13, ///< (RW) MAC polling polling interval, in milliseconds.
CTRLM_PROPERTY_RCU_REVERSE_CMD_TIMEOUT = 14, ///< (RW) Find My Remote RC response timeout, Factor of CTRLM_PROPERTY_MAC_POLLING_INTERVAL, min 2
CTRLM_PROPERTY_AUTO_ACK = 15, ///< (RW) Boolean value indicating whether the 'Automatic Packet Acknowledgment' feature is enabled (1) or not (0).
CTRLM_PROPERTY_MAX = 16, ///< (NA) Maximum property enumeration value.
} ctrlm_property_t;

typedef enum {
CTRLM_MAIN_IARM_EVENT_BINDING_BUTTON = 0, ///< Generated when a state change of the binding button status occurs
CTRLM_MAIN_IARM_EVENT_BINDING_LINE_OF_SIGHT = 1, ///< Generated when a state change of the line of sight status occurs
Expand Down Expand Up @@ -407,21 +366,6 @@ typedef struct {
} status; ///< OUT - Union of network status types
} ctrlm_main_iarm_call_network_status_t;

typedef struct {
unsigned char api_revision; ///< Revision of this API
ctrlm_iarm_call_result_t result; ///< Result of the operation
ctrlm_network_id_t network_id; ///< IN - identifier of network or CTRLM_MAIN_NETWORK_ID_ALL for all networks
ctrlm_property_t name; ///< Property name on which this call will operate
unsigned long value; ///< Value for this property
} ctrlm_main_iarm_call_property_t;

typedef struct {
unsigned char api_revision; ///< Revision of this API
ctrlm_iarm_call_result_t result; ///< Result of the IARM call
ctrlm_network_id_t network_id; ///< IN - identifier of network on which the controller is bound
ctrlm_controller_id_t controller_id; ///< IN - identifier of the controller
} ctrlm_main_iarm_call_controller_unbind_t;

typedef struct {
unsigned char api_revision; ///< Revision of this API
unsigned char active; ///< Indicates that the binding button status is active (1) or not active (0)
Expand Down Expand Up @@ -474,20 +418,6 @@ typedef struct {
char source_name[CTRLM_MAIN_SOURCE_NAME_MAX_LENGTH]; ///< OUT - The source name of the last key press.
} ctrlm_main_iarm_call_last_key_info_t;

typedef struct {
unsigned char api_revision; ///< The revision of this API.
ctrlm_iarm_call_result_t result; ///< Result of the IARM call
unsigned long available; ///< Bitmask indicating the settings that are available in this event
unsigned char asb_supported; ///< Read only Boolean value to indicate asb supported enable (non-zero) or not supported (zero) asb
unsigned char asb_enabled; ///< Boolean value to enable (non-zero) or disable (zero) asb
unsigned char open_chime_enabled; ///< Boolean value to enable (non-zero) or disable (zero) open chime
unsigned char close_chime_enabled; ///< Boolean value to enable (non-zero) or disable (zero) close chime
unsigned char privacy_chime_enabled; ///< Boolean value to enable (non-zero) or disable (zero) privacy chime
unsigned char conversational_mode; ///< Boolean value to set conversational mode (0-6)
ctrlm_chime_volume_t chime_volume; ///< The chime volume
unsigned char ir_command_repeats; ///< The ir command repeats (1 - 10)
} ctrlm_main_iarm_call_control_service_settings_t;

typedef struct {
unsigned char api_revision; ///< The revision of this API.
ctrlm_iarm_call_result_t result; ///< Result of the IARM call
Expand Down
14 changes: 0 additions & 14 deletions include/ctrlm_ipc_rcu.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@

#define CTRLM_RCU_IARM_CALL_CONTROLLER_STATUS "Rcu_ControllerStatus" ///< IARM Call to get controller information
#define CTRLM_RCU_IARM_CALL_CONTROLLER_LINK_KEY "Rcu_ControllerLinkKey" ///< IARM Call to get controller link key
#define CTRLM_RCU_IARM_CALL_RIB_REQUEST_GET "Rcu_RibRequestGet" ///< IARM Call to retrieves an attribute from the controller's RIB
#define CTRLM_RCU_IARM_CALL_RIB_REQUEST_SET "Rcu_RibRequestSet" ///< IARM Call to set an attribute in the controller's RIB
#define CTRLM_RCU_IARM_CALL_RF4CE_POLLING_ACTION "Rcu_Rf4cePollingAction" ///< IARM Call to Send Remote Heartbeat Response Polling Action

#define CTRLM_RCU_IARM_BUS_API_REVISION (13) ///< Revision of the RCU IARM API
Comment thread
dwolaver marked this conversation as resolved.
Expand All @@ -42,7 +40,6 @@
#define CTRLM_RCU_MAX_EVENT_TYPE_LENGTH (20) ///< Maximum length of the event type (including null termination)
#define CTRLM_RCU_MAX_EVENT_DATA_LENGTH (50) ///< Maximum length of the event data (including null termination)

#define CTRLM_RCU_MAX_RIB_ATTRIBUTE_SIZE (92) ///< Maximum size of a RIB attribute (in bytes)
#define CTRLM_RCU_RIB_ATTR_LEN_PERIPHERAL_ID (4) ///< RIB Attribute Length - Peripheral Id
#define CTRLM_RCU_RIB_ATTR_LEN_RF_STATISTICS (16) ///< RIB Attribute Length - RF Statistics
#define CTRLM_RCU_RIB_ATTR_LEN_VERSIONING (4) ///< RIB Attribute Length - Versioning
Expand Down Expand Up @@ -422,17 +419,6 @@ typedef struct {
ctrlm_controller_status_t status; ///< Status of the controller
} ctrlm_rcu_iarm_call_controller_status_t;

typedef struct {
unsigned char api_revision; ///< Revision of this API
ctrlm_iarm_call_result_t result; ///< Result of the IARM call
ctrlm_network_id_t network_id; ///< IN - identifier of network on which the controller is bound
ctrlm_controller_id_t controller_id; ///< IN - identifier of the controller
ctrlm_rcu_rib_attr_id_t attribute_id; ///< RIB attribute identifier
unsigned char attribute_index; ///< RIB attribute index
unsigned char length; ///< RIB data length
char data[CTRLM_RCU_MAX_RIB_ATTRIBUTE_SIZE]; ///< RIB entry's data
} ctrlm_rcu_iarm_call_rib_request_t;

typedef struct {
unsigned char api_revision; ///< Revision of this API
ctrlm_iarm_call_result_t result; ///< Result of the IARM call
Expand Down
20 changes: 0 additions & 20 deletions src/ctrlm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ typedef enum {
CTRLM_MAIN_QUEUE_MSG_TYPE_TERMINATE = CTRLM_MAIN_QUEUE_MSG_TYPE_GLOBAL + 1,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_STATUS,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_FACTORY_RESET,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_CONTROLLER_UNBIND,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_IR_LINE_OF_SIGHT,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_IR_AUTOBIND,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_TIMEOUT_LINE_OF_SIGHT,
Expand All @@ -96,8 +95,6 @@ typedef enum {
CTRLM_MAIN_QUEUE_MSG_TYPE_IR_REMOTE_USAGE,
CTRLM_MAIN_QUEUE_MSG_TYPE_LAST_KEY_INFO,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_STOP_BINDING_SCREEN,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_CONTROL_SERVICE_SET_VALUES,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_CONTROL_SERVICE_GET_VALUES,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_STOP_ONE_TOUCH_AUTOBIND,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_CLOSE_PAIRING_WINDOW,
CTRLM_MAIN_QUEUE_MSG_TYPE_MAIN_BIND_STATUS_SET,
Expand Down Expand Up @@ -186,13 +183,6 @@ typedef struct {
ctrlm_main_status_cmd_result_t * cmd_result;
} ctrlm_main_queue_msg_main_factory_reset_t;

typedef struct {
ctrlm_main_queue_msg_header_t header;
ctrlm_main_iarm_call_controller_unbind_t *unbind;
sem_t * semaphore;
ctrlm_main_status_cmd_result_t * cmd_result;
} ctrlm_main_queue_msg_main_controller_unbind_t;

typedef struct {
union {
ctrlm_hal_rf4ce_cfm_init_params_t rf4ce;
Expand Down Expand Up @@ -249,13 +239,6 @@ typedef struct {
ctrlm_main_status_cmd_result_t *cmd_result;
} ctrlm_main_queue_msg_last_key_info_t;

typedef struct {
ctrlm_main_queue_msg_header_t header;
ctrlm_main_iarm_call_control_service_settings_t *settings;
sem_t * semaphore;
ctrlm_main_status_cmd_result_t * cmd_result;
} ctrlm_main_queue_msg_main_control_service_settings_t;

typedef struct {
ctrlm_main_queue_msg_header_t header;
ctrlm_main_iarm_call_control_service_pairing_mode_t *pairing;
Expand Down Expand Up @@ -426,12 +409,9 @@ bool ctrlm_main_active_period_screenbind_timeout_set_(uint32_t timeout);
gboolean ctrlm_main_iarm_call_status_get(ctrlm_main_iarm_call_status_t *status);
gboolean ctrlm_main_iarm_call_network_status_get(ctrlm_main_iarm_call_network_status_t *status);
gboolean ctrlm_main_iarm_call_factory_reset(ctrlm_main_iarm_call_factory_reset_t *reset);
gboolean ctrlm_main_iarm_call_controller_unbind(ctrlm_main_iarm_call_controller_unbind_t *unbind);
gboolean ctrlm_main_iarm_call_ir_remote_usage_get(ctrlm_main_iarm_call_ir_remote_usage_t *ir_remote_usage);
gboolean ctrlm_main_iarm_call_pairing_metrics_get(ctrlm_main_iarm_call_pairing_metrics_t *pairing_metrics);
gboolean ctrlm_main_iarm_call_last_key_info_get(ctrlm_main_iarm_call_last_key_info_t *last_key_info);
gboolean ctrlm_main_iarm_call_control_service_set_values(ctrlm_main_iarm_call_control_service_settings_t *settings);
gboolean ctrlm_main_iarm_call_control_service_get_values(ctrlm_main_iarm_call_control_service_settings_t *settings);
void ctrlm_main_iarm_call_control_service_start_pairing_mode_(ctrlm_main_iarm_call_control_service_pairing_mode_t *pairing);
void ctrlm_main_iarm_call_control_service_end_pairing_mode_(ctrlm_main_iarm_call_control_service_pairing_mode_t *pairing);

Expand Down
Loading
Loading