Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
3db906fb
Commit
3db906fb
authored
Apr 03, 2002
by
Dave Jones
Committed by
Jeff Garzik
Apr 03, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge hydra net drvr conversion to Zorro-specific
z_{read,write}[bwl] routines from 2.4.x.
parent
8494a8f1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
drivers/net/hydra.c
drivers/net/hydra.c
+7
-7
No files found.
drivers/net/hydra.c
View file @
3db906fb
...
@@ -121,7 +121,7 @@ int __init hydra_init(unsigned long board)
...
@@ -121,7 +121,7 @@ int __init hydra_init(unsigned long board)
dev
->
dev_addr
[
j
]
=
*
((
u8
*
)(
board
+
HYDRA_ADDRPROM
+
2
*
j
));
dev
->
dev_addr
[
j
]
=
*
((
u8
*
)(
board
+
HYDRA_ADDRPROM
+
2
*
j
));
/* We must set the 8390 for word mode. */
/* We must set the 8390 for word mode. */
writeb
(
0x4b
,
ioaddr
+
NE_EN0_DCFG
);
z_
writeb
(
0x4b
,
ioaddr
+
NE_EN0_DCFG
);
start_page
=
NESM_START_PG
;
start_page
=
NESM_START_PG
;
stop_page
=
NESM_STOP_PG
;
stop_page
=
NESM_STOP_PG
;
...
@@ -196,10 +196,10 @@ static void hydra_get_8390_hdr(struct net_device *dev,
...
@@ -196,10 +196,10 @@ static void hydra_get_8390_hdr(struct net_device *dev,
((
ring_page
-
NESM_START_PG
)
<<
8
);
((
ring_page
-
NESM_START_PG
)
<<
8
);
ptrs
=
(
short
*
)
hdr
;
ptrs
=
(
short
*
)
hdr
;
*
(
ptrs
++
)
=
readw
(
hdr_start
);
*
(
ptrs
++
)
=
z_
readw
(
hdr_start
);
*
((
short
*
)
hdr
)
=
WORDSWAP
(
*
((
short
*
)
hdr
));
*
((
short
*
)
hdr
)
=
WORDSWAP
(
*
((
short
*
)
hdr
));
hdr_start
+=
2
;
hdr_start
+=
2
;
*
(
ptrs
++
)
=
readw
(
hdr_start
);
*
(
ptrs
++
)
=
z_
readw
(
hdr_start
);
*
((
short
*
)
hdr
+
1
)
=
WORDSWAP
(
*
((
short
*
)
hdr
+
1
));
*
((
short
*
)
hdr
+
1
)
=
WORDSWAP
(
*
((
short
*
)
hdr
+
1
));
}
}
...
@@ -216,11 +216,11 @@ static void hydra_block_input(struct net_device *dev, int count,
...
@@ -216,11 +216,11 @@ static void hydra_block_input(struct net_device *dev, int count,
if
(
xfer_start
+
count
>
mem_base
+
(
NESM_STOP_PG
<<
8
))
{
if
(
xfer_start
+
count
>
mem_base
+
(
NESM_STOP_PG
<<
8
))
{
int
semi_count
=
(
mem_base
+
(
NESM_STOP_PG
<<
8
))
-
xfer_start
;
int
semi_count
=
(
mem_base
+
(
NESM_STOP_PG
<<
8
))
-
xfer_start
;
memcpy_fromio
(
skb
->
data
,
xfer_start
,
semi_count
);
z_
memcpy_fromio
(
skb
->
data
,
xfer_start
,
semi_count
);
count
-=
semi_count
;
count
-=
semi_count
;
memcpy_fromio
(
skb
->
data
+
semi_count
,
mem_base
,
count
);
z_
memcpy_fromio
(
skb
->
data
+
semi_count
,
mem_base
,
count
);
}
else
}
else
memcpy_fromio
(
skb
->
data
,
xfer_start
,
count
);
z_
memcpy_fromio
(
skb
->
data
,
xfer_start
,
count
);
}
}
...
@@ -233,7 +233,7 @@ static void hydra_block_output(struct net_device *dev, int count,
...
@@ -233,7 +233,7 @@ static void hydra_block_output(struct net_device *dev, int count,
if
(
count
&
1
)
if
(
count
&
1
)
count
++
;
count
++
;
memcpy_toio
(
mem_base
+
((
start_page
-
NESM_START_PG
)
<<
8
),
buf
,
count
);
z_
memcpy_toio
(
mem_base
+
((
start_page
-
NESM_START_PG
)
<<
8
),
buf
,
count
);
}
}
static
void
__exit
hydra_cleanup
(
void
)
static
void
__exit
hydra_cleanup
(
void
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment