retronetworking
/
isdn4linux
13
0
Fork 0
Code Pull Requests Releases Activity

various spelling corrections (new checksums may be needed, Karsten!)

This commit is contained in:
Paul Slootman 1999-08-31 11:20:41 +00:00
parent d32b8236db
commit c5c68b398e
12 changed files with 95 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -83,7 +83,7 @@ all: do-it-all
unconf-error:
@echo ""
@echo "Cannot find configured kernel."
@echo "Make shure, you have our Kernel configured, and"
@echo "Make sure, you have our kernel configured, and"
@echo "the definition of KERNELDIR points to the proper location."
@echo ""

5
drivers/isdn/avmb1/capiutil.c
View File

@ -7,6 +7,9 @@
* Rewritten for Linux 1996 by Carsten Paeth (calle@calle.in-berlin.de)
*
* $Log$
* Revision 1.9 1999/07/09 15:05:46 keil
* compat.h is now isdn_compat.h
*
* Revision 1.8 1999/07/01 15:26:37 calle
* complete new version (I love it):
* + new hardware independed "capi_driver" interface that will make it easy to:
@ -94,7 +97,7 @@ char *capi_info2str(__u16 reason)
case 0x1001:
return "Too many applications";
case 0x1002:
return "Logical block size to small, must be at least 128 Bytes";
return "Logical block size too small, must be at least 128 Bytes";
case 0x1003:
return "Buffer exceeds 64 kByte";
case 0x1004:

6
drivers/isdn/divert/isdn_divert.c
View File

