[dahdi-commits] tzafrir: linux/trunk r10424 - /linux/trunk/drivers/dahdi/xpp/
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Wed Jan 11 09:19:04 CST 2012
Author: tzafrir
Date: Wed Jan 11 09:19:01 2012
New Revision: 10424
URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=10424
Log:
xpp: style - Remove space before tabs
* Applied via:
perl -pi -e 's/ +\t/\t/g;' "$@"
Signed-off-by: Oron Peled <oron.peled at xorcom.com>
Acked-By: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Modified:
linux/trunk/drivers/dahdi/xpp/card_bri.c
linux/trunk/drivers/dahdi/xpp/card_fxo.c
linux/trunk/drivers/dahdi/xpp/card_fxs.c
linux/trunk/drivers/dahdi/xpp/card_global.c
linux/trunk/drivers/dahdi/xpp/card_pri.c
linux/trunk/drivers/dahdi/xpp/xbus-core.c
linux/trunk/drivers/dahdi/xpp/xbus-pcm.c
linux/trunk/drivers/dahdi/xpp/xbus-sysfs.c
linux/trunk/drivers/dahdi/xpp/xpp_usb.c
linux/trunk/drivers/dahdi/xpp/xproto.h
Modified: linux/trunk/drivers/dahdi/xpp/card_bri.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/card_bri.c?view=diff&rev=10424&r1=10423&r2=10424
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_bri.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_bri.c Wed Jan 11 09:19:01 2012
@@ -113,10 +113,10 @@
#define A_SU_WR_STA 0x30 /* ST/Up state machine register */
#define V_SU_LD_STA 0x10
-#define V_SU_ACT 0x60 /* start activation/deactivation */
-#define STA_DEACTIVATE 0x40 /* start deactivation in A_SU_WR_STA */
-#define STA_ACTIVATE 0x60 /* start activation in A_SU_WR_STA */
-#define V_SU_SET_G2_G3 0x80
+#define V_SU_ACT 0x60 /* start activation/deactivation */
+#define STA_DEACTIVATE 0x40 /* start deactivation in A_SU_WR_STA */
+#define STA_ACTIVATE 0x60 /* start activation in A_SU_WR_STA */
+#define V_SU_SET_G2_G3 0x80
#define A_SU_RD_STA 0x30
typedef union {
Modified: linux/trunk/drivers/dahdi/xpp/card_fxo.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/card_fxo.c?view=diff&rev=10424&r1=10423&r2=10424
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_fxo.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_fxo.c Wed Jan 11 09:19:01 2012
@@ -197,7 +197,7 @@
power_change(xpd, pos, POWER_UNKNOWN);
}
-static const int led_register_mask[] = { BIT(7), BIT(6), BIT(5) };
+static const int led_register_mask[] = { BIT(7), BIT(6), BIT(5) };
/*
* LED control is done via DAA register 0x20
@@ -781,7 +781,7 @@
static int FXO_card_ioctl(xpd_t *xpd, int pos, unsigned int cmd, unsigned long arg)
{
- int i,ret;
+ int i,ret;
unsigned char echotune_data[ARRAY_SIZE(echotune_regs)];
BUG_ON(!xpd);
Modified: linux/trunk/drivers/dahdi/xpp/card_fxs.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/card_fxs.c?view=diff&rev=10424&r1=10423&r2=10424
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_fxs.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_fxs.c Wed Jan 11 09:19:01 2012
@@ -195,34 +195,34 @@
/*
* LED and RELAY control is done via SLIC register 0x06:
* 7 6 5 4 3 2 1 0
- * +-----+-----+-----+-----+-----+-----+-----+-----+
- * | M2 | M1 | M3 | C2 | O1 | O3 | C1 | C3 |
- * +-----+-----+-----+-----+-----+-----+-----+-----+
+ * +-----+-----+-----+-----+-----+-----+-----+-----+
+ * | M2 | M1 | M3 | C2 | O1 | O3 | C1 | C3 |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+
*
- * Cn - Control bit (control one digital line)
- * On - Output bit (program a digital line for output)
- * Mn - Mask bit (only the matching output control bit is affected)
+ * Cn - Control bit (control one digital line)
+ * On - Output bit (program a digital line for output)
+ * Mn - Mask bit (only the matching output control bit is affected)
*
- * C3 - OUTPUT RELAY (0 - OFF, 1 - ON)
- * C1 - GREEN LED (0 - OFF, 1 - ON)
- * O3 - Output RELAY (this line is output)
- * O1 - Output GREEN (this line is output)
- * C2 - RED LED (0 - OFF, 1 - ON)
- * M3 - Mask RELAY. (1 - C3 effect the OUTPUT RELAY)
- * M2 - Mask RED. (1 - C2 effect the RED LED)
- * M1 - Mask GREEN. (1 - C1 effect the GREEN LED)
+ * C3 - OUTPUT RELAY (0 - OFF, 1 - ON)
+ * C1 - GREEN LED (0 - OFF, 1 - ON)
+ * O3 - Output RELAY (this line is output)
+ * O1 - Output GREEN (this line is output)
+ * C2 - RED LED (0 - OFF, 1 - ON)
+ * M3 - Mask RELAY. (1 - C3 effect the OUTPUT RELAY)
+ * M2 - Mask RED. (1 - C2 effect the RED LED)
+ * M1 - Mask GREEN. (1 - C1 effect the GREEN LED)
*
- * The OUTPUT RELAY (actually a relay out) is connected to line 0 and 4 only.
+ * The OUTPUT RELAY (actually a relay out) is connected to line 0 and 4 only.
*/
-// GREEN RED OUTPUT RELAY
-static const int led_register_mask[] = { BIT(7), BIT(6), BIT(5) };
-static const int led_register_vals[] = { BIT(4), BIT(1), BIT(0) };
+// GREEN RED OUTPUT RELAY
+static const int led_register_mask[] = { BIT(7), BIT(6), BIT(5) };
+static const int led_register_vals[] = { BIT(4), BIT(1), BIT(0) };
/*
* pos can be:
- * - A line number
- * - ALL_LINES. This is not valid anymore since 8-Jan-2007.
+ * - A line number
+ * - ALL_LINES. This is not valid anymore since 8-Jan-2007.
*/
static int do_led(xpd_t *xpd, lineno_t chan, byte which, bool on)
{
@@ -1039,9 +1039,9 @@
/*
* INPUT polling is done via SLIC register 0x06 (same as LEDS):
* 7 6 5 4 3 2 1 0
- * +-----+-----+-----+-----+-----+-----+-----+-----+
- * | I1 | I3 | | | I2 | I4 | | |
- * +-----+-----+-----+-----+-----+-----+-----+-----+
+ * +-----+-----+-----+-----+-----+-----+-----+-----+
+ * | I1 | I3 | | | I2 | I4 | | |
+ * +-----+-----+-----+-----+-----+-----+-----+-----+
*
*/
static int input_channels[] = { 6, 7, 2, 3 }; // Slic numbers of input relays
Modified: linux/trunk/drivers/dahdi/xpp/card_global.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/card_global.c?view=diff&rev=10424&r1=10423&r2=10424
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_global.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_global.c Wed Jan 11 09:19:01 2012
@@ -258,7 +258,7 @@
writing, /* writing */
regnum,
do_subreg, /* use subreg */
- subreg, /* subreg */
+ subreg, /* subreg */
data_low,
do_datah, /* use data_high*/
data_high);
Modified: linux/trunk/drivers/dahdi/xpp/card_pri.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/card_pri.c?view=diff&rev=10424&r1=10423&r2=10424
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_pri.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_pri.c Wed Jan 11 09:19:01 2012
@@ -85,10 +85,10 @@
#define PROC_REGISTER_FNAME "slics"
enum pri_protocol {
- PRI_PROTO_0 = 0,
+ PRI_PROTO_0 = 0,
PRI_PROTO_E1 = 1,
- PRI_PROTO_T1 = 2,
- PRI_PROTO_J1 = 3
+ PRI_PROTO_T1 = 2,
+ PRI_PROTO_J1 = 3
};
static const char *protocol_names[] = {
Modified: linux/trunk/drivers/dahdi/xpp/xbus-core.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xbus-core.c?view=diff&rev=10424&r1=10423&r2=10424
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xbus-core.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xbus-core.c Wed Jan 11 09:19:01 2012
@@ -266,7 +266,7 @@
xpacket_t *pack;
uint16_t pos = 0;
uint16_t nextpos;
- int num = 1;
+ int num = 1;
bool do_print;
unsigned long flags;
@@ -350,8 +350,8 @@
/**
*
* Frame is freed:
- * - In case of error, by this function.
- * - Otherwise, by the underlying sending mechanism
+ * - In case of error, by this function.
+ * - Otherwise, by the underlying sending mechanism
*/
int send_pcm_frame(xbus_t *xbus, xframe_t *xframe)
{
Modified: linux/trunk/drivers/dahdi/xpp/xbus-pcm.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xbus-pcm.c?view=diff&rev=10424&r1=10423&r2=10424
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xbus-pcm.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xbus-pcm.c Wed Jan 11 09:19:01 2012
@@ -63,7 +63,7 @@
#define PROC_SYNC "sync"
#define SYNC_CYCLE 500 /* Sampling cycle in usec */
-#define SYNC_CYCLE_SAMPLE 100 /* Samples from end of SYNC_CYCLE */
+#define SYNC_CYCLE_SAMPLE 100 /* Samples from end of SYNC_CYCLE */
#define SYNC_CONVERGE 10 /* Number of SYNC_CYCLE's to converge speed */
#define SYNC_CENTER 500 /* Offset from ref_ticker to other AB's */
#define SYNC_DELTA 40 /* If within +/-SYNC_DELTA, try to stay there */
Modified: linux/trunk/drivers/dahdi/xpp/xbus-sysfs.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xbus-sysfs.c?view=diff&rev=10424&r1=10423&r2=10424
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xbus-sysfs.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xbus-sysfs.c Wed Jan 11 09:19:01 2012
@@ -442,7 +442,7 @@
.name = "astribanks",
.match = astribank_match,
#ifdef OLD_HOTPLUG_SUPPORT
- .hotplug = astribank_hotplug,
+ .hotplug = astribank_hotplug,
#else
.uevent = astribank_uevent,
#endif
Modified: linux/trunk/drivers/dahdi/xpp/xpp_usb.c
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xpp_usb.c?view=diff&rev=10424&r1=10423&r2=10424
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xpp_usb.c (original)
+++ linux/trunk/drivers/dahdi/xpp/xpp_usb.c Wed Jan 11 09:19:01 2012
@@ -1031,7 +1031,7 @@
static int xusb_read_proc(char *page, char **start, off_t off, int count, int *eof, void *data)
{
- int len = 0;
+ int len = 0;
unsigned long flags;
int i;
//unsigned long stamp = jiffies;
Modified: linux/trunk/drivers/dahdi/xpp/xproto.h
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/drivers/dahdi/xpp/xproto.h?view=diff&rev=10424&r1=10423&r2=10424
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/xproto.h (original)
+++ linux/trunk/drivers/dahdi/xpp/xproto.h Wed Jan 11 09:19:01 2012
@@ -71,8 +71,8 @@
/*
* The LSB of the type number signifies:
- * 0 - TO_PSTN
- * 1 - TO_PHONE
+ * 0 - TO_PSTN
+ * 1 - TO_PHONE
*/
#define XPD_TYPE_FXS 1 // TO_PHONE
#define XPD_TYPE_FXO 2 // TO_PSTN
More information about the dahdi-commits
mailing list