summaryrefslogtreecommitdiff
path: root/hw/xfree86/common/xf86Module.h
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2016-03-01 08:29:06 -0500
committerAdam Jackson <ajax@redhat.com>2017-01-25 14:22:05 -0500
commitef533a912d18db31456b29a18c8bced649309565 (patch)
treea9d0c338f572be861f8eb7b53e9206397a2f62f6 /hw/xfree86/common/xf86Module.h
parent7e3cccf8e4426a4b25a7a94d52775d334693572f (diff)
loader: Remove unused loader error codes and dead enum
The enum has been unused since at least the removal of elfloader. Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Julien Cristau <jcristau@debian.org> Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'hw/xfree86/common/xf86Module.h')
-rw-r--r--hw/xfree86/common/xf86Module.h15
1 files changed, 1 insertions, 14 deletions
diff --git a/hw/xfree86/common/xf86Module.h b/hw/xfree86/common/xf86Module.h
index 7d09a1bcc..ff0e23ee5 100644
--- a/hw/xfree86/common/xf86Module.h
+++ b/hw/xfree86/common/xf86Module.h
@@ -49,13 +49,6 @@
#define NULL ((void *)0)
#endif
-typedef enum {
- LD_RESOLV_IFDONE = 0, /* only check if no more
- delays pending */
- LD_RESOLV_NOW = 1, /* finish one delay step */
- LD_RESOLV_FORCE = 2 /* force checking... */
-} LoaderResolveOptions;
-
#define DEFAULT_LIST ((char *)-1)
/* Built-in ABI classes. These definitions must not be changed. */
@@ -92,19 +85,13 @@ typedef enum {
#define MODULEVENDORSTRING "X.Org Foundation"
#endif
-/* Error return codes for errmaj. New codes must only be added at the end. */
+/* Error return codes for errmaj */
typedef enum {
LDR_NOERROR = 0,
LDR_NOMEM, /* memory allocation failed */
LDR_NOENT, /* Module file does not exist */
- LDR_NOSUBENT, /* pre-requsite file to be sub-loaded does not exist */
- LDR_NOSPACE, /* internal module array full */
- LDR_NOMODOPEN, /* module file could not be opened (check errmin) */
- LDR_UNKTYPE, /* file is not a recognized module type */
LDR_NOLOAD, /* type specific loader failed */
LDR_ONCEONLY, /* Module should only be loaded once (not an error) */
- LDR_NOPORTOPEN, /* could not open port (check errmin) */
- LDR_NOHARDWARE, /* could not query/initialize the hardware device */
LDR_MISMATCH, /* the module didn't match the spec'd requirments */
LDR_BADUSAGE, /* LoadModule is called with bad arguments */
LDR_INVALID, /* The module doesn't have a valid ModuleData object */