summaryrefslogtreecommitdiff
path: root/backend/plustek-pp.h
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:10 +0100
committerJörg Frings-Fürst <debian@jff.email>2023-02-12 17:36:10 +0100
commite0d94cf4d39395df1e2c6bb4d967200298c13881 (patch)
treebe5c7cace6697afc753c152d13ad5145d0884a42 /backend/plustek-pp.h
parent527bedac30eb120915718eb7997e6dacd583512e (diff)
parent84357741a6a6e6430f199b2c3f7498e0e97da9ad (diff)
Update upstream source from tag 'upstream/1.2.1'
Update to upstream version '1.2.1' with Debian dir a9bb43f754a5c9a361b076af3635cc767b7e652e
Diffstat (limited to 'backend/plustek-pp.h')
-rw-r--r--backend/plustek-pp.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/backend/plustek-pp.h b/backend/plustek-pp.h
index 447065b..4c0b0f4 100644
--- a/backend/plustek-pp.h
+++ b/backend/plustek-pp.h
@@ -235,11 +235,7 @@ typedef const struct mode_param
#define _E_SEQUENCE (_FIRST_ERR-30) /* caller sequence does not match */
#define _E_NO_ASIC (_FIRST_ERR-31) /* can't detect ASIC */
-#ifdef __KERNEL__
-# define _E_FAULT (-EFAULT)
-#else
# define _E_FAULT (_E_INTERNAL) /* should never happen in userspace */
-#endif
#define _E_LAMP_NOT_IN_POS (_FIRST_ERR-40)
#define _E_LAMP_NOT_STABLE (_FIRST_ERR-41)
@@ -471,10 +467,6 @@ typedef struct {
#define _ScanMode_AverageOut 1 /* CCD averaged 2 pixels value for output*/
#define _ScanMode_Mono 2 /* not color mode */
-
-#ifndef __KERNEL__
-
-
#define PLUSTEK_CONFIG_FILE "plustek_pp.conf"
#ifndef PATH_MAX
@@ -631,7 +623,6 @@ typedef struct {
AdjDef adj;
} CnfDef, *pCnfDef;
-#endif /* guard __KERNEL__ */
#endif /* guard __PLUSTEKPP_H__ */