projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused cctools code paths for old libusb and cp2103 ioctls.
[fw/altos]
/
cctools
/
lib
/
cc-bitbang.c
diff --git
a/cctools/lib/cc-bitbang.c
b/cctools/lib/cc-bitbang.c
index 1d3ba47664af4bf19cac9a29452eca02e49133c8..a5d157393de475b7b6700cdd424ae21971069dc4 100644
(file)
--- a/
cctools/lib/cc-bitbang.c
+++ b/
cctools/lib/cc-bitbang.c
@@
-22,20
+22,10
@@
#include "ccdbg-debug.h"
#include "cc-bitbang.h"
#include "ccdbg-debug.h"
#include "cc-bitbang.h"
-#define CP_USB_ASYNC
-
-#ifdef CP_USB_ASYNC
#include "cp-usb-async.h"
#include "cp-usb-async.h"
-#else
-#include "cp-usb.h"
-#endif
struct cc_bitbang {
struct cc_bitbang {
-#ifdef CP_USB_ASYNC
struct cp_usb_async *cp_async;
struct cp_usb_async *cp_async;
-#else
- struct cp_usb *cp;
-#endif
};
static uint32_t cc_clock_us = CC_CLOCK_US;
};
static uint32_t cc_clock_us = CC_CLOCK_US;
@@
-77,30
+67,18
@@
cc_bitbang_open(void)
perror("calloc");
return NULL;
}
perror("calloc");
return NULL;
}
-#ifdef CP_USB_ASYNC
bb->cp_async = cp_usb_async_open();
if (!bb->cp_async) {
free (bb);
return NULL;
}
bb->cp_async = cp_usb_async_open();
if (!bb->cp_async) {
free (bb);
return NULL;
}
-#else
- bb->cp = cp_usb_open ();
- if (!bb->cp) {
- free (bb);
- return NULL;
- }
-#endif
return bb;
}
void
cc_bitbang_close(struct cc_bitbang *bb)
{
return bb;
}
void
cc_bitbang_close(struct cc_bitbang *bb)
{
-#ifdef CP_USB_ASYNC
cp_usb_async_close(bb->cp_async);
cp_usb_async_close(bb->cp_async);
-#else
- cp_usb_close(bb->cp);
-#endif
free (bb);
}
free (bb);
}
@@
-140,30
+118,20
@@
cc_bitbang_reset(struct cc_bitbang *bb)
int
cc_bitbang_write(struct cc_bitbang *bb, uint8_t mask, uint8_t value)
{
int
cc_bitbang_write(struct cc_bitbang *bb, uint8_t mask, uint8_t value)
{
-#ifdef CP_USB_ASYNC
cp_usb_async_write(bb->cp_async, mask, value);
cp_usb_async_write(bb->cp_async, mask, value);
-#else
- cp_usb_write(bb->cp, mask, value);
-#endif
return 0;
}
void
cc_bitbang_read(struct cc_bitbang *bb, uint8_t *valuep)
{
return 0;
}
void
cc_bitbang_read(struct cc_bitbang *bb, uint8_t *valuep)
{
-#ifdef CP_USB_ASYNC
cp_usb_async_read(bb->cp_async, valuep);
cp_usb_async_read(bb->cp_async, valuep);
-#else
- *valuep = cp_usb_read(bb->cp);
-#endif
}
void
cc_bitbang_sync(struct cc_bitbang *bb)
{
}
void
cc_bitbang_sync(struct cc_bitbang *bb)
{
-#ifdef CP_USB_ASYNC
cp_usb_async_sync(bb->cp_async);
cp_usb_async_sync(bb->cp_async);
-#endif
}
static char
}
static char