staging: gpib: Clean and rename common include
cover staging: gpib: Clean and rename common include
These patches prepare for the release of the userspace libraries and tools to be compatible with both the in-tree drivers and out-of-tree drivers.
Patch 1 removes unused enums
Patch 2 renames gpib_user.h to gpib.h
Dave Penkler (2):
Remove unused enums from common include file
Rename common include file
drivers/staging/gpib/include/gpibP.h | 2 +-
drivers/staging/gpib/include/gpib_types.h | 2 +-
.../staging/gpib/uapi/{gpib_user.h => gpib.h} | 42 -------------------
3 files changed, 2 insertions(+), 44 deletions(-)
rename drivers/staging/gpib/uapi/{gpib_user.h => gpib.h} (82%)Signature · 1 line
2.49.0
PATCH 1/2 staging: gpib: Remove unused enums from common include file
The error code and timeout code enums are not used by any of the gpib kernel code. This patch removes them.
--- drivers/staging/gpib/uapi/gpib_user.h | 42 --------------------------- 1 file changed, 42 deletions(-)
drivers/staging/gpib/uapi/gpib_user.h +0 -42
@@ -53,48 +53,6 @@ enum ibsta_bits { EVENT | LOK | REM | CIC | ATN | TACS | LACS | DTAS | DCAS | SRQI, }; -/* IBERR error codes */ -enum iberr_code { -EDVR =0 ,/* system error */ -ECIC =1 ,/* not CIC */ -ENOL =2 ,/* no listeners */ -EADR =3 ,/* CIC and not addressed before I/O */ -EARG =4 ,/* bad argument to function call */ -ESAC =5 ,/* not SAC */ -EABO =6 ,/* I/O operation was aborted */ -ENEB =7 ,/* non-existent board (GPIB interface offline) */ -EDMA =8 ,/* DMA hardware error detected */ -EOIP =10 ,/* new I/O attempted with old I/O in progress */ -ECAP =11 ,/* no capability for intended opeation */ -EFSO =12 ,/* file system operation error */ -EBUS =14 ,/* bus error */ -ESTB =15 ,/* lost serial poll bytes */ -ESRQ =16 ,/* SRQ stuck on */ -ETAB =20 /* Table Overflow */ -}; - -/* Timeout values and meanings */ -enum gpib_timeout { -TNONE =0 ,/* Infinite timeout (disabled) */ - T10us =1 ,/* Timeout of 10 usec (ideal) */ - T30us =2 ,/* Timeout of 30 usec (ideal) */ - T100us =3 ,/* Timeout of 100 usec (ideal) */ - T300us =4 ,/* Timeout of 300 usec (ideal) */ - T1ms =5 ,/* Timeout of 1 msec (ideal) */ - T3ms =6 ,/* Timeout of 3 msec (ideal) */ - T10ms =7 ,/* Timeout of 10 msec (ideal) */ - T30ms =8 ,/* Timeout of 30 msec (ideal) */ - T100ms =9 ,/* Timeout of 100 msec (ideal) */ - T300ms =10 ,/* Timeout of 300 msec (ideal) */ - T1s =11 ,/* Timeout of 1 sec (ideal) */ - T3s =12 ,/* Timeout of 3 sec (ideal) */ - T10s =13 ,/* Timeout of 10 sec (ideal) */ - T30s =14 ,/* Timeout of 30 sec (ideal) */ - T100s =15 ,/* Timeout of 100 sec (ideal) */ - T300s =16 ,/* Timeout of 300 sec (ideal) */ - T1000s =17 /* Timeout of 1000 sec (maximum) */ -}; -/* End-of-string (EOS) modes for use with ibeos */ enum eos_flags {
Signature · 1 line
2.49.0
PATCH 2/2 staging: gpib: Rename common include file
In reply to Dave PenklerUser code includes gpib_user.h. Since this include has diverged from the original by
- removing unused functions and defines
- changing camel-case identifiers
- removing typedefs
we need to change the name of the kernel include. This include will be included in the userland gpib_user.h ensuring backward compatibility for application programmes.
Rename the file and change the references to it.
---
drivers/staging/gpib/include/gpibP.h | 2 +-
drivers/staging/gpib/include/gpib_types.h | 2 +-
drivers/staging/gpib/uapi/{gpib_user.h => gpib.h} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/staging/gpib/uapi/{gpib_user.h => gpib.h} (100%)drivers/staging/gpib/include/gpibP.h +1 -1
@@ -11,7 +11,7 @@#include "gpib_types.h" #include "gpib_proto.h" -#include "gpib_user.h" +#include "gpib.h" #include "gpib_ioctl.h" #include <linux/fs.h>
drivers/staging/gpib/include/gpib_types.h +1 -1
@@ -8,7 +8,7 @@#define _GPIB_TYPES_H#ifdef __KERNEL__ -#include "gpib_user.h" +#include "gpib.h" #include <linux/atomic.h> #include <linux/device.h> #include <linux/mutex.h>
drivers/staging/gpib/uapi/gpib.h renamed from drivers/staging/gpib/uapi/gpib_user.h +0 -0
Signature · 1 line
2.49.0