git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
hardware
/
eicon
/
di.c
diff --git
a/drivers/isdn/hardware/eicon/di.c
b/drivers/isdn/hardware/eicon/di.c
index
0617d7c
..
e1df8d9
100644
(file)
--- a/
drivers/isdn/hardware/eicon/di.c
+++ b/
drivers/isdn/hardware/eicon/di.c
@@
-133,7
+133,7
@@
void pr_out(ADAPTER * a)
i = this->XCurrent;
X = PTR_X(a,this);
while(i<this->XNum && length<270) {
i = this->XCurrent;
X = PTR_X(a,this);
while(i<this->XNum && length<270) {
- clength =
MIN((word)(270-length),X[i].PLength-this->XOffset
);
+ clength =
min((word)(270-length),(word)(X[i].PLength-this->XOffset)
);
a->ram_out_buffer(a,
&ReqOut->XBuffer.P[length],
PTR_P(a,this,&X[i].P[this->XOffset]),
a->ram_out_buffer(a,
&ReqOut->XBuffer.P[length],
PTR_P(a,this,&X[i].P[this->XOffset]),
@@
-622,7
+622,7
@@
byte isdn_ind(ADAPTER * a,
sizeof(a->stream_buffer),
&final, NULL, NULL);
}
sizeof(a->stream_buffer),
&final, NULL, NULL);
}
- IoAdapter->RBuffer.length =
MIN(MLength,
270);
+ IoAdapter->RBuffer.length =
min(MLength, (word)
270);
if (IoAdapter->RBuffer.length != MLength) {
this->complete = 0;
} else {
if (IoAdapter->RBuffer.length != MLength) {
this->complete = 0;
} else {
@@
-676,9
+676,9
@@
byte isdn_ind(ADAPTER * a,
this->RCurrent++;
}
if (cma) {
this->RCurrent++;
}
if (cma) {
- clength =
MIN(MLength, R[this->RCurrent].PLength-this->ROffset
);
+ clength =
min(MLength, (word)(R[this->RCurrent].PLength-this->ROffset)
);
} else {
} else {
- clength =
MIN
(a->ram_inw(a, &RBuffer->length)-offset,
+ clength =
min
(a->ram_inw(a, &RBuffer->length)-offset,
R[this->RCurrent].PLength-this->ROffset);
}
if(R[this->RCurrent].P) {
R[this->RCurrent].PLength-this->ROffset);
}
if(R[this->RCurrent].P) {