projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.gag.com/fw/altos
[fw/altos]
/
altosui
/
libaltos
/
libaltos.c
diff --git
a/altosui/libaltos/libaltos.c
b/altosui/libaltos/libaltos.c
index 48e00a4415d4bd034f33bd45710035a561d69fe9..515432f9ac21f8ed4e351ae89a881ae59cc398fe 100644
(file)
--- a/
altosui/libaltos/libaltos.c
+++ b/
altosui/libaltos/libaltos.c
@@
-23,12
+23,8
@@
#define USB_VENDOR_FSF 0xfffe
#define USB_VENDOR_ALTUSMETRUM USB_VENDOR_FSF
#define USB_PRODUCT_ALTUSMETRUM 0x000a
#define USB_VENDOR_FSF 0xfffe
#define USB_VENDOR_ALTUSMETRUM USB_VENDOR_FSF
#define USB_PRODUCT_ALTUSMETRUM 0x000a
-#define USB_PRODUCT_TELEMETRUM 0x000b
-#define USB_PRODUCT_TELEDONGLE 0x000c
-#define USB_PRODUCT_TELETERRA 0x000d
-#define USB_PRODUCT_TELEBT 0x000e
#define USB_PRODUCT_ALTUSMETRUM_MIN 0x000a
#define USB_PRODUCT_ALTUSMETRUM_MIN 0x000a
-#define USB_PRODUCT_ALTUSMETRUM_MAX 0x00
13
+#define USB_PRODUCT_ALTUSMETRUM_MAX 0x00
ff
#define USB_IS_ALTUSMETRUM(v,p) ((v) == USB_VENDOR_ALTUSMETRUM && \
(USB_PRODUCT_ALTUSMETRUM_MIN <= (p) && \
#define USB_IS_ALTUSMETRUM(v,p) ((v) == USB_VENDOR_ALTUSMETRUM && \
(USB_PRODUCT_ALTUSMETRUM_MIN <= (p) && \
@@
-225,7
+221,7
@@
altos_flush(struct altos_file *file)
#endif
if (ret < 0) {
altos_set_last_posix_error();
#endif
if (ret < 0) {
altos_set_last_posix_error();
- return -
errno
;
+ return -
last_error.code
;
}
if (ret) {
memmove(file->out_data, file->out_data + ret,
}
if (ret) {
memmove(file->out_data, file->out_data + ret,
@@
-251,7
+247,7
@@
altos_putchar(struct altos_file *file, char c)
ret = 0;
if (file->out_used == USB_BUF_SIZE)
ret = altos_flush(file);
ret = 0;
if (file->out_used == USB_BUF_SIZE)
ret = altos_flush(file);
- return
0
;
+ return
ret
;
}
#ifdef USE_POLL
}
#ifdef USE_POLL