From 725ddea4cd73c4e2a44d8dae0187dd8854e949d6 Mon Sep 17 00:00:00 2001 From: Hans-Erik Floryd Date: Tue, 16 Feb 2016 14:01:08 +0100 Subject: [PATCH] fix file encodings --- osal/intime/osal.c | 5 ++--- osal/intime/osal_defs.h | 4 ++-- osal/linux/osal.c | 5 ++--- osal/linux/osal_defs.h | 4 ++-- osal/rtk/osal.c | 4 ++-- osal/win32/osal.c | 5 ++--- osal/win32/osal_defs.h | 4 ++-- osal/win32/osal_win32.h | 4 ++-- oshw/intime/nicdrv.h | 4 ++-- oshw/intime/oshw.c | 4 ++-- oshw/intime/oshw.h | 4 ++-- oshw/linux/oshw.c | 4 ++-- oshw/linux/oshw.h | 4 ++-- oshw/rtk/oshw.c | 4 ++-- oshw/rtk/oshw.h | 4 ++-- oshw/win32/oshw.c | 6 +++--- oshw/win32/oshw.h | 4 ++-- soem/ethercatmain.h | 4 ++-- 18 files changed, 37 insertions(+), 40 deletions(-) diff --git a/osal/intime/osal.c b/osal/intime/osal.c index be58286..7880a22 100644 --- a/osal/intime/osal.c +++ b/osal/intime/osal.c @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ @@ -122,4 +122,3 @@ osal_mutex_t * osal_mtx_create(void) /* return (void*)RtCreateMutex(NULL, FALSE, NULL); */ return (void *)0; } - diff --git a/osal/intime/osal_defs.h b/osal/intime/osal_defs.h index b76b328..4ef9dee 100644 --- a/osal/intime/osal_defs.h +++ b/osal/intime/osal_defs.h @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/osal/linux/osal.c b/osal/linux/osal.c index 5fd9d44..ac51b31 100644 --- a/osal/linux/osal.c +++ b/osal/linux/osal.c @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ @@ -175,4 +175,3 @@ int osal_thread_create_rt(void *thandle, int stacksize, void *func, void *param) return 1; } - diff --git a/osal/linux/osal_defs.h b/osal/linux/osal_defs.h index eaa2123..eeb5d28 100644 --- a/osal/linux/osal_defs.h +++ b/osal/linux/osal_defs.h @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/osal/rtk/osal.c b/osal/rtk/osal.c index c1936b5..a7b1741 100644 --- a/osal/rtk/osal.c +++ b/osal/rtk/osal.c @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/osal/win32/osal.c b/osal/win32/osal.c index 673ab66..a42186f 100644 --- a/osal/win32/osal.c +++ b/osal/win32/osal.c @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ @@ -157,4 +157,3 @@ int osal_thread_create_rt(void **thandle, int stacksize, void *func, void *param } return ret; } - diff --git a/osal/win32/osal_defs.h b/osal/win32/osal_defs.h index e10e7ec..af27c53 100644 --- a/osal/win32/osal_defs.h +++ b/osal/win32/osal_defs.h @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ #ifndef _osal_defs_ diff --git a/osal/win32/osal_win32.h b/osal/win32/osal_win32.h index 59c2e07..17579df 100644 --- a/osal/win32/osal_win32.h +++ b/osal/win32/osal_win32.h @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/oshw/intime/nicdrv.h b/oshw/intime/nicdrv.h index b34b340..c29acf8 100644 --- a/oshw/intime/nicdrv.h +++ b/oshw/intime/nicdrv.h @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/oshw/intime/oshw.c b/oshw/intime/oshw.c index a5b6cb0..f33fe0a 100644 --- a/oshw/intime/oshw.c +++ b/oshw/intime/oshw.c @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/oshw/intime/oshw.h b/oshw/intime/oshw.h index 79c93fe..3e9de5c 100644 --- a/oshw/intime/oshw.h +++ b/oshw/intime/oshw.h @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/oshw/linux/oshw.c b/oshw/linux/oshw.c index 38da811..5ecf793 100644 --- a/oshw/linux/oshw.c +++ b/oshw/linux/oshw.c @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/oshw/linux/oshw.h b/oshw/linux/oshw.h index 9e4f4e1..38a1953 100644 --- a/oshw/linux/oshw.h +++ b/oshw/linux/oshw.h @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/oshw/rtk/oshw.c b/oshw/rtk/oshw.c index 69e2e80..898f12d 100644 --- a/oshw/rtk/oshw.c +++ b/oshw/rtk/oshw.c @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/oshw/rtk/oshw.h b/oshw/rtk/oshw.h index b6e1b0c..7e1f8eb 100644 --- a/oshw/rtk/oshw.h +++ b/oshw/rtk/oshw.h @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/oshw/win32/oshw.c b/oshw/win32/oshw.c index e7b469f..e7f1fb3 100644 --- a/oshw/win32/oshw.c +++ b/oshw/win32/oshw.c @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ @@ -165,4 +165,4 @@ void oshw_free_adapters (ec_adaptert * adapter) free (adapter); } } -} \ No newline at end of file +} diff --git a/oshw/win32/oshw.h b/oshw/win32/oshw.h index 0389ede..1efdf0c 100644 --- a/oshw/win32/oshw.h +++ b/oshw/win32/oshw.h @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */ diff --git a/soem/ethercatmain.h b/soem/ethercatmain.h index 91b52d1..0380f1a 100644 --- a/soem/ethercatmain.h +++ b/soem/ethercatmain.h @@ -28,14 +28,14 @@ * This exception does not invalidate any other reasons why a work based on * this file might be covered by the GNU General Public License. * - * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual + * The EtherCAT Technology, the trade name and logo “EtherCAT” are the intellectual * property of, and protected by Beckhoff Automation GmbH. You can use SOEM for * the sole purpose of creating, using and/or selling or otherwise distributing * an EtherCAT network master provided that an EtherCAT Master License is obtained * from Beckhoff Automation GmbH. * * In case you did not receive a copy of the EtherCAT Master License along with - * SOEM write to Beckhoff Automation GmbH, Eiserstraße 5, D-33415 Verl, Germany + * SOEM write to Beckhoff Automation GmbH, EiserstraĂźe 5, D-33415 Verl, Germany * (www.beckhoff.com). */