diff options
author | Karsten Keil <kkeil@suse.de> | 2008-07-30 12:26:58 -0400 |
---|---|---|
committer | Karsten Keil <kkeil@suse.de> | 2008-08-02 10:28:50 -0400 |
commit | ff4cc1de2401ad44ae084c3f5a9e898af0879520 (patch) | |
tree | 24e0e3d1b8a35559546910a0ca0cd1f9f63f1576 /drivers/isdn/hardware/mISDN | |
parent | 780aefed1e179b23dcfbd6cfcb627ec3bd0a164c (diff) |
mISDN cleanup user interface
The channelmap should have the same size on 32 and 64 bit systems
and should not depend on endianess.
Thanks to David Woodhouse for spotting this.
Signed-off-by: Karsten Keil <kkeil@suse.de>
Diffstat (limited to 'drivers/isdn/hardware/mISDN')
-rw-r--r-- | drivers/isdn/hardware/mISDN/hfcmulti.c | 6 | ||||
-rw-r--r-- | drivers/isdn/hardware/mISDN/hfcpci.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index 2649ea55a9e8..10144e871c06 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c | |||
@@ -3971,7 +3971,7 @@ open_bchannel(struct hfc_multi *hc, struct dchannel *dch, | |||
3971 | struct bchannel *bch; | 3971 | struct bchannel *bch; |
3972 | int ch; | 3972 | int ch; |
3973 | 3973 | ||
3974 | if (!test_bit(rq->adr.channel, &dch->dev.channelmap[0])) | 3974 | if (!test_channelmap(rq->adr.channel, dch->dev.channelmap)) |
3975 | return -EINVAL; | 3975 | return -EINVAL; |
3976 | if (rq->protocol == ISDN_P_NONE) | 3976 | if (rq->protocol == ISDN_P_NONE) |
3977 | return -EINVAL; | 3977 | return -EINVAL; |
@@ -4587,7 +4587,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m) | |||
4587 | list_add(&bch->ch.list, &dch->dev.bchannels); | 4587 | list_add(&bch->ch.list, &dch->dev.bchannels); |
4588 | hc->chan[ch].bch = bch; | 4588 | hc->chan[ch].bch = bch; |
4589 | hc->chan[ch].port = 0; | 4589 | hc->chan[ch].port = 0; |
4590 | test_and_set_bit(bch->nr, &dch->dev.channelmap[0]); | 4590 | set_channelmap(bch->nr, dch->dev.channelmap); |
4591 | } | 4591 | } |
4592 | /* set optical line type */ | 4592 | /* set optical line type */ |
4593 | if (port[Port_cnt] & 0x001) { | 4593 | if (port[Port_cnt] & 0x001) { |
@@ -4755,7 +4755,7 @@ init_multi_port(struct hfc_multi *hc, int pt) | |||
4755 | list_add(&bch->ch.list, &dch->dev.bchannels); | 4755 | list_add(&bch->ch.list, &dch->dev.bchannels); |
4756 | hc->chan[i + ch].bch = bch; | 4756 | hc->chan[i + ch].bch = bch; |
4757 | hc->chan[i + ch].port = pt; | 4757 | hc->chan[i + ch].port = pt; |
4758 | test_and_set_bit(bch->nr, &dch->dev.channelmap[0]); | 4758 | set_channelmap(bch->nr, dch->dev.channelmap); |
4759 | } | 4759 | } |
4760 | /* set master clock */ | 4760 | /* set master clock */ |
4761 | if (port[Port_cnt] & 0x001) { | 4761 | if (port[Port_cnt] & 0x001) { |
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c index 3231814e7efa..9cf5edbb1a9b 100644 --- a/drivers/isdn/hardware/mISDN/hfcpci.c +++ b/drivers/isdn/hardware/mISDN/hfcpci.c | |||
@@ -2056,7 +2056,7 @@ setup_card(struct hfc_pci *card) | |||
2056 | card->dch.dev.nrbchan = 2; | 2056 | card->dch.dev.nrbchan = 2; |
2057 | for (i = 0; i < 2; i++) { | 2057 | for (i = 0; i < 2; i++) { |
2058 | card->bch[i].nr = i + 1; | 2058 | card->bch[i].nr = i + 1; |
2059 | test_and_set_bit(i + 1, &card->dch.dev.channelmap[0]); | 2059 | set_channelmap(i + 1, card->dch.dev.channelmap); |
2060 | card->bch[i].debug = debug; | 2060 | card->bch[i].debug = debug; |
2061 | mISDN_initbchannel(&card->bch[i], MAX_DATA_MEM); | 2061 | mISDN_initbchannel(&card->bch[i], MAX_DATA_MEM); |
2062 | card->bch[i].hw = card; | 2062 | card->bch[i].hw = card; |