mirror of git://git.sysmocom.de/ofono
stkutil: Add parser for frame layout objects
This commit is contained in:
parent
b0d9e6df17
commit
642a7ed3ec
|
@ -1578,6 +1578,30 @@ static gboolean parse_dataobj_browsing_status(
|
||||||
return parse_dataobj_common_byte_array(iter, array);
|
return parse_dataobj_common_byte_array(iter, array);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Defined in TS 102.223 Section 8.78 */
|
||||||
|
static gboolean parse_dataobj_frame_layout(struct comprehension_tlv_iter *iter,
|
||||||
|
void *user)
|
||||||
|
{
|
||||||
|
struct stk_frame_layout *fl = user;
|
||||||
|
const unsigned char *data;
|
||||||
|
unsigned char len = comprehension_tlv_iter_get_length(iter);
|
||||||
|
|
||||||
|
if (len < 2)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
data = comprehension_tlv_iter_get_data(iter);
|
||||||
|
|
||||||
|
if (data[0] != STK_LAYOUT_HORIZONTAL &&
|
||||||
|
data[0] != STK_LAYOUT_VERTICAL)
|
||||||
|
return FALSE;
|
||||||
|
|
||||||
|
fl->layout = data[0];
|
||||||
|
fl->len = len - 1;
|
||||||
|
memcpy(fl->size, data + 1, fl->len);
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
/* Defined in TS 102.223 Section 8.80 */
|
/* Defined in TS 102.223 Section 8.80 */
|
||||||
static gboolean parse_dataobj_frame_id(struct comprehension_tlv_iter *iter,
|
static gboolean parse_dataobj_frame_id(struct comprehension_tlv_iter *iter,
|
||||||
void *user)
|
void *user)
|
||||||
|
@ -1741,6 +1765,8 @@ static dataobj_handler handler_for_type(enum stk_data_object_type type)
|
||||||
return parse_dataobj_battery_state;
|
return parse_dataobj_battery_state;
|
||||||
case STK_DATA_OBJECT_TYPE_BROWSING_STATUS:
|
case STK_DATA_OBJECT_TYPE_BROWSING_STATUS:
|
||||||
return parse_dataobj_browsing_status;
|
return parse_dataobj_browsing_status;
|
||||||
|
case STK_DATA_OBJECT_TYPE_FRAME_LAYOUT:
|
||||||
|
return parse_dataobj_frame_layout;
|
||||||
case STK_DATA_OBJECT_TYPE_FRAME_ID:
|
case STK_DATA_OBJECT_TYPE_FRAME_ID:
|
||||||
return parse_dataobj_frame_id;
|
return parse_dataobj_frame_id;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -365,6 +365,11 @@ enum stk_battery_state {
|
||||||
STK_BATTERY_FULL = 0x04
|
STK_BATTERY_FULL = 0x04
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum stk_frame_layout_type {
|
||||||
|
STK_LAYOUT_HORIZONTAL = 0x01,
|
||||||
|
STK_LAYOUT_VERTICAL = 0x02
|
||||||
|
};
|
||||||
|
|
||||||
/* For data object that only has a byte array with undetermined length */
|
/* For data object that only has a byte array with undetermined length */
|
||||||
struct stk_common_byte_array {
|
struct stk_common_byte_array {
|
||||||
unsigned char *array;
|
unsigned char *array;
|
||||||
|
@ -693,6 +698,17 @@ struct stk_item_text_attribute_list {
|
||||||
unsigned char len;
|
unsigned char len;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/*
|
||||||
|
* According to 102.223 Section 8.78 the length of CTLV is 1 byte. This means
|
||||||
|
* that the maximum length is 127 bytes for the total length of layout and
|
||||||
|
* relative-sized frame. Thus the maximum length of relative size is 126 bytes.
|
||||||
|
*/
|
||||||
|
struct stk_frame_layout {
|
||||||
|
unsigned char layout;
|
||||||
|
unsigned char size[126];
|
||||||
|
unsigned int len;
|
||||||
|
};
|
||||||
|
|
||||||
struct stk_command_display_text {
|
struct stk_command_display_text {
|
||||||
char *text;
|
char *text;
|
||||||
struct stk_icon_id icon_id;
|
struct stk_icon_id icon_id;
|
||||||
|
|
Loading…
Reference in New Issue