Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[usb-moded] Normalize prototype listing
Update function declaration lists.

Fix some misnomers / typos in function names.

No functional changes.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
  • Loading branch information
spiiroin committed Apr 9, 2019
1 parent b6f0fda commit 73b7210
Show file tree
Hide file tree
Showing 48 changed files with 442 additions and 290 deletions.
22 changes: 18 additions & 4 deletions Makefile.custom
Expand Up @@ -316,10 +316,24 @@ endif
# ----------------------------------------------------------------------------

.SUFFIXES: .q .p .g

%.q : %.c ; $(CC) -o $@ -E $< $(CPPFLAGS) $(MCE_CFLAGS)
%.p : %.q ; cproto -s < $< | prettyproto.py > $@
%.g : %.q ; cproto < $< | prettyproto.py > $@
.PRECIOUS: .q

PROTO_CPPFLAGS += -DAPP_SYNC
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::
$(RM) *.[qpg] src/*.[qpg] utils/*.[qpg]
Expand Down
9 changes: 6 additions & 3 deletions src/usb_moded-android.c
@@ -1,7 +1,7 @@
/**
* @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: Simo Piiroinen <simo.piiroinen@jollamobile.com>
Expand Down Expand Up @@ -34,11 +34,14 @@
#include <stdlib.h>

/* ========================================================================= *
* Functions
* Prototypes
* ========================================================================= */

/* -- android -- */
/* ------------------------------------------------------------------------- *
* ANDROID
* ------------------------------------------------------------------------- */

static bool android_write_file (const char *path, const char *text);
bool android_in_use (void);
static bool android_probe (void);
gchar *android_get_serial (void);
Expand Down
6 changes: 4 additions & 2 deletions src/usb_moded-android.h
@@ -1,7 +1,7 @@
/**
* @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: Simo Piiroinen <simo.piiroinen@jollamobile.com>
Expand Down Expand Up @@ -44,7 +44,9 @@
* Prototypes
* ========================================================================= */

/* -- android -- */
/* ------------------------------------------------------------------------- *
* ANDROID
* ------------------------------------------------------------------------- */

bool android_in_use (void);
gchar *android_get_serial (void);
Expand Down
6 changes: 4 additions & 2 deletions src/usb_moded-appsync-dbus-private.h
@@ -1,6 +1,6 @@
/*
* 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 <phdeswer@lumi.maa>
Expand Down Expand Up @@ -33,7 +33,9 @@
* Prototypes
* ========================================================================= */

/* -- dbusappsync -- */
/* ------------------------------------------------------------------------- *
* DBUSAPPSYNC
* ------------------------------------------------------------------------- */

gboolean dbusappsync_init_connection(void);
gboolean dbusappsync_init (void);
Expand Down
6 changes: 4 additions & 2 deletions src/usb_moded-appsync-dbus.c
Expand Up @@ -2,7 +2,7 @@
* @file usb_moded-dbus.c
*
* 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 <phdeswer@lumi.maa>
Expand Down Expand Up @@ -38,7 +38,9 @@
* Prototypes
* ========================================================================= */

/* -- dbusappsync -- */
/* ------------------------------------------------------------------------- *
* DBUSAPPSYNC
* ------------------------------------------------------------------------- */

static void dbusappsync_release_name (void);
static gboolean dbusappsync_obtain_name (void);
Expand Down
42 changes: 21 additions & 21 deletions src/usb_moded-appsync.c
Expand Up @@ -2,7 +2,7 @@
* @file usb_moded-appsync.c
*
* 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 <phdeswer@lumi.maa>
Expand Down Expand Up @@ -40,27 +40,27 @@
* Prototypes
* ========================================================================= */

/* -- 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 gint appsync_list_sort_func (gconstpointer a, gconstpointer b);
void appsync_read_list (int diag);
static list_elem_t *appsync_read_file (const gchar *filename, int diag);
int appsync_activate_sync (const char *mode);
int appsync_activate_sync_post (const char *mode);
int appsync_mark_active (const gchar *name, int post);

/* ------------------------------------------------------------------------- *
* 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 gint appsync_list_sort_func (gconstpointer a, gconstpointer b);
void appsync_read_list (int diag);
static list_elem_t *appsync_read_file (const gchar *filename, int diag);
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
static gboolean appsync_enumerate_usb_cb (gpointer data);
static void appsync_start_enumerate_usb_timer (void);
static void appsync_cancel_enumerate_usb_timer(void);
static void appsync_enumerate_usb (void);
#endif

void appsync_stop_apps (int post);
int appsync_stop (gboolean force);
static gboolean appsync_enumerate_usb_cb (gpointer data);
static void appsync_start_enumerate_usb_timer (void);
static void appsync_cancel_enumerate_usb_timer(void);
static void appsync_enumerate_usb (void);
#endif // APP_SYNC_DBUS
void appsync_stop_apps (int post);
int appsync_stop (gboolean force);

/* ========================================================================= *
* Data
Expand Down
8 changes: 5 additions & 3 deletions src/usb_moded-appsync.h
@@ -1,6 +1,6 @@
/*
* 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 <phdeswer@lumi.maa>
Expand Down Expand Up @@ -74,14 +74,16 @@ typedef struct list_elem_t
* Prototypes
* ========================================================================= */

/* -- appsync -- */
/* ------------------------------------------------------------------------- *
* APPSYNC
* ------------------------------------------------------------------------- */

