[svn-commits] sruffell: branch linux/kpfleming/echocan_work r6371 - in /linux/team/kpflemin...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Wed Apr 15 15:12:56 CDT 2009
Author: sruffell
Date: Wed Apr 15 15:12:53 2009
New Revision: 6371
URL: http://svn.digium.com/svn-view/dahdi?view=rev&rev=6371
Log:
Change __u32 to u32 to make it clear that the interfaces are kernel-only.
Modified:
linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_jpah.c
linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c
linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c
linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_oslec.c
linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec.c
linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec2.c
linux/team/kpfleming/echocan_work/include/dahdi/kernel.h
Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_jpah.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_jpah.c?view=diff&rev=6371&r1=6370&r2=6371
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_jpah.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_jpah.c Wed Apr 15 15:12:53 2009
@@ -43,7 +43,7 @@
static int echo_can_create(struct dahdi_echocanparams *ecp, struct dahdi_echocanparam *p,
struct dahdi_echocan_state **ec);
static void echo_can_free(struct dahdi_echocan_state *ec);
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size);
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size);
static int echo_can_traintap(struct dahdi_echocan_state *ec, int pos, short val);
static const struct dahdi_echocan_factory my_factory = {
@@ -92,10 +92,10 @@
kfree(pvt);
}
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size)
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size)
{
struct ec_pvt *pvt = dahdi_to_pvt(ec);
- __u32 x;
+ u32 x;
for (x = 0; x < size; x++) {
if (pvt->blah < 2) {
Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c?view=diff&rev=6371&r1=6370&r2=6371
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_kb1.c Wed Apr 15 15:12:53 2009
@@ -145,7 +145,7 @@
static int echo_can_create(struct dahdi_echocanparams *ecp, struct dahdi_echocanparam *p,
struct dahdi_echocan_state **ec);
static void echo_can_free(struct dahdi_echocan_state *ec);
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size);
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size);
static int echo_can_traintap(struct dahdi_echocan_state *ec, int pos, short val);
static const struct dahdi_echocan_factory my_factory = {
@@ -605,10 +605,10 @@
return u;
}
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size)
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size)
{
struct ec_pvt *pvt = dahdi_to_pvt(ec);
- __u32 x;
+ u32 x;
short result;
for (x = 0; x < size; x++) {
Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c?view=diff&rev=6371&r1=6370&r2=6371
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_mg2.c Wed Apr 15 15:12:53 2009
@@ -177,7 +177,7 @@
static int echo_can_create(struct dahdi_echocanparams *ecp, struct dahdi_echocanparam *p,
struct dahdi_echocan_state **ec);
static void echo_can_free(struct dahdi_echocan_state *ec);
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size);
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size);
static int echo_can_traintap(struct dahdi_echocan_state *ec, int pos, short val);
static const struct dahdi_echocan_factory my_factory = {
@@ -745,10 +745,10 @@
return u;
}
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size)
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size)
{
struct ec_pvt *pvt = dahdi_to_pvt(ec);
- __u32 x;
+ u32 x;
short result;
for (x = 0; x < size; x++) {
Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_oslec.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_oslec.c?view=diff&rev=6371&r1=6370&r2=6371
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_oslec.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_oslec.c Wed Apr 15 15:12:53 2009
@@ -40,7 +40,7 @@
static int echo_can_create(struct dahdi_echocanparams *ecp, struct dahdi_echocanparam *p,
struct dahdi_echocan_state **ec);
static void echo_can_free(struct dahdi_echocan_state *ec);
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size);
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size);
static int echo_can_traintap(struct dahdi_echocan_state *ec, int pos, short val);
static const struct dahdi_echocan_factory my_factory = {
@@ -70,10 +70,10 @@
kfree(pvt);
}
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size)
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size)
{
struct ec_pvt *pvt = dahdi_to_pvt(ec);
- __u32 SampleNum;
+ u32 SampleNum;
for (SampleNum = 0; SampleNum < size; SampleNum++, iref++) {
short iCleanSample;
Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec.c?view=diff&rev=6371&r1=6370&r2=6371
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec.c Wed Apr 15 15:12:53 2009
@@ -83,7 +83,7 @@
static int echo_can_create(struct dahdi_echocanparams *ecp, struct dahdi_echocanparam *p,
struct dahdi_echocan_state **ec);
static void echo_can_free(struct dahdi_echocan_state *ec);
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size);
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size);
static int echo_can_traintap(struct dahdi_echocan_state *ec, int pos, short val);
static void echocan_NLP_toggle(struct dahdi_echocan_state *ec, unsigned int enable);
@@ -291,10 +291,10 @@
return clean_rx;
}
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size)
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size)
{
struct ec_pvt *pvt = dahdi_to_pvt(ec);
- __u32 x;
+ u32 x;
short result;
for (x = 0; x < size; x++) {
Modified: linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec2.c
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec2.c?view=diff&rev=6371&r1=6370&r2=6371
==============================================================================
--- linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec2.c (original)
+++ linux/team/kpfleming/echocan_work/drivers/dahdi/dahdi_echocan_sec2.c Wed Apr 15 15:12:53 2009
@@ -79,7 +79,7 @@
static int echo_can_create(struct dahdi_echocanparams *ecp, struct dahdi_echocanparam *p,
struct dahdi_echocan_state **ec);
static void echo_can_free(struct dahdi_echocan_state *ec);
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size);
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size);
static int echo_can_traintap(struct dahdi_echocan_state *ec, int pos, short val);
static const struct dahdi_echocan_factory my_factory = {
@@ -292,10 +292,10 @@
return clean_rx;
}
-static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size)
+static void echo_can_array_update(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size)
{
struct ec_pvt *pvt = dahdi_to_pvt(ec);
- __u32 x;
+ u32 x;
short result;
for (x = 0; x < size; x++) {
Modified: linux/team/kpfleming/echocan_work/include/dahdi/kernel.h
URL: http://svn.digium.com/svn-view/dahdi/linux/team/kpfleming/echocan_work/include/dahdi/kernel.h?view=diff&rev=6371&r1=6370&r2=6371
==============================================================================
--- linux/team/kpfleming/echocan_work/include/dahdi/kernel.h (original)
+++ linux/team/kpfleming/echocan_work/include/dahdi/kernel.h Wed Apr 15 15:12:53 2009
@@ -159,7 +159,7 @@
* disable itself or its non-linear processor, then the NLP_automatic feature flag should also
* be set so that the DAHDI core doesn't bother trying to do so.
*/
- __u32 CED_tx_detect:1;
+ u32 CED_tx_detect:1;
/*! Able to detect CED tone (2100 Hz with phase reversals) in the receive direction.
* If the echocan can detect this tone, it may report it it as an event (see
@@ -167,27 +167,27 @@
* disable itself or its non-linear processor, then the NLP_automatic flag feature should also
* be set so that the DAHDI core doesn't bother trying to do so.
*/
- __u32 CED_rx_detect:1;
+ u32 CED_rx_detect:1;
/*! Able to detect CNG tone (1100 Hz) in the transmit direction. */
- __u32 CNG_tx_detect:1;
+ u32 CNG_tx_detect:1;
/*! Able to detect CNG tone (1100 Hz) in the receive direction. */
- __u32 CNG_rx_detect:1;
+ u32 CNG_rx_detect:1;
/*! If the echocan's NLP can be enabled and disabled without requiring destruction
* and recreation of the state structure, this feature flag should be set and the
* echocan_NLP_toggle field of the dahdi_echocan_ops structure should be filled with a
* pointer to the function to perform that operation.
*/
- __u32 NLP_toggle:1;
+ u32 NLP_toggle:1;
/*! If the echocan will automatically disable itself (or even just its NLP) based on
* detection of a CED tone in either direction, this feature flag should be set (along
* with the tone detection feature flags). When the disable/enable occurs, the
* status.NLP_enabled field of the dahdi_echocan_state structure should be updated.
*/
- __u32 NLP_automatic:1;
+ u32 NLP_automatic:1;
};
/*! Operations (methods) that can be performed on a DAHDI echo canceler instance (state
@@ -212,7 +212,7 @@
*
* \return Nothing.
*/
- void (*echocan_array_update)(struct dahdi_echocan_state *ec, short *isig, const short *iref, __u32 size);
+ void (*echocan_array_update)(struct dahdi_echocan_state *ec, short *isig, const short *iref, u32 size);
/*! \brief Feed a sample (and its position) for echocan training.
* \param[in,out] ec Pointer to the state structure.
@@ -294,7 +294,7 @@
struct {
/*! Whether the echocan's NLP is currently enabled or disabled. */
- __u32 NLP_enabled:1;
+ u32 NLP_enabled:1;
} status;
/*! This structure contains event flags, allowing the echocan to report
@@ -304,7 +304,7 @@
* calling that operation.
*/
union dahdi_echocan_events {
- __u32 all;
+ u32 all;
struct {
/*! CED tone was detected in the transmit direction. If the
* echocan automatically disables its NLP when this occurs,
@@ -312,7 +312,7 @@
* set the status.NLP_enabled flag to zero during the *same*
* call to echocan_array_update that reports the CED detection.
*/
- __u32 CED_tx_detected:1;
+ u32 CED_tx_detected:1;
/*! CED tone was detected in the receive direction. If the
* echocan automatically disables its NLP when this occurs,
@@ -320,27 +320,27 @@
* set the status.NLP_enabled flag to zero during the *same*
* call to echocan_array_update that reports the CED detection.
*/
- __u32 CED_rx_detected:1;
+ u32 CED_rx_detected:1;
/*! CNG tone was detected in the transmit direction. */
- __u32 CNG_tx_detected:1;
+ u32 CNG_tx_detected:1;
/*! CNG tone was detected in the receive direction. */
- __u32 CNG_rx_detected:1;
+ u32 CNG_rx_detected:1;
/*! The echocan disabled its NLP automatically. The echocan
* must also set the status.NLP_enabled flag to zero during
* the *same* call to echocan_array_update that reports the
* NLP disablement.
*/
- __u32 NLP_auto_disabled:1;
+ u32 NLP_auto_disabled:1;
/*! The echocan enabled its NLP automatically. The echocan
* must also set the status.NLP_enabled flag to non-zero during
* the *same* call to echocan_array_update that reports the
* NLP enablement.
*/
- __u32 NLP_auto_enabled:1;
+ u32 NLP_auto_enabled:1;
};
} events;
};
More information about the svn-commits
mailing list