diff options
| author | Bdale Garbee <bdale@gag.com> | 2009-08-18 12:39:17 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2009-08-18 12:39:17 -0600 |
| commit | 90347b16e11743e80f85308700e50b1228c2b8e0 (patch) | |
| tree | 5ab3dddd74502a0a927f95a8fcb76a5303acb104 /cctools/lib/cc-bitbang.c | |
| parent | 06a0e432480efb4e10220b0bdf402282aad32de9 (diff) | |
| parent | a5782398d968e7cb11f7203afada7c216f233b3b (diff) | |
Merge branch 'master' into debian
Diffstat (limited to 'cctools/lib/cc-bitbang.c')
| -rw-r--r-- | cctools/lib/cc-bitbang.c | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/cctools/lib/cc-bitbang.c b/cctools/lib/cc-bitbang.c index 1d3ba476..a5d15739 100644 --- a/cctools/lib/cc-bitbang.c +++ b/cctools/lib/cc-bitbang.c @@ -22,20 +22,10 @@ #include "ccdbg-debug.h" #include "cc-bitbang.h" -#define CP_USB_ASYNC - -#ifdef CP_USB_ASYNC #include "cp-usb-async.h" -#else -#include "cp-usb.h" -#endif struct cc_bitbang { -#ifdef CP_USB_ASYNC struct cp_usb_async *cp_async; -#else - struct cp_usb *cp; -#endif }; static uint32_t cc_clock_us = CC_CLOCK_US; @@ -77,30 +67,18 @@ cc_bitbang_open(void) perror("calloc"); return NULL; } -#ifdef CP_USB_ASYNC 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) { -#ifdef CP_USB_ASYNC cp_usb_async_close(bb->cp_async); -#else - cp_usb_close(bb->cp); -#endif 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) { -#ifdef CP_USB_ASYNC 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) { -#ifdef CP_USB_ASYNC cp_usb_async_read(bb->cp_async, valuep); -#else - *valuep = cp_usb_read(bb->cp); -#endif } void cc_bitbang_sync(struct cc_bitbang *bb) { -#ifdef CP_USB_ASYNC cp_usb_async_sync(bb->cp_async); -#endif } static char |