Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
etherlabmaster
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ICS Control System Infrastructure
etherlabmaster
Commits
899fdc0f
Commit
899fdc0f
authored
15 years ago
by
Florian Pose
Browse files
Options
Downloads
Patches
Plain Diff
generic device receive buffer in heap.
parent
af37b450
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
devices/generic.c
+16
-4
16 additions, 4 deletions
devices/generic.c
with
16 additions
and
4 deletions
devices/generic.c
+
16
−
4
View file @
899fdc0f
...
@@ -47,6 +47,8 @@
...
@@ -47,6 +47,8 @@
#define ETH_P_ETHERCAT 0x88A4
#define ETH_P_ETHERCAT 0x88A4
#define EC_GEN_RX_BUF_SIZE 1600
/*****************************************************************************/
/*****************************************************************************/
int
__init
ec_gen_init_module
(
void
);
int
__init
ec_gen_init_module
(
void
);
...
@@ -70,6 +72,7 @@ typedef struct {
...
@@ -70,6 +72,7 @@ typedef struct {
struct
net_device
*
netdev
;
struct
net_device
*
netdev
;
struct
socket
*
socket
;
struct
socket
*
socket
;
ec_device_t
*
ecdev
;
ec_device_t
*
ecdev
;
uint8_t
*
rx_buf
;
}
ec_gen_device_t
;
}
ec_gen_device_t
;
typedef
struct
{
typedef
struct
{
...
@@ -142,6 +145,7 @@ int ec_gen_device_init(
...
@@ -142,6 +145,7 @@ int ec_gen_device_init(
dev
->
ecdev
=
NULL
;
dev
->
ecdev
=
NULL
;
dev
->
socket
=
NULL
;
dev
->
socket
=
NULL
;
dev
->
rx_buf
=
NULL
;
dev
->
netdev
=
alloc_netdev
(
sizeof
(
ec_gen_device_t
*
),
&
null
,
ether_setup
);
dev
->
netdev
=
alloc_netdev
(
sizeof
(
ec_gen_device_t
*
),
&
null
,
ether_setup
);
if
(
!
dev
->
netdev
)
{
if
(
!
dev
->
netdev
)
{
...
@@ -178,6 +182,10 @@ void ec_gen_device_clear(
...
@@ -178,6 +182,10 @@ void ec_gen_device_clear(
sock_release
(
dev
->
socket
);
sock_release
(
dev
->
socket
);
}
}
free_netdev
(
dev
->
netdev
);
free_netdev
(
dev
->
netdev
);
if
(
dev
->
rx_buf
)
{
kfree
(
dev
->
rx_buf
);
}
}
}
/*****************************************************************************/
/*****************************************************************************/
...
@@ -192,6 +200,11 @@ int ec_gen_device_create_socket(
...
@@ -192,6 +200,11 @@ int ec_gen_device_create_socket(
int
ret
;
int
ret
;
struct
sockaddr_ll
sa
;
struct
sockaddr_ll
sa
;
dev
->
rx_buf
=
kmalloc
(
EC_GEN_RX_BUF_SIZE
,
GFP_KERNEL
);
if
(
!
dev
->
rx_buf
)
{
return
-
ENOMEM
;
}
ret
=
sock_create_kern
(
PF_PACKET
,
SOCK_RAW
,
htons
(
ETH_P_ETHERCAT
),
&
dev
->
socket
);
ret
=
sock_create_kern
(
PF_PACKET
,
SOCK_RAW
,
htons
(
ETH_P_ETHERCAT
),
&
dev
->
socket
);
if
(
ret
)
{
if
(
ret
)
{
printk
(
KERN_ERR
PFX
"Failed to create socket.
\n
"
);
printk
(
KERN_ERR
PFX
"Failed to create socket.
\n
"
);
...
@@ -299,18 +312,17 @@ void ec_gen_device_poll(
...
@@ -299,18 +312,17 @@ void ec_gen_device_poll(
{
{
struct
msghdr
msg
;
struct
msghdr
msg
;
struct
kvec
iov
;
struct
kvec
iov
;
char
buf
[
2000
];
// FIXME
int
ret
,
budget
=
10
;
// FIXME
int
ret
,
budget
=
10
;
// FIXME
iov
.
iov_base
=
buf
;
iov
.
iov_base
=
dev
->
rx_
buf
;
iov
.
iov_len
=
2000
;
iov
.
iov_len
=
EC_GEN_RX_BUF_SIZE
;
memset
(
&
msg
,
0
,
sizeof
(
msg
));
memset
(
&
msg
,
0
,
sizeof
(
msg
));
do
{
do
{
ret
=
kernel_recvmsg
(
dev
->
socket
,
&
msg
,
&
iov
,
1
,
iov
.
iov_len
,
ret
=
kernel_recvmsg
(
dev
->
socket
,
&
msg
,
&
iov
,
1
,
iov
.
iov_len
,
MSG_DONTWAIT
);
MSG_DONTWAIT
);
if
(
ret
>
0
)
{
if
(
ret
>
0
)
{
ecdev_receive
(
dev
->
ecdev
,
buf
,
ret
);
ecdev_receive
(
dev
->
ecdev
,
dev
->
rx_
buf
,
ret
);
}
else
if
(
ret
<
0
)
{
}
else
if
(
ret
<
0
)
{
break
;
break
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment