FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dahdi: Move the slave channel processing into separate functions.

Browse Source 
IMO this improves readability of dahdi_receive and dahdi_transmit, and
the compiler can decide if it is better to inline this in with the
caller or break it out into a separate function.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Acked-by: Kinsey Moore <kmoore@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9605 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell
2011-01-03 18:27:58 +00:00
parent 766d0755fd
commit 5002e537c3
1 changed files with 44 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
drivers/dahdi/dahdi-base.c
View File

@@ -8518,6 +8518,27 @@ static inline void __dahdi_real_receive(struct dahdi_chan *chan)
}
}
/**
* __transmit_to_slaves() - Distribute the tx data to all the slave channels.
*
*/
static void __transmit_to_slaves(struct dahdi_chan *const chan)
{
u_char data[DAHDI_CHUNKSIZE];
int i;
int pos = DAHDI_CHUNKSIZE;
struct dahdi_chan *slave;
for (i = 0; i < DAHDI_CHUNKSIZE; i++) {
for (slave = chan; (NULL != slave); slave = slave->nextslave) {
if (pos == DAHDI_CHUNKSIZE) {
__dahdi_transmit_chunk(chan, data);
pos = 0;
}
slave->writechunk[i] = data[pos++];
}
}
}
int dahdi_transmit(struct dahdi_span *span)
{
unsigned long flags;
@@ -8550,22 +8571,7 @@ int dahdi_transmit(struct dahdi_span *span)
spin_unlock_irqrestore(&chan->lock, flags);
continue;
} else if (chan->nextslave) {
u_char data[DAHDI_CHUNKSIZE];
int pos = DAHDI_CHUNKSIZE;
int y;
struct dahdi_chan *z;
/* Process master/slaves one way */
for (y = 0; y < DAHDI_CHUNKSIZE; y++) {
/* Process slaves for this byte too */
for (z = chan; z; z = z->nextslave) {
if (pos == DAHDI_CHUNKSIZE) {
/* Get next chunk */
__dahdi_transmit_chunk(chan, data);
pos = 0;
}
z->writechunk[y] = data[pos++];
}
}
__transmit_to_slaves(chan);
} else {
/* Process a normal channel */
__dahdi_real_transmit(chan);
@@ -8820,6 +8826,27 @@ static void coretimer_cleanup(void)
#endif /* CONFIG_DAHDI_CORE_TIMER */
/**
* __receive_from_slaves() - Collect the rx data from all the slave channels.
*
*/
static void __receive_from_slaves(struct dahdi_chan *const chan)
{
u_char data[DAHDI_CHUNKSIZE];
int i;
int pos = 0;
struct dahdi_chan *slave;
for (i = 0; i < DAHDI_CHUNKSIZE; ++i) {
for (slave = chan; (NULL != slave); slave = slave->nextslave) {
data[pos++] = slave->readchunk[i];
if (pos == DAHDI_CHUNKSIZE) {
__dahdi_receive_chunk(chan, data);
pos = 0;
}
}
}
}
int dahdi_receive(struct dahdi_span *span)
{
@@ -8844,21 +8871,7 @@ int dahdi_receive(struct dahdi_span *span)
spin_unlock_irqrestore(&chan->lock, flags);
continue;
} else if (chan->nextslave) {
/* Must process each slave at the same time */
u_char data[DAHDI_CHUNKSIZE];
int pos = 0;
int y;
struct dahdi_chan *z;
for (y=0;y<DAHDI_CHUNKSIZE;y++) {
/* Put all its slaves, too */
for (z = chan; z; z = z->nextslave) {
data[pos++] = z->readchunk[y];
if (pos == DAHDI_CHUNKSIZE) {
__dahdi_receive_chunk(chan, data);
pos = 0;
}
}
}
__receive_from_slaves(chan);
} else {
/* Process a normal channel */
__dahdi_real_receive(chan);