void appsync_free_appsync_list (void);
void appsync_read_list (int diag);
int appsync_activate_sync (const char *mode);
int appsync_activate_sync_post(const char *mode);
int appsync_mark_active (const gchar *name, int post);
int appsync_stop (gboolean force);
void appsync_stop_apps (int post);
int appsync_stop (gboolean force);

#endif /* USB_MODED_APPSYNC_H_ */
8 changes: 6 additions & 2 deletions src/usb_moded-common.c
Expand Up @@ -35,11 +35,15 @@ typedef struct modemapping_t
* Prototypes
* ========================================================================= */

/* -- cable -- */
/* ------------------------------------------------------------------------- *
* CABLE_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_external (const char *internal_mode);
Expand Down
10 changes: 7 additions & 3 deletions src/usb_moded-common.h
Expand Up @@ -34,14 +34,18 @@ typedef enum waitres_t
} waitres_t;

/* ========================================================================= *
* Functions
* Prototypes
* ========================================================================= */

/* -- cable -- */
/* ------------------------------------------------------------------------- *
* CABLE_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_external (const char *internal_mode);
Expand Down
9 changes: 5 additions & 4 deletions src/usb_moded-config-private.h
@@ -1,6 +1,6 @@
/*
* 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 <philippedeswert@gmail.com>
Expand Down Expand Up @@ -53,7 +53,9 @@
* Prototypes
* ========================================================================= */

/* -- config -- */
/* ------------------------------------------------------------------------- *
* CONFIG
* ------------------------------------------------------------------------- */

char *config_find_mounts (void);
int config_find_sync (void);
Expand All @@ -65,8 +67,8 @@ char *config_get_trigger_subsystem (void);
char *config_get_trigger_mode (void);
char *config_get_trigger_property (void);
char *config_get_trigger_value (void);
char *config_get_conf_string (const gchar *entry, const gchar *key);
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_mode_setting (const char *mode);
set_config_result_t config_set_hide_mode_setting (const char *mode);
Expand All @@ -83,7 +85,6 @@ char *config_get_android_product_id (void);
char *config_get_hidden_modes (void);
char *config_get_mode_whitelist (void);
int config_is_roaming_not_allowed (void);
char *config_get_conf_string (const gchar *entry, const gchar *key);

/* ========================================================================= *
* Macros
Expand Down
6 changes: 4 additions & 2 deletions src/usb_moded-config.c
Expand Up @@ -2,7 +2,7 @@
* @file usb_moded-config.c
*
* 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 <phdeswer@lumi.maa>
Expand Down Expand Up @@ -57,7 +57,9 @@
* Prototypes
* ========================================================================= */

/* -- config -- */
/* ------------------------------------------------------------------------- *
* CONFIG
* ------------------------------------------------------------------------- */

static int config_validate_ip (const char *ipadd);
char *config_find_mounts (void);
Expand Down
12 changes: 10 additions & 2 deletions src/usb_moded-configfs.c
@@ -1,7 +1,7 @@
/**
* @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>
*
Expand Down Expand Up @@ -64,7 +64,9 @@
* Prototypes
* ========================================================================= */

/* -- configfs -- */
/* ------------------------------------------------------------------------- *
* CONFIGFS
* ------------------------------------------------------------------------- */

static gchar *configfs_get_conf (const char *key, const char *def);
static void configfs_read_configuration (void);
Expand All @@ -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_rmdir (const char *path);
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 bool configfs_remove_unit (const char *function, const char *unit);
static bool configfs_enable_function (const char *function);
Expand All @@ -86,6 +91,9 @@ static bool configfs_probe (void);
static const char *configfs_udc_enable_value (void);
static bool configfs_write_file (const char *path, const char *text);
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);
bool configfs_set_udc (bool enable);
bool configfs_init (void);
Expand Down
6 changes: 4 additions & 2 deletions src/usb_moded-configfs.h
@@ -1,7 +1,7 @@
/**
* @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>
*
Expand Down Expand Up @@ -29,7 +29,9 @@
* Prototypes
* ========================================================================= */

/* -- configfs -- */
/* ------------------------------------------------------------------------- *
* CONFIGFS
* ------------------------------------------------------------------------- */

bool configfs_in_use (void);
bool configfs_set_udc (bool enable);
Expand Down
4 changes: 3 additions & 1 deletion src/usb_moded-control.c
Expand Up @@ -37,7 +37,9 @@
* Prototypes
* ========================================================================= */

/* -- usbmoded -- */
/* ------------------------------------------------------------------------- *
* CONTROL
* ------------------------------------------------------------------------- */

void control_rethink_usb_charging_fallback(void);
const char *control_get_external_mode (void);
Expand Down
10 changes: 8 additions & 2 deletions src/usb_moded-control.h
Expand Up @@ -27,7 +27,13 @@
# include "usb_moded.h"
# include "usb_moded-common.h"

/* -- usbmoded -- */
/* ========================================================================= *
* Prototypes
* ========================================================================= */

/* ------------------------------------------------------------------------- *
* CONTROL
* ------------------------------------------------------------------------- */

void control_rethink_usb_charging_fallback(void);
const char *control_get_external_mode (void);
Expand All @@ -37,7 +43,7 @@ void control_clear_target_mode (void);
const char *control_get_usb_mode (void);
void control_clear_internal_mode (void);
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_set_cable_state (cable_state_t cable_state);
cable_state_t control_get_cable_state (void);
Expand Down

0 comments on commit 73b7210

Please sign in to comment.