@ -20,6 +20,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.4 1999/08/25 20:02:21 werner
* Changed return values for stat_icall(w) from 3->4 and 4->5 because of conflicts
* with existing software definitions. (PtP incomplete called party number)
*
* Revision 1.3 1999/08/22 20:26:35 calle
* backported changes from kernel 2.3.14:
* - several #include "config.h" gone, others come.
@ -509,7 +513,7 @@ int isdn_divert_icall(isdn_ctrl *ic)
if (cs->akt_state == DEFLECT_ALERT)
{ strcpy(cs->deflect_dest,dv->rule.to_nr);
if (!cs->timer.expires)
{ strcpy(ic->parm.setup.eazmsn,"Testtext direkt");
{ strcpy(ic->parm.setup.eazmsn,"Testtext direct");
ic->parm.setup.screen = dv->rule.screen;
strcpy(ic->parm.setup.phone,dv->rule.to_nr);
cs->akt_state = DEFLECT_AUTODEL; /* delete after timeout */

12
drivers/isdn/eicon/eicon_io.c
View File

@ -24,6 +24,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.4 1999/08/22 20:26:47 calle
* backported changes from kernel 2.3.14:
* - several #include "config.h" gone, others come.
* - "struct device" changed to "struct net_device" in 2.3.14, added a
* define in isdn_compat.h for older kernel versions.
*
* Revision 1.3 1999/08/18 20:17:01 armin
* Added XLOG function for all cards.
* Bugfix of alloc_skb NULL pointer.
@ -701,7 +707,7 @@ eicon_irq(int irq, void *dev_id, struct pt_regs *regs) {
case EICON_CTYPE_S2M:
if (!(readb(isa_card->intack))) { /* card did not interrupt */
if (DebugVar & 1)
printk(KERN_DEBUG "eicon: IRQ: card tells no interrupt!\n");
printk(KERN_DEBUG "eicon: IRQ: card reports no interrupt!\n");
return;
}
break;
@ -709,7 +715,7 @@ eicon_irq(int irq, void *dev_id, struct pt_regs *regs) {
case EICON_CTYPE_MAESTRAP:
if (!(readb(&ram[0x3fe]))) { /* card did not interrupt */
if (DebugVar & 1)
printk(KERN_DEBUG "eicon: IRQ: card tells no interrupt!\n");
printk(KERN_DEBUG "eicon: IRQ: card reports no interrupt!\n");
return;
}
break;
@ -717,7 +723,7 @@ eicon_irq(int irq, void *dev_id, struct pt_regs *regs) {
outw(0x3fe, pci_card->PCIreg + M_ADDR);
if (!(inb(pci_card->PCIreg + M_DATA))) { /* card did not interrupt */
if (DebugVar & 1)
printk(KERN_DEBUG "eicon: IRQ: card tells no interrupt!\n");
printk(KERN_DEBUG "eicon: IRQ: card reports no interrupt!\n");
return;
}
break;

6
drivers/isdn/eicon/eicon_mod.c
View File

@ -26,6 +26,10 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.11 1999/08/29 17:23:45 armin
* New setup compat.
* Bugfix if compile as not module.
*
* Revision 1.10 1999/08/28 21:32:53 armin
* Prepared for fax related functions.
* Now compilable without errors/warnings.
@ -1588,7 +1592,7 @@ int eicon_mca_probe(int slot, /* slot-nr where the card was detected */
cards->mca_slot = slot;
/* card->io noch setzen oder ?? */
if (DebugVar & 8)
printk("eicon_addcard: erfolgreich fuer slot: %d.\n",
printk("eicon_addcard: successful for slot: %d.\n",
cards->mca_slot+1);
return 0 ; /* eicon_addcard hat eine Karte zugefuegt */
} else {

10
drivers/isdn/hisax/isar.c
View File

@ -6,6 +6,10 @@
*
*
* $Log$
* Revision 1.5 1999/08/25 16:59:55 keil
* Make ISAR V32bis modem running
* Make LL->HL interface open for additional commands
*
* Revision 1.4 1999/08/05 20:43:18 keil
* ISAR analog modem support
*
@ -1018,8 +1022,8 @@ modeisar(struct BCState *bcs, int mode, int bc)
&bcs->hw.isar.reg->Flags))
bcs->hw.isar.dpath = 1;
else {
printk(KERN_WARNING"isar modeisar analog funktions only with DP1\n");
debugl1(cs, "isar modeisar analog funktions only with DP1");
printk(KERN_WARNING"isar modeisar analog works only with DP1\n");
debugl1(cs, "isar modeisar analog works only with DP1");
return(1);
}
break;
@ -1219,7 +1223,7 @@ isar_auxcmd(struct IsdnCardState *cs, isdn_ctrl *ic) {
ll_run(cs, features);
break;
default:
printk(KERN_DEBUG "HiSax: invalid ioclt %d\n",
printk(KERN_DEBUG "HiSax: invalid ioctl %d\n",
(int) ic->arg);
return(-EINVAL);
}

5
drivers/isdn/hisax/netjet.c
View File

@ -7,6 +7,9 @@
* Thanks to Traverse Technologie Australia for documents and informations
*
* $Log$
* Revision 1.13 1999/08/11 21:01:31 keil
* new PCI codefix
*
* Revision 1.12 1999/08/10 16:02:00 calle
* struct pci_dev changed in 2.3.13. Made the necessary changes.
*
@ -553,7 +556,7 @@ static void read_raw(struct BCState *bcs, u_int *buf, int cnt){
if ((state == HDLC_FRAME_FOUND) &&
!(bitcnt & 7)) {
if ((bitcnt>>3)>=HSCX_BUFMAX) {
debugl1(bcs->cs, "tiger: frame to big");
debugl1(bcs->cs, "tiger: frame too big");
r_val=0;
state=HDLC_FLAG_SEARCH;
bcs->hw.tiger.r_err++;

12
drivers/isdn/hisax/teleint.c
View File

@ -6,6 +6,10 @@
*
*
* $Log$
* Revision 1.9 1999/07/12 21:05:30 keil
* fix race in IRQ handling
* added watchdog for lost IRQs
*
* Revision 1.8 1999/07/01 08:12:12 keil
* Common HiSax version for 2.0, 2.1, 2.2 and 2.3 kernel
*
@ -60,7 +64,7 @@ readreg(unsigned int ale, unsigned int adr, u_char off)
while (ret && --max_delay)
ret = HFC_BUSY & bytein(ale);
if (!max_delay) {
printk(KERN_WARNING "TeleInt Busy not inaktive\n");
printk(KERN_WARNING "TeleInt Busy not inactive\n");
restore_flags(flags);
return (0);
}
@ -82,7 +86,7 @@ readfifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int size
while (ret && --max_delay)
ret = HFC_BUSY & bytein(ale);
if (!max_delay) {
printk(KERN_WARNING "TeleInt Busy not inaktive\n");
printk(KERN_WARNING "TeleInt Busy not inactive\n");
return;
}
data[i] = bytein(adr);
@ -104,7 +108,7 @@ writereg(unsigned int ale, unsigned int adr, u_char off, u_char data)
while (ret && --max_delay)
ret = HFC_BUSY & bytein(ale);
if (!max_delay) {
printk(KERN_WARNING "TeleInt Busy not inaktive\n");
printk(KERN_WARNING "TeleInt Busy not inactive\n");
restore_flags(flags);
return;
}
@ -126,7 +130,7 @@ writefifo(unsigned int ale, unsigned int adr, u_char off, u_char * data, int siz
while (ret && --max_delay)
ret = HFC_BUSY & bytein(ale);
if (!max_delay) {
printk(KERN_WARNING "TeleInt Busy not inaktive\n");
printk(KERN_WARNING "TeleInt Busy not inactive\n");
return;
}
byteout(adr, data[i]);

5
drivers/isdn/icn/icn.c
View File

@ -19,6 +19,9 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.59 1999/08/28 22:10:55 keil
* __setup function should be static
*
* Revision 1.58 1999/08/25 16:44:17 keil
* Support for new __setup function
*
@ -464,7 +467,7 @@ icn_pollbchan_receive(int channel, icn_card * card)
if (!eflag) {
if ((cnt = card->rcvidx[channel])) {
if (!(skb = dev_alloc_skb(cnt))) {
printk(KERN_WARNING "ïcn: receive out of memory\n");
printk(KERN_WARNING "icn: receive out of memory\n");
break;
}
memcpy(skb_put(skb, cnt), card->rcvbuf[channel], cnt);

8
drivers/isdn/isdn_ppp.c
View File

@ -19,6 +19,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*
* $Log$
* Revision 1.52 1999/08/22 20:26:07 calle
* backported changes from kernel 2.3.14:
* - several #include "config.h" gone, others come.
* - "struct device" changed to "struct net_device" in 2.3.14, added a
* define in isdn_compat.h for older kernel versions.
*
* Revision 1.51 1999/08/18 16:19:17 hipp
* applied MPPP-resize-headroom patch
*
@ -1109,7 +1115,7 @@ void isdn_ppp_receive(isdn_net_dev * net_dev, isdn_net_local * lp, struct sk_buf
isdn_ppp_frame_log("receive", skb->data, skb->len, 32,is->unit,lp->ppp_slot);
}
if (net_dev->local->master) {
printk(KERN_WARNING "isdn_ppp_receice: net_dev != master\n");
printk(KERN_WARNING "isdn_ppp_receive: net_dev != master\n");
net_dev = ((isdn_net_local *) net_dev->local->master->priv)->netdev;
}
if (skb->data[0] == 0xff && skb->data[1] == 0x03)

44
drivers/isdn/sc/ioctl.c
View File

@ -42,7 +42,7 @@ int sc_ioctl(int card, scs_ioctl *data)
pr_debug("%s: SCIOLOAD: ioctl received\n", adapter[card]->devicename);
if(adapter[card]->EngineUp) {
pr_debug("%s: SCIOCLOAD: Command Failed, LoadProc while engine running.\n",
pr_debug("%s: SCIOCLOAD: command failed, LoadProc while engine running.\n",
adapter[card]->devicename);
return -1;
}
@ -56,12 +56,12 @@ int sc_ioctl(int card, scs_ioctl *data)
status = send_and_receive(card, CMPID, cmReqType2, cmReqClass0, cmReqLoadProc,
0, sizeof(srec), srec, &rcvmsg, SAR_TIMEOUT);
if(status) {
pr_debug("%s: SCIOCLOAD: Command Failed, status = %d\n",
pr_debug("%s: SCIOCLOAD: command failed, status = %d\n",
adapter[card]->devicename, status);
return -1;
}
else {
pr_debug("%s: SCIOCLOAD: Command Sucessful\n", adapter[card]->devicename);
pr_debug("%s: SCIOCLOAD: command successful\n", adapter[card]->devicename);
return 0;
}
}
@ -70,7 +70,7 @@ int sc_ioctl(int card, scs_ioctl *data)
{
pr_debug("%s: SCIOSTART: ioctl received\n", adapter[card]->devicename);
if(adapter[card]->EngineUp) {
pr_debug("%s: SCIOCSTART: Command Failed, Engine already running.\n",
pr_debug("%s: SCIOCSTART: command failed, engine already running.\n",
adapter[card]->devicename);
return -1;
}
@ -94,16 +94,16 @@ int sc_ioctl(int card, scs_ioctl *data)
if ((err = copy_from_user(&switchtype, (char *) data->dataptr, sizeof(char))))
return err;
pr_debug("%s: SCIOCSETSWITCH: Setting switch type to %d\n", adapter[card]->devicename,
pr_debug("%s: SCIOCSETSWITCH: setting switch type to %d\n", adapter[card]->devicename,
switchtype);
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallSetSwitchType,
0, sizeof(char),&switchtype,&rcvmsg, SAR_TIMEOUT);
if(!status && !rcvmsg.rsp_status) {
pr_debug("%s: SCIOCSETSWITCH: Command Successful\n", adapter[card]->devicename);
pr_debug("%s: SCIOCSETSWITCH: command successful\n", adapter[card]->devicename);
return 0;
}
else {
pr_debug("%s: SCIOCSETSWITCH: Command Failed (status = %d)\n",
pr_debug("%s: SCIOCSETSWITCH: command failed (status = %d)\n",
adapter[card]->devicename, status);
return status;
}
@ -123,10 +123,10 @@ int sc_ioctl(int card, scs_ioctl *data)
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0,
ceReqCallGetSwitchType, 0, 0, 0, &rcvmsg, SAR_TIMEOUT);
if (!status && !rcvmsg.rsp_status) {
pr_debug("%s: SCIOCGETSWITCH: Command Sucessful\n", adapter[card]->devicename);
pr_debug("%s: SCIOCGETSWITCH: command successful\n", adapter[card]->devicename);
}
else {
pr_debug("%s: SCIOCGETSWITCH: Command Failed (status = %d)\n",
pr_debug("%s: SCIOCGETSWITCH: command failed (status = %d)\n",
adapter[card]->devicename, status);
return status;
}
@ -156,10 +156,10 @@ int sc_ioctl(int card, scs_ioctl *data)
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallGetSPID,
data->channel, 0, 0, &rcvmsg, SAR_TIMEOUT);
if (!status) {
pr_debug("%s: SCIOCGETSPID: Command Sucessful\n", adapter[card]->devicename);
pr_debug("%s: SCIOCGETSPID: command successful\n", adapter[card]->devicename);
}
else {
pr_debug("%s: SCIOCGETSPID: Command Failed (status = %d)\n",
pr_debug("%s: SCIOCGETSPID: command failed (status = %d)\n",
adapter[card]->devicename, status);
return status;
}
@ -188,18 +188,18 @@ int sc_ioctl(int card, scs_ioctl *data)
if ((err = copy_from_user(spid, (char *) data->dataptr, sizeof(spid))))
return err;
pr_debug("%s: SCIOCSETSPID: Setting channel %d spid to %s\n",
pr_debug("%s: SCIOCSETSPID: setting channel %d spid to %s\n",
adapter[card]->devicename, data->channel, spid);
status = send_and_receive(card, CEPID, ceReqTypeCall,
ceReqClass0, ceReqCallSetSPID, data->channel,
strlen(spid), spid, &rcvmsg, SAR_TIMEOUT);
if(!status && !rcvmsg.rsp_status) {
pr_debug("%s: SCIOCSETSPID: Command Successful\n",
pr_debug("%s: SCIOCSETSPID: command successful\n",
adapter[card]->devicename);
return 0;
}
else {
pr_debug("%s: SCIOCSETSPID: Command Failed (status = %d)\n",
pr_debug("%s: SCIOCSETSPID: command failed (status = %d)\n",
adapter[card]->devicename, status);
return status;
}
@ -219,10 +219,10 @@ int sc_ioctl(int card, scs_ioctl *data)
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0, ceReqCallGetMyNumber,
data->channel, 0, 0, &rcvmsg, SAR_TIMEOUT);
if (!status) {
pr_debug("%s: SCIOCGETDN: Command Sucessful\n", adapter[card]->devicename);
pr_debug("%s: SCIOCGETDN: command successful\n", adapter[card]->devicename);
}
else {
pr_debug("%s: SCIOCGETDN: Command Failed (status = %d)\n",
pr_debug("%s: SCIOCGETDN: command failed (status = %d)\n",
adapter[card]->devicename, status);
return status;
}
@ -252,18 +252,18 @@ int sc_ioctl(int card, scs_ioctl *data)
if ((err = copy_from_user(dn, (char *) data->dataptr, sizeof(dn))))
return err;
pr_debug("%s: SCIOCSETDN: Setting channel %d dn to %s\n",
pr_debug("%s: SCIOCSETDN: setting channel %d dn to %s\n",
adapter[card]->devicename, data->channel, dn);
status = send_and_receive(card, CEPID, ceReqTypeCall,
ceReqClass0, ceReqCallSetMyNumber, data->channel,
strlen(dn),dn,&rcvmsg, SAR_TIMEOUT);
if(!status && !rcvmsg.rsp_status) {
pr_debug("%s: SCIOCSETDN: Command Successful\n",
pr_debug("%s: SCIOCSETDN: command successful\n",
adapter[card]->devicename);
return 0;
}
else {
pr_debug("%s: SCIOCSETDN: Command Failed (status = %d)\n",
pr_debug("%s: SCIOCSETDN: command failed (status = %d)\n",
adapter[card]->devicename, status);
return status;
}
@ -273,7 +273,7 @@ int sc_ioctl(int card, scs_ioctl *data)
pr_debug("%s: SCIOTRACE: ioctl received\n", adapter[card]->devicename);
/* adapter[card]->trace = !adapter[card]->trace;
pr_debug("%s: SCIOCTRACE: Tracing turned %s\n", adapter[card]->devicename,
pr_debug("%s: SCIOCTRACE: tracing turned %s\n", adapter[card]->devicename,
adapter[card]->trace ? "ON" : "OFF"); */
break;
@ -305,11 +305,11 @@ int sc_ioctl(int card, scs_ioctl *data)
status = send_and_receive(card, CEPID, ceReqTypeCall, ceReqClass0,
ceReqCallGetCallType, data->channel, 0, 0, &rcvmsg, SAR_TIMEOUT);
if (!status && !rcvmsg.rsp_status) {
pr_debug("%s: SCIOCGETSPEED: Command Sucessful\n",
pr_debug("%s: SCIOCGETSPEED: command successful\n",
adapter[card]->devicename);
}
else {
pr_debug("%s: SCIOCGETSPEED: Command Failed (status = %d)\n",
pr_debug("%s: SCIOCGETSPEED: command failed (status = %d)\n",
adapter[card]->devicename, status);
return status;
}

38
drivers/isdn/sc/packet.c
View File

@ -52,11 +52,11 @@ int sndpkt(int devId, int channel, struct sk_buff *data)
card = get_card_from_id(devId);
if(!IS_VALID_CARD(card)) {
pr_debug("Invalid param: %d is not a valid card id\n", card);
pr_debug("invalid param: %d is not a valid card id\n", card);
return -ENODEV;
}
pr_debug("%s: Send Packet: frst = 0x%x nxt = %d f = %d n = %d\n",
pr_debug("%s: sndpkt: frst = 0x%x nxt = %d f = %d n = %d\n",
adapter[card]->devicename,
adapter[card]->channel[channel].first_sendbuf,
adapter[card]->channel[channel].next_sendbuf,
@ -64,26 +64,26 @@ int sndpkt(int devId, int channel, struct sk_buff *data)
adapter[card]->channel[channel].num_sendbufs);
if(!adapter[card]->channel[channel].free_sendbufs) {
pr_debug("%s: Out out TX buffers\n", adapter[card]->devicename);
pr_debug("%s: out of TX buffers\n", adapter[card]->devicename);
return -EINVAL;
}
if(data->len > BUFFER_SIZE) {
pr_debug("%s: Data overflows buffer size (data > buffer)\n", adapter[card]->devicename);
pr_debug("%s: data overflows buffer size (data > buffer)\n", adapter[card]->devicename);
return -EINVAL;
}
ReqLnkWrite.buff_offset = adapter[card]->channel[channel].next_sendbuf *
BUFFER_SIZE + adapter[card]->channel[channel].first_sendbuf;
ReqLnkWrite.msg_len = data->len; /* sk_buff size */
pr_debug("%s: Writing %d bytes to buffer offset 0x%x\n", adapter[card]->devicename,
pr_debug("%s: writing %d bytes to buffer offset 0x%x\n", adapter[card]->devicename,
ReqLnkWrite.msg_len, ReqLnkWrite.buff_offset);
memcpy_toshmem(card, (char *)ReqLnkWrite.buff_offset, data->data, ReqLnkWrite.msg_len);
/*
* sendmessage
*/
pr_debug("%s: Send Packet size=%d, buf_offset=0x%x buf_indx=%d\n",
pr_debug("%s: sndpkt size=%d, buf_offset=0x%x buf_indx=%d\n",
adapter[card]->devicename,
ReqLnkWrite.msg_len, ReqLnkWrite.buff_offset,
adapter[card]->channel[channel].next_sendbuf);
@ -92,7 +92,7 @@ int sndpkt(int devId, int channel, struct sk_buff *data)
channel+1, sizeof(LLData), (unsigned int*)&ReqLnkWrite);
len = data->len;
if(status) {
pr_debug("%s: Failed to send packet, status = %d\n", adapter[card]->devicename, status);
pr_debug("%s: failed to send packet, status = %d\n", adapter[card]->devicename, status);
return -1;
}
else {
@ -101,7 +101,7 @@ int sndpkt(int devId, int channel, struct sk_buff *data)
++adapter[card]->channel[channel].next_sendbuf ==
adapter[card]->channel[channel].num_sendbufs ? 0 :
adapter[card]->channel[channel].next_sendbuf;
pr_debug("%s: Packet sent successfully\n", adapter[card]->devicename);
pr_debug("%s: packet sent successfully\n", adapter[card]->devicename);
dev_kfree_skb(data);
indicate_status(card,ISDN_STAT_BSENT,channel, (char *)&len);
}
@ -114,7 +114,7 @@ void rcvpkt(int card, RspMessage *rcvmsg)
struct sk_buff *skb;
if(!IS_VALID_CARD(card)) {
pr_debug("Invalid param: %d is not a valid card id\n", card);
pr_debug("invalid param: %d is not a valid card id\n", card);
return;
}
@ -122,7 +122,7 @@ void rcvpkt(int card, RspMessage *rcvmsg)
case 0x01:
case 0x02:
case 0x70:
pr_debug("%s: Error status code: 0x%x\n", adapter[card]->devicename, rcvmsg->rsp_status);
pr_debug("%s: error status code: 0x%x\n", adapter[card]->devicename, rcvmsg->rsp_status);
return;
case 0x00:
if (!(skb = dev_alloc_skb(rcvmsg->msg_data.response.msg_len))) {
@ -144,7 +144,7 @@ void rcvpkt(int card, RspMessage *rcvmsg)
/*
* Recycle the buffer
*/
pr_debug("%s: Buffer size : %d\n", adapter[card]->devicename, BUFFER_SIZE);
pr_debug("%s: buffer size : %d\n", adapter[card]->devicename, BUFFER_SIZE);
/* memset_shmem(card, rcvmsg->msg_data.response.buff_offset, 0, BUFFER_SIZE); */
newll.buff_offset = rcvmsg->msg_data.response.buff_offset;
newll.msg_len = BUFFER_SIZE;
@ -163,30 +163,30 @@ int setup_buffers(int card, int c)
LLData RcvBuffOffset;
if(!IS_VALID_CARD(card)) {
pr_debug("Invalid param: %d is not a valid card id\n", card);
pr_debug("invalid param: %d is not a valid card id\n", card);
return -ENODEV;
}
/*
* Calculate the buffer offsets (send/recv/send/recv)
*/
pr_debug("%s: Seting up channel buffer space in shared RAM\n", adapter[card]->devicename);
pr_debug("%s: setting up channel buffer space in shared RAM\n", adapter[card]->devicename);
buffer_size = BUFFER_SIZE;
nBuffers = ((adapter[card]->ramsize - BUFFER_BASE) / buffer_size) / 2;
nBuffers = nBuffers > BUFFERS_MAX ? BUFFERS_MAX : nBuffers;
pr_debug("%s: Calculating buffer space: %d buffers, %d big\n", adapter[card]->devicename,
pr_debug("%s: calculating buffer space: %d buffers, %d big\n", adapter[card]->devicename,
nBuffers, buffer_size);
if(nBuffers < 2) {
pr_debug("%s: Not enough buffer space\n", adapter[card]->devicename);
pr_debug("%s: not enough buffer space\n", adapter[card]->devicename);
return -1;
}
cBase = (nBuffers * buffer_size) * (c - 1);
pr_debug("%s: Channel buffer offset from Shared RAM: 0x%x\n", adapter[card]->devicename, cBase);
pr_debug("%s: channel buffer offset from shared RAM: 0x%x\n", adapter[card]->devicename, cBase);
adapter[card]->channel[c-1].first_sendbuf = BUFFER_BASE + cBase;
adapter[card]->channel[c-1].num_sendbufs = nBuffers / 2;
adapter[card]->channel[c-1].free_sendbufs = nBuffers / 2;
adapter[card]->channel[c-1].next_sendbuf = 0;
pr_debug("%s: Send buffer setup complete: first=0x%x n=%d f=%d, nxt=%d\n",
pr_debug("%s: send buffer setup complete: first=0x%x n=%d f=%d, nxt=%d\n",
adapter[card]->devicename,
adapter[card]->channel[c-1].first_sendbuf,
adapter[card]->channel[c-1].num_sendbufs,
@ -196,13 +196,13 @@ int setup_buffers(int card, int c)
/*
* Prep the receive buffers
*/
pr_debug("%s: Adding %d RecvBuffers:\n", adapter[card]->devicename, nBuffers /2);
pr_debug("%s: adding %d RecvBuffers:\n", adapter[card]->devicename, nBuffers /2);
for (i = 0 ; i < nBuffers / 2; i++) {
RcvBuffOffset.buff_offset =
((adapter[card]->channel[c-1].first_sendbuf +
(nBuffers / 2) * buffer_size) + (buffer_size * i));
RcvBuffOffset.msg_len = buffer_size;
pr_debug("%s: Adding RcvBuffer #%d offset=0x%x sz=%d buffsz:%d\n",
pr_debug("%s: adding RcvBuffer #%d offset=0x%x sz=%d bufsz:%d\n",
adapter[card]->devicename,
i + 1, RcvBuffOffset.buff_offset,
RcvBuffOffset.msg_len,buffer_size);