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
Kirill Smelkov
linux
Commits
2481c26b
Commit
2481c26b
authored
Jan 10, 2004
by
Scott Feldman
Committed by
Jeff Garzik
Jan 10, 2004
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[e1000] use unsigned long for I/O base addr
* Use unsigned long for I/O base addr; can be 64-bit on some archs.
parent
2e135af9
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
drivers/net/e1000/e1000_hw.c
drivers/net/e1000/e1000_hw.c
+4
-4
drivers/net/e1000/e1000_hw.h
drivers/net/e1000/e1000_hw.h
+3
-3
drivers/net/e1000/e1000_main.c
drivers/net/e1000/e1000_main.c
+2
-2
No files found.
drivers/net/e1000/e1000_hw.c
View file @
2481c26b
...
...
@@ -4523,8 +4523,8 @@ uint32_t
e1000_read_reg_io
(
struct
e1000_hw
*
hw
,
uint32_t
offset
)
{
u
int32_t
io_addr
=
hw
->
io_base
;
u
int32_t
io_data
=
hw
->
io_base
+
4
;
u
nsigned
long
io_addr
=
hw
->
io_base
;
u
nsigned
long
io_data
=
hw
->
io_base
+
4
;
e1000_io_write
(
hw
,
io_addr
,
offset
);
return
e1000_io_read
(
hw
,
io_data
);
...
...
@@ -4543,8 +4543,8 @@ e1000_write_reg_io(struct e1000_hw *hw,
uint32_t
offset
,
uint32_t
value
)
{
u
int32_t
io_addr
=
hw
->
io_base
;
u
int32_t
io_data
=
hw
->
io_base
+
4
;
u
nsigned
long
io_addr
=
hw
->
io_base
;
u
nsigned
long
io_data
=
hw
->
io_base
+
4
;
e1000_io_write
(
hw
,
io_addr
,
offset
);
e1000_io_write
(
hw
,
io_data
,
value
);
...
...
drivers/net/e1000/e1000_hw.h
View file @
2481c26b
...
...
@@ -317,9 +317,9 @@ void e1000_pci_clear_mwi(struct e1000_hw *hw);
void
e1000_read_pci_cfg
(
struct
e1000_hw
*
hw
,
uint32_t
reg
,
uint16_t
*
value
);
void
e1000_write_pci_cfg
(
struct
e1000_hw
*
hw
,
uint32_t
reg
,
uint16_t
*
value
);
/* Port I/O is only supported on 82544 and newer */
uint32_t
e1000_io_read
(
struct
e1000_hw
*
hw
,
u
int32_t
port
);
uint32_t
e1000_io_read
(
struct
e1000_hw
*
hw
,
u
nsigned
long
port
);
uint32_t
e1000_read_reg_io
(
struct
e1000_hw
*
hw
,
uint32_t
offset
);
void
e1000_io_write
(
struct
e1000_hw
*
hw
,
u
int32_t
port
,
uint32_t
value
);
void
e1000_io_write
(
struct
e1000_hw
*
hw
,
u
nsigned
long
port
,
uint32_t
value
);
void
e1000_write_reg_io
(
struct
e1000_hw
*
hw
,
uint32_t
offset
,
uint32_t
value
);
int32_t
e1000_config_dsp_after_link_change
(
struct
e1000_hw
*
hw
,
boolean_t
link_up
);
int32_t
e1000_set_d3_lplu_state
(
struct
e1000_hw
*
hw
,
boolean_t
active
);
...
...
@@ -978,7 +978,7 @@ struct e1000_hw {
e1000_ms_type
master_slave
;
e1000_ms_type
original_master_slave
;
e1000_ffe_config
ffe_config_state
;
u
int32_t
io_base
;
u
nsigned
long
io_base
;
uint32_t
phy_id
;
uint32_t
phy_revision
;
uint32_t
phy_addr
;
...
...
drivers/net/e1000/e1000_main.c
View file @
2481c26b
...
...
@@ -2641,13 +2641,13 @@ e1000_write_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t *value)
}
uint32_t
e1000_io_read
(
struct
e1000_hw
*
hw
,
u
int32_t
port
)
e1000_io_read
(
struct
e1000_hw
*
hw
,
u
nsigned
long
port
)
{
return
inl
(
port
);
}
void
e1000_io_write
(
struct
e1000_hw
*
hw
,
u
int32_t
port
,
uint32_t
value
)
e1000_io_write
(
struct
e1000_hw
*
hw
,
u
nsigned
long
port
,
uint32_t
value
)
{
outl
(
value
,
port
);
}
...
...
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