Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FPGA Configuration Space
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
FPGA Configuration Space
Commits
de8e86da
Commit
de8e86da
authored
Apr 22, 2014
by
Wesley W. Terpstra
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
build: fix a warning
parent
0ea21f06
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
pcie_wb.c
pcie-wb/pcie_wb.c
+2
-1
vme_wb_external.c
vme-wb/vme_wb_external.c
+2
-1
No files found.
pcie-wb/pcie_wb.c
View file @
de8e86da
...
@@ -214,6 +214,7 @@ static int wb_request(struct wishbone *wb, struct wishbone_request *req)
...
@@ -214,6 +214,7 @@ static int wb_request(struct wishbone *wb, struct wishbone_request *req)
struct
pcie_wb_dev
*
dev
;
struct
pcie_wb_dev
*
dev
;
unsigned
char
*
control
;
unsigned
char
*
control
;
uint32_t
ctl
;
uint32_t
ctl
;
int
out
;
dev
=
container_of
(
wb
,
struct
pcie_wb_dev
,
wb
);
dev
=
container_of
(
wb
,
struct
pcie_wb_dev
,
wb
);
control
=
dev
->
pci_res
[
0
].
addr
;
control
=
dev
->
pci_res
[
0
].
addr
;
...
@@ -225,7 +226,7 @@ static int wb_request(struct wishbone *wb, struct wishbone_request *req)
...
@@ -225,7 +226,7 @@ static int wb_request(struct wishbone *wb, struct wishbone_request *req)
req
->
write
=
(
ctl
&
0x40000000
)
!=
0
;
req
->
write
=
(
ctl
&
0x40000000
)
!=
0
;
if
(
unlikely
(
debug
))
printk
(
KERN_ALERT
"request %x
\n
"
,
ctl
);
if
(
unlikely
(
debug
))
printk
(
KERN_ALERT
"request %x
\n
"
,
ctl
);
int
out
=
(
ctl
&
0x80000000
)
!=
0
;
out
=
(
ctl
&
0x80000000
)
!=
0
;
if
(
out
)
iowrite32
(
1
,
control
+
MASTER_CTL_HIGH
);
/* dequeue operation */
if
(
out
)
iowrite32
(
1
,
control
+
MASTER_CTL_HIGH
);
/* dequeue operation */
...
...
vme-wb/vme_wb_external.c
View file @
de8e86da
...
@@ -156,6 +156,7 @@ static int wb_request(struct wishbone *wb, struct wishbone_request *req)
...
@@ -156,6 +156,7 @@ static int wb_request(struct wishbone *wb, struct wishbone_request *req)
struct
vme_wb_dev
*
dev
;
struct
vme_wb_dev
*
dev
;
unsigned
char
*
ctrl_win
;
unsigned
char
*
ctrl_win
;
uint32_t
ctrl
;
uint32_t
ctrl
;
int
out
;
dev
=
container_of
(
wb
,
struct
vme_wb_dev
,
wb
);
dev
=
container_of
(
wb
,
struct
vme_wb_dev
,
wb
);
ctrl_win
=
dev
->
vme_res
.
map
[
MAP_CTRL
]
->
kernel_va
;
ctrl_win
=
dev
->
vme_res
.
map
[
MAP_CTRL
]
->
kernel_va
;
...
@@ -166,7 +167,7 @@ static int wb_request(struct wishbone *wb, struct wishbone_request *req)
...
@@ -166,7 +167,7 @@ static int wb_request(struct wishbone *wb, struct wishbone_request *req)
req
->
mask
=
ctrl
&
0xf
;
req
->
mask
=
ctrl
&
0xf
;
req
->
write
=
(
ctrl
&
0x40000000
)
!=
0
;
req
->
write
=
(
ctrl
&
0x40000000
)
!=
0
;
int
out
=
(
ctrl
&
0x80000000
)
!=
0
;
out
=
(
ctrl
&
0x80000000
)
!=
0
;
if
(
out
)
iowrite32
(
cpu_to_be32
(
1
),
ctrl_win
+
MASTER_CTRL
);
/* dequeue operation */
if
(
out
)
iowrite32
(
cpu_to_be32
(
1
),
ctrl_win
+
MASTER_CTRL
);
/* dequeue operation */
if
(
unlikely
(
debug
))
if
(
unlikely
(
debug
))
...
...
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