bkinnightskytw
/
ethercat
mirror of https://gitlab.com/bkinnightskytw/ethercat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preparations to compile against 2.6.27.

This commit is contained in:
Florian Pose 2009-03-09 09:08:09 +00:00
parent ead547929d
commit a5752e0123
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
master/master.c
View File

@ -202,18 +202,22 @@ int ec_master_init(ec_master_t *master, /**< EtherCAT master */
if (ret)
goto out_clear_fsm;
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
master->class_device = device_create(class, NULL,
MKDEV(MAJOR(device_number), master->index), NULL,
"EtherCAT%u", master->index);
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 26)
master->class_device = device_create(class, NULL,
MKDEV(MAJOR(device_number), master->index),
"EtherCAT%u", master->index);
#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 15)
master->class_device = class_device_create(class, NULL,
MKDEV(MAJOR(device_number), master->index),
NULL, "EtherCAT%u", master->index);
MKDEV(MAJOR(device_number), master->index), NULL,
"EtherCAT%u", master->index);
#else
master->class_device = class_device_create(class,
MKDEV(MAJOR(device_number), master->index),
NULL, "EtherCAT%u", master->index);
MKDEV(MAJOR(device_number), master->index), NULL,
"EtherCAT%u", master->index);
#endif
if (IS_ERR(master->class_device)) {
EC_ERR("Failed to create class device!\n");

5
master/master.h
View File

@ -42,7 +42,12 @@
#include <linux/timer.h>
#include <linux/wait.h>
#include <linux/kthread.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
#include <linux/semaphore.h>
#else
#include <asm/semaphore.h>
#endif
#include "device.h"
#include "domain.h"