Commit 73b72100 authored by spiiroin's avatar spiiroin

[usb-moded] Normalize prototype listing

Update function declaration lists.

Fix some misnomers / typos in function names.

No functional changes.
Signed-off-by: spiiroin's avatarSimo Piiroinen <simo.piiroinen@jollamobile.com>
parent b6f0fdad
...@@ -316,10 +316,24 @@ endif ...@@ -316,10 +316,24 @@ endif
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------
.SUFFIXES: .q .p .g .SUFFIXES: .q .p .g
.PRECIOUS: .q
%.q : %.c ; $(CC) -o $@ -E $< $(CPPFLAGS) $(MCE_CFLAGS)
%.p : %.q ; cproto -s < $< | prettyproto.py > $@ PROTO_CPPFLAGS += -DAPP_SYNC
%.g : %.q ; cproto < $< | prettyproto.py > $@ PROTO_CPPFLAGS += -DAPP_SYNC_DBUS
PROTO_CPPFLAGS += -DCONNMAN
PROTO_CPPFLAGS += -DDEAD_CODE
PROTO_CPPFLAGS += -DDEBIAN
PROTO_CPPFLAGS += -DMEEGOLOCK
PROTO_CPPFLAGS += -DOFONO
PROTO_CPPFLAGS += -DSYSTEMD
PROTO_CPPFLAGS += -DUSE_MER_SSU
PROTO_CPPFLAGS += -DCONNMAN_WORKS_BETTER=1
PROTO_CPPFLAGS += -DVERBOSE_WAKELOCKING=1
%.q : CPPFLAGS += $(PROTO_CPPFLAGS)
%.q : %.c ; $(CC) -o $@ -E $< $(CPPFLAGS) -O
%.p : %.q prettyproto.groups ; cproto -s < $< | prettyproto.py > $@
%.g : %.q prettyproto.groups ; cproto < $< | prettyproto.py > $@
clean:: clean::
$(RM) *.[qpg] src/*.[qpg] utils/*.[qpg] $(RM) *.[qpg] src/*.[qpg] utils/*.[qpg]
......
/** /**
* @file usb_moded-android.c * @file usb_moded-android.c
* *
* Copyright (C) 2013-2018 Jolla. All rights reserved. * Copyright (C) 2013-2019 Jolla. All rights reserved.
* *
* @author: Philippe De Swert <philippe.deswert@jollamobile.com> * @author: Philippe De Swert <philippe.deswert@jollamobile.com>
* @author: Simo Piiroinen <simo.piiroinen@jollamobile.com> * @author: Simo Piiroinen <simo.piiroinen@jollamobile.com>
...@@ -34,11 +34,14 @@ ...@@ -34,11 +34,14 @@
#include <stdlib.h> #include <stdlib.h>
/* ========================================================================= * /* ========================================================================= *
* Functions * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- android -- */ /* ------------------------------------------------------------------------- *
* ANDROID
* ------------------------------------------------------------------------- */
static bool android_write_file (const char *path, const char *text);
bool android_in_use (void); bool android_in_use (void);
static bool android_probe (void); static bool android_probe (void);
gchar *android_get_serial (void); gchar *android_get_serial (void);
......
/** /**
* @file usb_moded-android.h * @file usb_moded-android.h
* *
* Copyright (C) 2013-2018 Jolla. All rights reserved. * Copyright (C) 2013-2019 Jolla. All rights reserved.
* *
* @author: Philippe De Swert <philippe.deswert@jollamobile.com> * @author: Philippe De Swert <philippe.deswert@jollamobile.com>
* @author: Simo Piiroinen <simo.piiroinen@jollamobile.com> * @author: Simo Piiroinen <simo.piiroinen@jollamobile.com>
...@@ -44,7 +44,9 @@ ...@@ -44,7 +44,9 @@
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- android -- */ /* ------------------------------------------------------------------------- *
* ANDROID
* ------------------------------------------------------------------------- */
bool android_in_use (void); bool android_in_use (void);
gchar *android_get_serial (void); gchar *android_get_serial (void);
......
/* /*
* Copyright (C) 2010 Nokia Corporation. All rights reserved. * Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2018 Jolla Ltd. * Copyright (C) 2018-2019 Jolla Ltd.
* *
* Author: Philippe De Swert <philippe.de-swert@nokia.com> * Author: Philippe De Swert <philippe.de-swert@nokia.com>
* Author: Philippe De Swert <phdeswer@lumi.maa> * Author: Philippe De Swert <phdeswer@lumi.maa>
...@@ -33,7 +33,9 @@ ...@@ -33,7 +33,9 @@
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- dbusappsync -- */ /* ------------------------------------------------------------------------- *
* DBUSAPPSYNC
* ------------------------------------------------------------------------- */
gboolean dbusappsync_init_connection(void); gboolean dbusappsync_init_connection(void);
gboolean dbusappsync_init (void); gboolean dbusappsync_init (void);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @file usb_moded-dbus.c * @file usb_moded-dbus.c
* *
* Copyright (C) 2010 Nokia Corporation. All rights reserved. * Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2013-2018 Jolla Ltd. * Copyright (C) 2013-2019 Jolla Ltd.
* *
* @author: Philippe De Swert <philippe.de-swert@nokia.com> * @author: Philippe De Swert <philippe.de-swert@nokia.com>
* @author: Philippe De Swert <phdeswer@lumi.maa> * @author: Philippe De Swert <phdeswer@lumi.maa>
...@@ -38,7 +38,9 @@ ...@@ -38,7 +38,9 @@
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- dbusappsync -- */ /* ------------------------------------------------------------------------- *
* DBUSAPPSYNC
* ------------------------------------------------------------------------- */
static void dbusappsync_release_name (void); static void dbusappsync_release_name (void);
static gboolean dbusappsync_obtain_name (void); static gboolean dbusappsync_obtain_name (void);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @file usb_moded-appsync.c * @file usb_moded-appsync.c
* *
* Copyright (C) 2010 Nokia Corporation. All rights reserved. * Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2013-2018 Jolla Ltd. * Copyright (C) 2013-2019 Jolla Ltd.
* *
* @author: Philippe De Swert <philippe.de-swert@nokia.com> * @author: Philippe De Swert <philippe.de-swert@nokia.com>
* @author: Philippe De Swert <phdeswer@lumi.maa> * @author: Philippe De Swert <phdeswer@lumi.maa>
...@@ -40,27 +40,27 @@ ...@@ -40,27 +40,27 @@
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- appsync -- */ /* ------------------------------------------------------------------------- *
* APPSYNC
static void appsync_free_elem (list_elem_t *elem); * ------------------------------------------------------------------------- */
static void appsync_free_elem_cb (gpointer elem, gpointer user_data);
void appsync_free_appsync_list (void); static void appsync_free_elem (list_elem_t *elem);
static gint appsync_list_sort_func (gconstpointer a, gconstpointer b); static void appsync_free_elem_cb (gpointer elem, gpointer user_data);
void appsync_read_list (int diag); void appsync_free_appsync_list (void);
static list_elem_t *appsync_read_file (const gchar *filename, int diag); static gint appsync_list_sort_func (gconstpointer a, gconstpointer b);
int appsync_activate_sync (const char *mode); void appsync_read_list (int diag);
int appsync_activate_sync_post (const char *mode); static list_elem_t *appsync_read_file (const gchar *filename, int diag);
int appsync_mark_active (const gchar *name, int post); int appsync_activate_sync (const char *mode);
int appsync_activate_sync_post (const char *mode);
int appsync_mark_active (const gchar *name, int post);
#ifdef APP_SYNC_DBUS #ifdef APP_SYNC_DBUS
static gboolean appsync_enumerate_usb_cb (gpointer data); static gboolean appsync_enumerate_usb_cb (gpointer data);
static void appsync_start_enumerate_usb_timer (void); static void appsync_start_enumerate_usb_timer (void);
static void appsync_cancel_enumerate_usb_timer(void); static void appsync_cancel_enumerate_usb_timer(void);
static void appsync_enumerate_usb (void); static void appsync_enumerate_usb (void);
#endif #endif // APP_SYNC_DBUS
void appsync_stop_apps (int post);
void appsync_stop_apps (int post); int appsync_stop (gboolean force);
int appsync_stop (gboolean force);
/* ========================================================================= * /* ========================================================================= *
* Data * Data
......
/* /*
* Copyright (C) 2010 Nokia Corporation. All rights reserved. * Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2013-2018 Jolla Ltd. * Copyright (C) 2013-2019 Jolla Ltd.
* *
* author: Philippe De Swert <philippe.de-swert@nokia.com> * author: Philippe De Swert <philippe.de-swert@nokia.com>
* author: Philippe De Swert <phdeswer@lumi.maa> * author: Philippe De Swert <phdeswer@lumi.maa>
...@@ -74,14 +74,16 @@ typedef struct list_elem_t ...@@ -74,14 +74,16 @@ typedef struct list_elem_t
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- appsync -- */ /* ------------------------------------------------------------------------- *
* APPSYNC
* ------------------------------------------------------------------------- */
void appsync_free_appsync_list (void); void appsync_free_appsync_list (void);
void appsync_read_list (int diag); void appsync_read_list (int diag);
int appsync_activate_sync (const char *mode); int appsync_activate_sync (const char *mode);
int appsync_activate_sync_post(const char *mode); int appsync_activate_sync_post(const char *mode);
int appsync_mark_active (const gchar *name, int post); int appsync_mark_active (const gchar *name, int post);
int appsync_stop (gboolean force);
void appsync_stop_apps (int post); void appsync_stop_apps (int post);
int appsync_stop (gboolean force);
#endif /* USB_MODED_APPSYNC_H_ */ #endif /* USB_MODED_APPSYNC_H_ */
...@@ -35,11 +35,15 @@ typedef struct modemapping_t ...@@ -35,11 +35,15 @@ typedef struct modemapping_t
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- cable -- */ /* ------------------------------------------------------------------------- *
* CABLE_STATE
* ------------------------------------------------------------------------- */
const char *cable_state_repr(cable_state_t state); const char *cable_state_repr(cable_state_t state);
/* -- common -- */ /* ------------------------------------------------------------------------- *
* COMMON
* ------------------------------------------------------------------------- */
const char *common_map_mode_to_hardware (const char *internal_mode); const char *common_map_mode_to_hardware (const char *internal_mode);
const char *common_map_mode_to_external (const char *internal_mode); const char *common_map_mode_to_external (const char *internal_mode);
......
...@@ -34,14 +34,18 @@ typedef enum waitres_t ...@@ -34,14 +34,18 @@ typedef enum waitres_t
} waitres_t; } waitres_t;
/* ========================================================================= * /* ========================================================================= *
* Functions * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- cable -- */ /* ------------------------------------------------------------------------- *
* CABLE_STATE
* ------------------------------------------------------------------------- */
const char *cable_state_repr(cable_state_t state); const char *cable_state_repr(cable_state_t state);
/* -- common -- */ /* ------------------------------------------------------------------------- *
* COMMON
* ------------------------------------------------------------------------- */
const char *common_map_mode_to_hardware (const char *internal_mode); const char *common_map_mode_to_hardware (const char *internal_mode);
const char *common_map_mode_to_external (const char *internal_mode); const char *common_map_mode_to_external (const char *internal_mode);
......
/* /*
* Copyright (C) 2010 Nokia Corporation. All rights reserved. * Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2012-2018 Jolla. All rights reserved. * Copyright (C) 2012-2019 Jolla. All rights reserved.
* *
* Author: Philippe De Swert <philippe.de-swert@nokia.com> * Author: Philippe De Swert <philippe.de-swert@nokia.com>
* Author: Philippe De Swert <philippedeswert@gmail.com> * Author: Philippe De Swert <philippedeswert@gmail.com>
...@@ -53,7 +53,9 @@ ...@@ -53,7 +53,9 @@
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- config -- */ /* ------------------------------------------------------------------------- *
* CONFIG
* ------------------------------------------------------------------------- */
char *config_find_mounts (void); char *config_find_mounts (void);
int config_find_sync (void); int config_find_sync (void);
...@@ -65,8 +67,8 @@ char *config_get_trigger_subsystem (void); ...@@ -65,8 +67,8 @@ char *config_get_trigger_subsystem (void);
char *config_get_trigger_mode (void); char *config_get_trigger_mode (void);
char *config_get_trigger_property (void); char *config_get_trigger_property (void);
char *config_get_trigger_value (void); char *config_get_trigger_value (void);
char *config_get_conf_string (const gchar *entry, const gchar *key);
char *config_get_mode_setting (void); char *config_get_mode_setting (void);
int config_value_changed (GKeyFile *settingsfile, const char *entry, const char *key, const char *new_value);
set_config_result_t config_set_config_setting (const char *entry, const char *key, const char *value); set_config_result_t config_set_config_setting (const char *entry, const char *key, const char *value);
set_config_result_t config_set_mode_setting (const char *mode); set_config_result_t config_set_mode_setting (const char *mode);
set_config_result_t config_set_hide_mode_setting (const char *mode); set_config_result_t config_set_hide_mode_setting (const char *mode);
...@@ -83,7 +85,6 @@ char *config_get_android_product_id (void); ...@@ -83,7 +85,6 @@ char *config_get_android_product_id (void);
char *config_get_hidden_modes (void); char *config_get_hidden_modes (void);
char *config_get_mode_whitelist (void); char *config_get_mode_whitelist (void);
int config_is_roaming_not_allowed (void); int config_is_roaming_not_allowed (void);
char *config_get_conf_string (const gchar *entry, const gchar *key);
/* ========================================================================= * /* ========================================================================= *
* Macros * Macros
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @file usb_moded-config.c * @file usb_moded-config.c
* *
* Copyright (C) 2010 Nokia Corporation. All rights reserved. * Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2012-2018 Jolla. All rights reserved. * Copyright (C) 2012-2019 Jolla. All rights reserved.
* *
* @author: Philippe De Swert <philippe.de-swert@nokia.com> * @author: Philippe De Swert <philippe.de-swert@nokia.com>
* @author: Philippe De Swert <phdeswer@lumi.maa> * @author: Philippe De Swert <phdeswer@lumi.maa>
...@@ -57,7 +57,9 @@ ...@@ -57,7 +57,9 @@
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- config -- */ /* ------------------------------------------------------------------------- *
* CONFIG
* ------------------------------------------------------------------------- */
static int config_validate_ip (const char *ipadd); static int config_validate_ip (const char *ipadd);
char *config_find_mounts (void); char *config_find_mounts (void);
......
/** /**
* @file usb_moded-configfs.c * @file usb_moded-configfs.c
* *
* Copyright (C) 2018 Jolla. All rights reserved. * Copyright (C) 2018-2019 Jolla. All rights reserved.
* *
* @author: Simo Piiroinen <simo.piiroinen@jollamobile.com> * @author: Simo Piiroinen <simo.piiroinen@jollamobile.com>
* *
...@@ -64,7 +64,9 @@ ...@@ -64,7 +64,9 @@
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- configfs -- */ /* ------------------------------------------------------------------------- *
* CONFIGFS
* ------------------------------------------------------------------------- */
static gchar *configfs_get_conf (const char *key, const char *def); static gchar *configfs_get_conf (const char *key, const char *def);
static void configfs_read_configuration (void); static void configfs_read_configuration (void);
...@@ -75,6 +77,9 @@ static const char *configfs_config_path (char *buff, size_t size, con ...@@ -75,6 +77,9 @@ static const char *configfs_config_path (char *buff, size_t size, con
static bool configfs_mkdir (const char *path); static bool configfs_mkdir (const char *path);
static bool configfs_rmdir (const char *path); static bool configfs_rmdir (const char *path);
static const char *configfs_register_function (const char *function); static const char *configfs_register_function (const char *function);
#ifdef DEAD_CODE
static bool configfs_unregister_function (const char *function);
#endif //DEAD_CODE
static const char *configfs_add_unit (const char *function, const char *unit); static const char *configfs_add_unit (const char *function, const char *unit);
static bool configfs_remove_unit (const char *function, const char *unit); static bool configfs_remove_unit (const char *function, const char *unit);
static bool configfs_enable_function (const char *function); static bool configfs_enable_function (const char *function);
...@@ -86,6 +91,9 @@ static bool configfs_probe (void); ...@@ -86,6 +91,9 @@ static bool configfs_probe (void);
static const char *configfs_udc_enable_value (void); static const char *configfs_udc_enable_value (void);
static bool configfs_write_file (const char *path, const char *text); static bool configfs_write_file (const char *path, const char *text);
static bool configfs_read_file (const char *path, char *buff, size_t size); static bool configfs_read_file (const char *path, char *buff, size_t size);
#ifdef DEAD_CODE
static bool configfs_read_udc (char *buff, size_t size);
#endif // DEAD_CODE
static bool configfs_write_udc (const char *text); static bool configfs_write_udc (const char *text);
bool configfs_set_udc (bool enable); bool configfs_set_udc (bool enable);
bool configfs_init (void); bool configfs_init (void);
......
/** /**
* @file usb_moded-configfs.h * @file usb_moded-configfs.h
* *
* Copyright (C) 2018 Jolla. All rights reserved. * Copyright (C) 2018-2019 Jolla. All rights reserved.
* *
* @author: Simo Piiroinen <simo.piiroinen@jollamobile.com> * @author: Simo Piiroinen <simo.piiroinen@jollamobile.com>
* *
...@@ -29,7 +29,9 @@ ...@@ -29,7 +29,9 @@
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- configfs -- */ /* ------------------------------------------------------------------------- *
* CONFIGFS
* ------------------------------------------------------------------------- */
bool configfs_in_use (void); bool configfs_in_use (void);
bool configfs_set_udc (bool enable); bool configfs_set_udc (bool enable);
......
...@@ -37,7 +37,9 @@ ...@@ -37,7 +37,9 @@
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- usbmoded -- */ /* ------------------------------------------------------------------------- *
* CONTROL
* ------------------------------------------------------------------------- */
void control_rethink_usb_charging_fallback(void); void control_rethink_usb_charging_fallback(void);
const char *control_get_external_mode (void); const char *control_get_external_mode (void);
......
...@@ -27,7 +27,13 @@ ...@@ -27,7 +27,13 @@
# include "usb_moded.h" # include "usb_moded.h"
# include "usb_moded-common.h" # include "usb_moded-common.h"
/* -- usbmoded -- */ /* ========================================================================= *
* Prototypes
* ========================================================================= */
/* ------------------------------------------------------------------------- *
* CONTROL
* ------------------------------------------------------------------------- */
void control_rethink_usb_charging_fallback(void); void control_rethink_usb_charging_fallback(void);
const char *control_get_external_mode (void); const char *control_get_external_mode (void);
...@@ -37,7 +43,7 @@ void control_clear_target_mode (void); ...@@ -37,7 +43,7 @@ void control_clear_target_mode (void);
const char *control_get_usb_mode (void); const char *control_get_usb_mode (void);
void control_clear_internal_mode (void); void control_clear_internal_mode (void);
void control_set_usb_mode (const char *mode); void control_set_usb_mode (const char *mode);
void control_mode_switched (const char *override); void control_mode_switched (const char *mode);
void control_select_usb_mode (void); void control_select_usb_mode (void);
void control_set_cable_state (cable_state_t cable_state); void control_set_cable_state (cable_state_t cable_state);
cable_state_t control_get_cable_state (void); cable_state_t control_get_cable_state (void);
......
...@@ -53,7 +53,9 @@ typedef void (*usb_moded_get_name_owner_fn)(const char *owner); ...@@ -53,7 +53,9 @@ typedef void (*usb_moded_get_name_owner_fn)(const char *owner);
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- umdbus -- */ /* ------------------------------------------------------------------------- *
* UMDBUS
* ------------------------------------------------------------------------- */
DBusConnection *umdbus_get_connection (void); DBusConnection *umdbus_get_connection (void);
gboolean umdbus_init_connection (void); gboolean umdbus_init_connection (void);
......
...@@ -55,7 +55,9 @@ ...@@ -55,7 +55,9 @@
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- umdbus -- */ /* ------------------------------------------------------------------------- *
* UMDBUS
* ------------------------------------------------------------------------- */
static void umdbus_send_config_signal (const char *section, const char *key, const char *value); static void umdbus_send_config_signal (const char *section, const char *key, const char *value);
static DBusHandlerResult umdbus_msg_handler (DBusConnection *const connection, DBusMessage *const msg, gpointer const user_data); static DBusHandlerResult umdbus_msg_handler (DBusConnection *const connection, DBusMessage *const msg, gpointer const user_data);
...@@ -68,9 +70,9 @@ static DBusMessage *umdbus_new_signal (const char *signa ...@@ -68,9 +70,9 @@ static DBusMessage *umdbus_new_signal (const char *signa
static int umdbus_send_signal_ex (const char *signal_name, const char *content); static int umdbus_send_signal_ex (const char *signal_name, const char *content);
static void umdbus_send_legacy_signal (const char *state_ind); static void umdbus_send_legacy_signal (const char *state_ind);
void umdbus_send_current_state_signal (const char *state_ind); void umdbus_send_current_state_signal (const char *state_ind);
static bool umsdbus_append_basic_entry (DBusMessageIter *iter, const char *key, int type, const void *val); static bool umdbus_append_basic_entry (DBusMessageIter *iter, const char *key, int type, const void *val);
static bool umsdbus_append_int32_entry (DBusMessageIter *iter, const char *key, int val); static bool umdbus_append_int32_entry (DBusMessageIter *iter, const char *key, int val);
static bool umsdbus_append_string_entry (DBusMessageIter *iter, const char *key, const char *val); static bool umdbus_append_string_entry (DBusMessageIter *iter, const char *key, const char *val);
static bool umdbus_append_mode_details (DBusMessage *msg, const char *mode_name); static bool umdbus_append_mode_details (DBusMessage *msg, const char *mode_name);
static void umdbus_send_mode_details_signal (const char *mode_name); static void umdbus_send_mode_details_signal (const char *mode_name);
void umdbus_send_target_state_signal (const char *state_ind); void umdbus_send_target_state_signal (const char *state_ind);
...@@ -933,7 +935,7 @@ void umdbus_send_current_state_signal(const char *state_ind) ...@@ -933,7 +935,7 @@ void umdbus_send_current_state_signal(const char *state_ind)
* @return true on success, false on failure * @return true on success, false on failure
*/ */
static bool static bool
umsdbus_append_basic_entry(DBusMessageIter *iter, const char *key, umdbus_append_basic_entry(DBusMessageIter *iter, const char *key,
int type, const void *val) int type, const void *val)
{ {
LOG_REGISTER_CONTEXT; LOG_REGISTER_CONTEXT;
...@@ -993,12 +995,12 @@ bailout_message: ...@@ -993,12 +995,12 @@ bailout_message:
* @return true on success, false on failure * @return true on success, false on failure
*/ */
static bool static bool
umsdbus_append_int32_entry(DBusMessageIter *iter, const char *key, int val) umdbus_append_int32_entry(DBusMessageIter *iter, const char *key, int val)
{ {
LOG_REGISTER_CONTEXT; LOG_REGISTER_CONTEXT;
dbus_int32_t arg = val; dbus_int32_t arg = val;
return umsdbus_append_basic_entry(iter, key, DBUS_TYPE_INT32, &arg); return umdbus_append_basic_entry(iter, key, DBUS_TYPE_INT32, &arg);
} }
/** Append string key, variant:string value dict entry to dbus iterator /** Append string key, variant:string value dict entry to dbus iterator
...@@ -1010,14 +1012,14 @@ umsdbus_append_int32_entry(DBusMessageIter *iter, const char *key, int val) ...@@ -1010,14 +1012,14 @@ umsdbus_append_int32_entry(DBusMessageIter *iter, const char *key, int val)
* @return true on success, false on failure * @return true on success, false on failure
*/ */
static bool static bool
umsdbus_append_string_entry(DBusMessageIter *iter, const char *key, umdbus_append_string_entry(DBusMessageIter *iter, const char *key,
const char *val) const char *val)
{ {
LOG_REGISTER_CONTEXT; LOG_REGISTER_CONTEXT;
if( !val ) if( !val )
val = ""; val = "";
return umsdbus_append_basic_entry(iter, key, DBUS_TYPE_STRING, &val); return umdbus_append_basic_entry(iter, key, DBUS_TYPE_STRING, &val);
} }
/** Append dynamic mode configuration to dbus message /** Append dynamic mode configuration to dbus message
...@@ -1059,7 +1061,7 @@ umdbus_append_mode_details(DBusMessage *msg, const char *mode_name) ...@@ -1059,7 +1061,7 @@ umdbus_append_mode_details(DBusMessage *msg, const char *mode_name)
/* Note: mode_name is special case: It needs to be valid even /* Note: mode_name is special case: It needs to be valid even
* if the mode does not have dynamic configuration. * if the mode does not have dynamic configuration.
*/ */
if( !umsdbus_append_string_entry(&dict, "mode_name", mode_name) ) if( !umdbus_append_string_entry(&dict, "mode_name", mode_name) )
goto bailout_dict; goto bailout_dict;
/* For the rest of the mode attrs we use fallback data if there /* For the rest of the mode attrs we use fallback data if there
...@@ -1067,10 +1069,10 @@ umdbus_append_mode_details(DBusMessage *msg, const char *mode_name) ...@@ -1067,10 +1069,10 @@ umdbus_append_mode_details(DBusMessage *msg, const char *mode_name)
*/ */
#define ADD_STR(name) \ #define ADD_STR(name) \
if( !umsdbus_append_string_entry(&dict, #name, data ? data->name : 0) )\ if( !umdbus_append_string_entry(&dict, #name, data ? data->name : 0) )\
goto bailout_dict; goto bailout_dict;
#define ADD_INT(name) \ #define ADD_INT(name) \
if( !umsdbus_append_int32_entry(&dict, #name, data ? data->name : 0) )\ if( !umdbus_append_int32_entry(&dict, #name, data ? data->name : 0) )\
goto bailout_dict; goto bailout_dict;
/* Attributes that we presume to be needed */ /* Attributes that we presume to be needed */
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @file: usb_moded-devicelock.c * @file: usb_moded-devicelock.c
* *
* Copyright (C) 2010 Nokia Corporation. All rights reserved. * Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2013-2018 Jolla Ltd. * Copyright (C) 2013-2019 Jolla Ltd.
* *
* @author: Philippe De Swert <philippe.de-swert@nokia.com> * @author: Philippe De Swert <philippe.de-swert@nokia.com>
* @author: Philippe De Swert <philippe.deswert@jollamobile.com> * @author: Philippe De Swert <philippe.deswert@jollamobile.com>
...@@ -61,7 +61,9 @@ typedef enum devicelock_state_t ...@@ -61,7 +61,9 @@ typedef enum devicelock_state_t
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- devicelock -- */ /* ------------------------------------------------------------------------- *
* DEVICELOCK
* ------------------------------------------------------------------------- */
static const char *devicelock_state_repr (devicelock_state_t state); static const char *devicelock_state_repr (devicelock_state_t state);
bool devicelock_have_export_permission(void); bool devicelock_have_export_permission(void);
......
/* /*
* Copyright (C) 2010 Nokia Corporation. All rights reserved. * Copyright (C) 2010 Nokia Corporation. All rights reserved.
* Copyright (C) 2013-2018 Jolla Ltd. * Copyright (C) 2013-2019 Jolla Ltd.
* *
* Author: Philippe De Swert <philippe.de-swert@nokia.com> * Author: Philippe De Swert <philippe.de-swert@nokia.com>
* Author: Vesa Halttunen <vesa.halttunen@jollamobile.com> * Author: Vesa Halttunen <vesa.halttunen@jollamobile.com>
...@@ -57,10 +57,12 @@ ...@@ -57,10 +57,12 @@
* Prototypes * Prototypes
* ========================================================================= */ * ========================================================================= */
/* -- devicelock -- */ /* ------------------------------------------------------------------------- *
* DEVICELOCK
* ------------------------------------------------------------------------- */
bool devicelock_have_export_permission(void); bool devicelock_have_export_permission(void);
bool devicelock_start_listener (void);