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

Slave interface und Makefile geändert.

This commit is contained in:
Florian Pose 2006-02-20 08:36:03 +00:00
parent c5e95b0bc5
commit e02ec79bc6
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -13,7 +13,7 @@ ifneq ($(KERNELRELEASE),)
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Kbuild-Abschnitt # Kbuild-Abschnitt
obj-m := master/ devices/ rt/ mini/ obj-m := master/ devices/
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
@ -22,7 +22,11 @@ else
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# Default-Abschnitt # Default-Abschnitt
ifneq ($(wildcard ethercat.conf),)
include ethercat.conf include ethercat.conf
else
KERNELDIR := /usr/src/linux
endif
modules: modules:
$(MAKE) -C $(KERNELDIR) M=`pwd` $(MAKE) -C $(KERNELDIR) M=`pwd`

14
include/EtherCAT_si.h
View File

@ -17,7 +17,7 @@
/*****************************************************************************/ /*****************************************************************************/
#define EC_WRITE_EL20XX(SLAVE, CHANNEL, VALUE) \ #define EC_WRITE_EL200X(SLAVE, CHANNEL, VALUE) \
do { \ do { \
if (VALUE) EC_PROC_DATA(SLAVE)[0] |= (1 << (CHANNEL)); \ if (VALUE) EC_PROC_DATA(SLAVE)[0] |= (1 << (CHANNEL)); \
else EC_PROC_DATA(SLAVE)[0] &= ~(1 << (CHANNEL)); \ else EC_PROC_DATA(SLAVE)[0] &= ~(1 << (CHANNEL)); \
@ -25,13 +25,17 @@
/*****************************************************************************/ /*****************************************************************************/
#define EC_READ_EL31XX(SLAVE, CHANNEL) \ #define EC_READ_EL310X(SLAVE, CHANNEL) \
((short int) ((EC_PROC_DATA(SLAVE)[(CHANNEL) * 3 + 2] << 8) | \ ((signed short int) ((EC_PROC_DATA(SLAVE)[(CHANNEL) * 3 + 2] << 8) | \
EC_PROC_DATA(SLAVE)[(CHANNEL) * 3 + 1])) EC_PROC_DATA(SLAVE)[(CHANNEL) * 3 + 1]))
#define EC_READ_EL316X(SLAVE, CHANNEL) \
((unsigned short int) ((EC_PROC_DATA(SLAVE)[(CHANNEL) * 3 + 2] << 8) | \
EC_PROC_DATA(SLAVE)[(CHANNEL) * 3 + 1]))
/*****************************************************************************/ /*****************************************************************************/
#define EC_WRITE_EL41XX(SLAVE, CHANNEL, VALUE) \ #define EC_WRITE_EL410X(SLAVE, CHANNEL, VALUE) \
do { \ do { \
EC_PROC_DATA(SLAVE)[(CHANNEL) * 3 + 1] = ((VALUE) & 0xFF00) >> 8; \ EC_PROC_DATA(SLAVE)[(CHANNEL) * 3 + 1] = ((VALUE) & 0xFF00) >> 8; \
EC_PROC_DATA(SLAVE)[(CHANNEL) * 3 + 2] = (VALUE) & 0xFF; \ EC_PROC_DATA(SLAVE)[(CHANNEL) * 3 + 2] = (VALUE) & 0xFF; \