colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote branch 'origin/master' into qcdm

Browse Source
This commit is contained in:
Dan Williams
2010-03-12 12:40:00 -08:00
parent 9d91501330 3e760488b6
commit 936533cfcc
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mm-generic-cdma.c
View File

@@ -28,6 +28,8 @@
#include "mm-callback-info.h" #include "mm-callback-info.h"
#include "mm-serial-parsers.h" #include "mm-serial-parsers.h"
#define MM_GENERIC_CDMA_PREV_STATE_TAG "prev-state"
static void simple_reg_callback (MMModemCdma *modem, static void simple_reg_callback (MMModemCdma *modem,
MMModemCdmaRegistrationState cdma_1x_reg_state, MMModemCdmaRegistrationState cdma_1x_reg_state,
MMModemCdmaRegistrationState evdo_reg_state, MMModemCdmaRegistrationState evdo_reg_state,

2
src/mm-generic-cdma.h
View File

@@ -71,8 +71,6 @@ MMModem *mm_generic_cdma_new (const char *device,
/* Private, for subclasses */ /* Private, for subclasses */
#define MM_GENERIC_CDMA_PREV_STATE_TAG "prev-state"
MMPort * mm_generic_cdma_grab_port (MMGenericCdma *self, MMPort * mm_generic_cdma_grab_port (MMGenericCdma *self,
const char *subsys, const char *subsys,
const char *name, const char *name,