diff options
Diffstat (limited to 'spectro')
| -rw-r--r-- | spectro/oemarch.c | 3 | ||||
| -rw-r--r-- | spectro/usbio_lx.c | 2 | ||||
| -rw-r--r-- | spectro/xdg_bds.c | 6 | ||||
| -rw-r--r-- | spectro/xdg_bds.h | 8 |
4 files changed, 13 insertions, 6 deletions
diff --git a/spectro/oemarch.c b/spectro/oemarch.c index be9abf3..c8775bf 100644 --- a/spectro/oemarch.c +++ b/spectro/oemarch.c @@ -119,7 +119,8 @@ oem_target oemtargs = { { "/PhotoCAL/PhotoCAL Setup.exe", targ_spyd2_pld }, { "/OptiCAL/OptiCAL Setup.exe", targ_spyd2_pld }, { "/setup/setup.exe", targ_spyd2_pld }, - { "/Data/setup.exe", targ_spyd_cal }, +// { "/Data/setup.exe", targ_spyd_cal }, + { "/Data/Setup.exe", targ_spyd_cal }, { "/Installer/Setup.exe", targ_i1d3_edr }, { "/Installer/ColorMunkiDisplaySetup.exe", targ_i1d3_edr }, { NULL } diff --git a/spectro/usbio_lx.c b/spectro/usbio_lx.c index 6d001a2..6edcb29 100644 --- a/spectro/usbio_lx.c +++ b/spectro/usbio_lx.c @@ -839,7 +839,7 @@ static int icoms_usb_transaction( bp += req.urbs[i].urb.buffer_length; req.urbs[i].urb.status = -EINPROGRESS; } - a1logd(p->log, 8, "icoms_usb_transaction: reset req %p nourbs to %d\n",&req,req.nourbs); + a1logd(p->log, 8, "icoms_usb_transaction: set req %p nourbs to %d\n",&req,req.nourbs); /* Add our request to the req list so that it can be cancelled on reap failure */ pthread_mutex_lock(&p->usbd->lock); diff --git a/spectro/xdg_bds.c b/spectro/xdg_bds.c index e24e4ab..03f7561 100644 --- a/spectro/xdg_bds.c +++ b/spectro/xdg_bds.c @@ -114,6 +114,12 @@ #endif #include <sys/types.h> #include <sys/stat.h> +#ifndef SALONEINSTLIB +# include "copyright.h" +# include "aconfig.h" +#else +# include "sa_config.h" +#endif #include "numsup.h" #include "conv.h" #include "aglob.h" diff --git a/spectro/xdg_bds.h b/spectro/xdg_bds.h index 4fedbea..18101b0 100644 --- a/spectro/xdg_bds.h +++ b/spectro/xdg_bds.h @@ -32,9 +32,9 @@ /* Which type of storage */ typedef enum { - xdg_data, - xdg_conf, - xdg_cache /* Note there is no xdg_local cache */ + xdg_data, /* User/System Application related data */ + xdg_conf, /* User/System Application configuration settings */ + xdg_cache /* User Application cache storage area */ } xdg_storage_type; /* What operation is being performed */ @@ -48,7 +48,7 @@ typedef enum { /* the user context then the local system context.) */ typedef enum { xdg_user, /* User context */ - xdg_local /* Local system wide context */ + xdg_local /* Local System wide context */ } xdg_scope; /* An error code */ |