diff options
author | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-09 10:33:51 +0200 |
---|---|---|
committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-09 15:23:47 +0200 |
commit | 71e2858271bb88c841cbe861e2dd79f8bddd6bca (patch) | |
tree | 15f7d782e2c19eb002351e68dfd13768af693a40 | |
parent | bb1807c4bae46c27f1b42e7e39a81452031633fd (diff) |
libqmi-glib: new header file for private enum/flag types
-rw-r--r-- | build-aux/qmi-codegen/utils.py | 3 | ||||
-rw-r--r-- | docs/reference/libqmi-glib/Makefile.am | 4 | ||||
-rw-r--r-- | docs/reference/libqmi-glib/libqmi-glib-common.sections | 20 | ||||
-rw-r--r-- | libqmi-glib/Makefile.am | 3 | ||||
-rw-r--r-- | libqmi-glib/generated/Makefile.am | 30 | ||||
-rw-r--r-- | libqmi-glib/qmi-enums-private.h | 85 | ||||
-rw-r--r-- | libqmi-glib/qmi-enums.h | 61 | ||||
-rw-r--r-- | libqmi-glib/qmi-message.c | 2 |
8 files changed, 123 insertions, 85 deletions
diff --git a/build-aux/qmi-codegen/utils.py b/build-aux/qmi-codegen/utils.py index 4610895..9530f03 100644 --- a/build-aux/qmi-codegen/utils.py +++ b/build-aux/qmi-codegen/utils.py @@ -74,6 +74,9 @@ def add_header_start(f, output_name, service): if service != 'CTL': template += ( "#include \"qmi-enums-${service}.h\"\n") + else: + template += ( + "#include \"qmi-enums-private.h\"\n") # CTL, WDS, WMS and PDS don't have flags64 if service != 'CTL' and service != 'WDS' and service != 'WMS' and service != 'PDS': template += ( diff --git a/docs/reference/libqmi-glib/Makefile.am b/docs/reference/libqmi-glib/Makefile.am index 20769bb..1366904 100644 --- a/docs/reference/libqmi-glib/Makefile.am +++ b/docs/reference/libqmi-glib/Makefile.am @@ -40,7 +40,9 @@ CFILE_GLOB = \ $(top_builddir)/libqmi-glib/generated/*.c # Headers to ignore -IGNORE_HFILES = +IGNORE_HFILES = \ + qmi-enums-private.h \ + qmi-enum-types-private.h # CFLAGS and LDFLAGS for compiling scan program. Only needed # if $(DOC_MODULE).types is non-empty. diff --git a/docs/reference/libqmi-glib/libqmi-glib-common.sections b/docs/reference/libqmi-glib/libqmi-glib-common.sections index 0bce0d7..96ed8a9 100644 --- a/docs/reference/libqmi-glib/libqmi-glib-common.sections +++ b/docs/reference/libqmi-glib/libqmi-glib-common.sections @@ -72,15 +72,7 @@ qmi_device_get_type IS_ENUM qmi_service_get_string qmi_service_build_string_from_mask -qmi_ctl_data_format_get_string -qmi_ctl_data_format_build_string_from_mask IS_FLAGS -qmi_ctl_data_link_protocol_get_string -qmi_ctl_data_link_protocol_build_string_from_mask -qmi_ctl_flag_get_string -qmi_ctl_flag_build_string_from_mask -qmi_service_flag_get_string -qmi_service_flag_build_string_from_mask qmi_wds_ip_family_get_string qmi_wds_ip_family_build_string_from_mask qmi_wds_technology_preference_get_string @@ -270,9 +262,6 @@ qmi_pds_data_valid_build_string_from_mask qmi_pds_tracking_session_state_get_string qmi_pds_tracking_session_state_build_string_from_mask <SUBSECTION Standard> -QMI_TYPE_CTL_DATA_FORMAT -QMI_TYPE_CTL_DATA_LINK_PROTOCOL -QMI_TYPE_CTL_FLAG QMI_TYPE_DMS_ACTIVATION_STATE QMI_TYPE_DMS_DATA_SERVICE_CAPABILITY QMI_TYPE_DMS_FIRMWARE_IMAGE_TYPE @@ -326,7 +315,6 @@ QMI_TYPE_PDS_OPERATION_MODE QMI_TYPE_PDS_POSITION_SESSION_STATUS QMI_TYPE_PDS_TRACKING_SESSION_STATE QMI_TYPE_SERVICE -QMI_TYPE_SERVICE_FLAG QMI_TYPE_WDS_AUTHENTICATION QMI_TYPE_WDS_CALL_END_REASON QMI_TYPE_WDS_CALL_TYPE @@ -369,9 +357,6 @@ QMI_TYPE_WMS_NOTIFICATION_TYPE QMI_TYPE_WMS_RECEIPT_ACTION QMI_TYPE_WMS_STORAGE_TYPE QMI_TYPE_WMS_TRANSFER_INDICATION -qmi_ctl_data_format_get_type -qmi_ctl_data_link_protocol_get_type -qmi_ctl_flag_get_type qmi_dms_activation_state_get_type qmi_dms_data_service_capability_get_type qmi_dms_firmware_image_type_get_type @@ -424,7 +409,6 @@ qmi_pds_data_valid_get_type qmi_pds_operation_mode_get_type qmi_pds_position_session_status_get_type qmi_pds_tracking_session_state_get_type -qmi_service_flag_get_type qmi_service_get_type qmi_wds_authentication_get_type qmi_wds_call_end_reason_get_type @@ -473,10 +457,6 @@ qmi_wms_transfer_indication_get_type <SECTION> <FILE>qmi-enums</FILE> QmiService -QmiCtlDataFormat -QmiCtlDataLinkProtocol -QmiCtlFlag -QmiServiceFlag </SECTION> <SECTION> diff --git a/libqmi-glib/Makefile.am b/libqmi-glib/Makefile.am index d1d9bff..ce12e0c 100644 --- a/libqmi-glib/Makefile.am +++ b/libqmi-glib/Makefile.am @@ -19,7 +19,7 @@ libqmi_glib_la_SOURCES = \ qmi-enums-nas.h \ qmi-enums-wms.h \ qmi-enums-pds.h \ - qmi-enums.h \ + qmi-enums.h qmi-enums-private.h \ qmi-utils.h qmi-utils.c \ qmi-message.h qmi-message.c \ qmi-device.h qmi-device.c \ @@ -34,6 +34,7 @@ include_HEADERS = \ libqmi-glib.h \ qmi-errors.h \ qmi-enums.h \ + qmi-enums-private.h \ qmi-enums-dms.h qmi-flags64-dms.h \ qmi-enums-wds.h \ qmi-enums-nas.h qmi-flags64-nas.h \ diff --git a/libqmi-glib/generated/Makefile.am b/libqmi-glib/generated/Makefile.am index 24be190..e73540a 100644 --- a/libqmi-glib/generated/Makefile.am +++ b/libqmi-glib/generated/Makefile.am @@ -4,6 +4,7 @@ noinst_LTLIBRARIES = libqmi-glib-generated.la GENERATED_H = \ qmi-error-types.h \ qmi-enum-types.h \ + qmi-enum-types-private.h \ qmi-flags64-types.h \ qmi-ctl.h \ qmi-dms.h \ @@ -16,6 +17,7 @@ GENERATED_C = \ qmi-error-types.c \ qmi-error-quarks.c \ qmi-enum-types.c \ + qmi-enum-types-private.c \ qmi-flags64-types.c \ qmi-ctl.c \ qmi-dms.c \ @@ -73,6 +75,22 @@ qmi-enum-types.c: $(ENUMS) qmi-enum-types.h $(top_srcdir)/build-aux/templates/qm --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c \ $(ENUMS) > $@ +# Private Enum/Flag types +PRIVATE_ENUMS = \ + $(top_srcdir)/libqmi-glib/qmi-enums-private.h +qmi-enum-types-private.h: $(PRIVATE_ENUMS) $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h + $(AM_V_GEN) $(GLIB_MKENUMS) \ + --fhead "#ifndef __LIBQMI_GLIB_ENUM_TYPES_PRIVATE_H__\n#define __LIBQMI_GLIB_ENUM_TYPES_PRIVATE_H__\n#include \"qmi-enums-private.h\"\n" \ + --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.h \ + --ftail "#endif /* __LIBQMI_GLIB_ENUM_TYPES_PRIVATE_H__ */\n" \ + $(PRIVATE_ENUMS) > $@ + +qmi-enum-types-private.c: $(PRIVATE_ENUMS) qmi-enum-types-private.h $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c + $(AM_V_GEN) $(GLIB_MKENUMS) \ + --fhead "#include \"qmi-enum-types-private.h\"\n" \ + --template $(top_srcdir)/build-aux/templates/qmi-enum-types-template.c \ + $(PRIVATE_ENUMS) > $@ + # 64bit flag types FLAGS64 = $(top_srcdir)/libqmi-glib/qmi-flags64-dms.h $(top_srcdir)/libqmi-glib/qmi-flags64-nas.h qmi-flags64-types.h: $(FLAGS64) $(top_srcdir)/build-aux/templates/qmi-flags64-types-template.h @@ -163,7 +181,15 @@ libqmi_glib_generated_la_LIBADD = \ $(LIBQMI_GLIB_LIBS) includedir = @includedir@/libqmi-glib -nodist_include_HEADERS = $(GENERATED_H) +nodist_include_HEADERS = \ + qmi-error-types.h \ + qmi-enum-types.h \ + qmi-flags64-types.h \ + qmi-ctl.h \ + qmi-dms.h \ + qmi-nas.h \ + qmi-wds.h \ + qmi-wms.h \ + qmi-pds.h CLEANFILES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_SECTIONS) - diff --git a/libqmi-glib/qmi-enums-private.h b/libqmi-glib/qmi-enums-private.h new file mode 100644 index 0000000..106c293 --- /dev/null +++ b/libqmi-glib/qmi-enums-private.h @@ -0,0 +1,85 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * libqmi-glib -- GLib/GIO based library to control QMI devices + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * Copyright (C) 2012 Google Inc. + */ + +#ifndef _LIBQMI_GLIB_QMI_ENUMS_PRIVATE_H_ +#define _LIBQMI_GLIB_QMI_ENUMS_PRIVATE_H_ + +/*****************************************************************************/ +/* QMI Control */ + +/** + * QmiCtlDataFormat: + * @QMI_CTL_DATA_FORMAT_QOS_FLOW_HEADER_ABSENT: QoS header absent + * @QMI_CTL_DATA_FORMAT_QOS_FLOW_HEADER_PRESENT: QoS header present + * + * Controls whether the network port data format includes a QoS header or not. + * Should normally be set to ABSENT. + */ +typedef enum { + QMI_CTL_DATA_FORMAT_QOS_FLOW_HEADER_ABSENT = 0, + QMI_CTL_DATA_FORMAT_QOS_FLOW_HEADER_PRESENT = 1, +} QmiCtlDataFormat; + +/** + * QmiCtlDataLinkProtocol: + * @QMI_CTL_DATA_LINK_PROTOCOL_802_3: data frames formatted as 802.3 Ethernet + * @QMI_CTL_DATA_LINK_PROTOCOL_RAW_IP: data frames are raw IP packets + * + * Determines the network port data format. Despite looking like flags, these + * values are actually mutually exclusive. + */ +typedef enum { + QMI_CTL_DATA_LINK_PROTOCOL_802_3 = 1 << 0, + QMI_CTL_DATA_LINK_PROTOCOL_RAW_IP = 1 << 1, +} QmiCtlDataLinkProtocol; + +/** + * QmiCtlFlag: + * @QMI_CTL_FLAG_NONE: None. + * @QMI_CTL_FLAG_RESPONSE: Message is a response. + * @QMI_CTL_FLAG_INDICATION: Message is an indication. + * + * QMI flags in messages of the %QMI_SERVICE_CTL service. + */ +typedef enum { + QMI_CTL_FLAG_NONE = 0, + QMI_CTL_FLAG_RESPONSE = 1 << 0, + QMI_CTL_FLAG_INDICATION = 1 << 1 +} QmiCtlFlag; + +/** + * QmiServiceFlag: + * @QMI_SERVICE_FLAG_NONE: None. + * @QMI_SERVICE_FLAG_COMPOUND: Message is compound. + * @QMI_SERVICE_FLAG_RESPONSE: Message is a response. + * @QMI_SERVICE_FLAG_INDICATION: Message is an indication. + * + * QMI flags in messages which are not of the %QMI_SERVICE_CTL service. + */ +typedef enum { + QMI_SERVICE_FLAG_NONE = 0, + QMI_SERVICE_FLAG_COMPOUND = 1 << 0, + QMI_SERVICE_FLAG_RESPONSE = 1 << 1, + QMI_SERVICE_FLAG_INDICATION = 1 << 2 +} QmiServiceFlag; + +#endif /* _LIBQMI_GLIB_QMI_ENUMS_PRIVATE_H_ */ diff --git a/libqmi-glib/qmi-enums.h b/libqmi-glib/qmi-enums.h index 7e1a198..cfb5b1e 100644 --- a/libqmi-glib/qmi-enums.h +++ b/libqmi-glib/qmi-enums.h @@ -20,8 +20,6 @@ * Copyright (C) 2012 Google, Inc. */ -#include "qmi-enums-wds.h" - #ifndef _LIBQMI_GLIB_QMI_ENUMS_H_ #define _LIBQMI_GLIB_QMI_ENUMS_H_ @@ -93,63 +91,4 @@ typedef enum { QMI_SERVICE_OMA = 0xE2 } QmiService; -/*****************************************************************************/ -/* QMI Control */ - -/** - * QmiCtlDataFormat: - * @QMI_CTL_DATA_FORMAT_QOS_FLOW_HEADER_ABSENT: QoS header absent - * @QMI_CTL_DATA_FORMAT_QOS_FLOW_HEADER_PRESENT: QoS header present - * - * Controls whether the network port data format includes a QoS header or not. - * Should normally be set to ABSENT. - */ -typedef enum { - QMI_CTL_DATA_FORMAT_QOS_FLOW_HEADER_ABSENT = 0, - QMI_CTL_DATA_FORMAT_QOS_FLOW_HEADER_PRESENT = 1, -} QmiCtlDataFormat; - -/** - * QmiCtlDataLinkProtocol: - * @QMI_CTL_DATA_LINK_PROTOCOL_802_3: data frames formatted as 802.3 Ethernet - * @QMI_CTL_DATA_LINK_PROTOCOL_RAW_IP: data frames are raw IP packets - * - * Determines the network port data format. Despite looking like flags, these - * values are actually mutually exclusive. - */ -typedef enum { - QMI_CTL_DATA_LINK_PROTOCOL_802_3 = 1 << 0, - QMI_CTL_DATA_LINK_PROTOCOL_RAW_IP = 1 << 1, -} QmiCtlDataLinkProtocol; - -/** - * QmiCtlFlag: - * @QMI_CTL_FLAG_NONE: None. - * @QMI_CTL_FLAG_RESPONSE: Message is a response. - * @QMI_CTL_FLAG_INDICATION: Message is an indication. - * - * QMI flags in messages of the %QMI_SERVICE_CTL service. - */ -typedef enum { - QMI_CTL_FLAG_NONE = 0, - QMI_CTL_FLAG_RESPONSE = 1 << 0, - QMI_CTL_FLAG_INDICATION = 1 << 1 -} QmiCtlFlag; - -/** - * QmiServiceFlag: - * @QMI_SERVICE_FLAG_NONE: None. - * @QMI_SERVICE_FLAG_COMPOUND: Message is compound. - * @QMI_SERVICE_FLAG_RESPONSE: Message is a response. - * @QMI_SERVICE_FLAG_INDICATION: Message is an indication. - * - * QMI flags in messages which are not of the %QMI_SERVICE_CTL service. - */ -typedef enum { - QMI_SERVICE_FLAG_NONE = 0, - QMI_SERVICE_FLAG_COMPOUND = 1 << 0, - QMI_SERVICE_FLAG_RESPONSE = 1 << 1, - QMI_SERVICE_FLAG_INDICATION = 1 << 2 -} QmiServiceFlag; - #endif /* _LIBQMI_GLIB_QMI_ENUMS_H_ */ diff --git a/libqmi-glib/qmi-message.c b/libqmi-glib/qmi-message.c index 267030c..319a3c3 100644 --- a/libqmi-glib/qmi-message.c +++ b/libqmi-glib/qmi-message.c @@ -35,6 +35,8 @@ #include "qmi-message.h" #include "qmi-utils.h" +#include "qmi-enums-private.h" +#include "qmi-enum-types-private.h" #include "qmi-enum-types.h" #include "qmi-error-types.h" |