Bert Vermeulen
8012ae1e3b
chronovu-la8: fix double free
2012-08-03 14:18:02 +02:00
Bert Vermeulen
afc8831938
chronovu-la8: code cleanup
2012-08-03 14:06:52 +02:00
Bert Vermeulen
7021f98596
chronovu-la8: remove session source when done
2012-08-03 11:29:01 +02:00
Bert Vermeulen
cf1ebd5446
chronovu-la8: don't try to clean up unless we've initialized
2012-08-03 11:29:00 +02:00
Bert Vermeulen
1644fb2473
chronovu-la8: use driver-private storage for instances
2012-08-03 11:29:00 +02:00
Bert Vermeulen
6f57fd9694
sr: remove obsolete SR_DI_INST
2012-08-03 11:29:00 +02:00
Bert Vermeulen
87ca93c504
sr/drivers: add proper probe list to instances of all drivers
2012-08-03 11:29:00 +02:00
Bert Vermeulen
b35c829306
sr/drivers: fix off-by-one if frontend-initiated probe configuration
2012-08-03 11:29:00 +02:00
Bert Vermeulen
9e90dcba9c
sr/drivers: remove driver API call dev_status_get()
...
It's obsolete: no frontend ever used it, and neither did libsigrok.
The sdi->status field is only used internally by some drivers, and
should probably be moved to the driver-specific context structs.
2012-08-03 11:27:31 +02:00
Bert Vermeulen
3ffb6964a1
sr/drivers: change driver dev_acquisition_start/_stop calls to use sdi
2012-08-03 11:27:31 +02:00
Bert Vermeulen
25a0f108f4
sr/drivers: change driver dev_open/dev_close calls to use sdi
2012-08-03 11:27:31 +02:00
Bert Vermeulen
6f4b1868e8
sr/drivers: use sr_dev_inst instead of device index for dev_config_set()
...
All driver API calls using device index as a parameter will instead use a
const struct sr_dev_inst.
2012-08-03 10:27:39 +02:00
Bert Vermeulen
9c4311c524
chronovu-la8: adjust to multi-vid/pid patch
2012-08-03 10:27:39 +02:00
Bert Vermeulen
7566601c21
chronovu-la8: don't use deprecated hwcap_get_all() driver API call
2012-08-03 10:27:39 +02:00
Bert Vermeulen
cfe8a84dd7
chronovu-la8: scan/info_get fixes
2012-08-03 10:27:39 +02:00
Bert Vermeulen
6a2761fd99
chronovu-la8: use new driver info_get() API call
2012-08-03 10:27:38 +02:00
Bert Vermeulen
c4f3ed4bb0
chronovu-la8: use new scan API + fixes
...
Now freeing FTDI context and driver-private context.
2012-08-03 10:27:38 +02:00
Bert Vermeulen
765ef2f725
chronovu-la8: use driver struct-based device instance list
2012-08-03 10:27:38 +02:00
Bert Vermeulen
61136ea603
sr: add new driver API call: scan()
...
This changes the semantics of the init() call as well. That now only
initializes the driver -- an administrative affair, no hardware gets
touched during this call. It returns a standard SR_OK or SR_ERR* code.
The scan() call does a discovery run for devices it knows, and returns
the number found. It can be called at any time.
2012-08-03 10:27:36 +02:00
Bert Vermeulen
40dda2c3a5
sr: remove unused argument from hardware driver function init()
...
It was actually used in one way: the session file loaded abused it for
passing in the filename -- something it definitely wasn't intended for.
This now uses the proper way to pass arguments to a driver: the new
SR_HWCAP_SESSIONFILE.
The OLS driver could also use it as an indication of the serial port to
use instead of actively probing all serial ports on the system, but there
wasn't any frontend code that passed in such a parameter, making it
entirely useless. That will soon be handled differently with the new
scan() API call, regardless.
2012-08-03 10:27:36 +02:00
Bert Vermeulen
d67b663e21
sr: chronovu-la8: fix segfault on discovery
...
If the uninitialized value didn't happen to contain 0, and there
is no Chronovu LA8 connected, the la8_close() causes a segfault
in libftdi.
2012-07-24 00:53:01 +02:00
Uwe Hermann
74e5f12d3d
sr: la8: Support for newer USB VID/PID of the device.
...
Thanks to Jerry Jacobs for the patch!
2012-07-15 00:34:27 +02:00
Uwe Hermann
43be303c84
sr: la8: Drop useless cast.
2012-07-12 23:23:13 +02:00
Bert Vermeulen
45c59c8bdd
sr: moved sigrok.h so libsigrok/libsigrok.h
...
All frontends will have to include <libsigrok/libsigrok.h> from now on.
This header includes proto.h and version.h, both installed from the
distribution into $INCLUDE/libsigrok/ as well.
The only dynamically changed header is now version.h, which has both
libsigrok and libtool compile-time versions in it.
2012-07-05 01:17:28 +02:00
Uwe Hermann
b908f067f2
sr: chronovu-la8: Split code into api.c and driver.c.
...
We should generally use api.c for API related functions and put the other
functions (mostly hardware-specific low-level code) into other C file(s)
for better readability.
2012-06-21 23:34:38 +02:00
Joel Holdsworth
a533743dd1
sr: Made sample rate lists const
2012-05-31 19:51:11 +01:00
Joel Holdsworth
1b79df2f57
sr: Made the dev_config_set parameter a const pointer
2012-05-31 19:51:11 +01:00
Joel Holdsworth
b7f578bef5
sr: Made the dev_info_get return value const
2012-05-31 19:51:10 +01:00
Joel Holdsworth
915f7cc87a
sr: Made hwcap const
2012-05-31 19:51:09 +01:00
Bert Vermeulen
f366e86c68
sr: change all drivers to use SR_DF_META_LOGIC
2012-05-30 23:55:36 +02:00
Uwe Hermann
0abee5076f
sr: Fix some TODOs, improve comments/docs.
2012-03-04 15:10:12 +01:00
Uwe Hermann
3cd3a20b35
sr: More callback param renames.
...
Start/stop acquisition callbacks: Consistently name the 'void *' parameter
cb_data for now. The per-device-instance device pointer is called
'session_dev_id' everywhere for now, but this should be renamed to
something more clear.
2012-03-04 15:10:09 +01:00
Uwe Hermann
1f9813eb6c
sr: Name all callback data 'cb_data'.
2012-03-02 02:25:42 +01:00
Uwe Hermann
31ccebc492
sr: s/sr_session_bus/sr_session_send/.
2012-03-01 23:49:25 +01:00
Uwe Hermann
c09f0b578c
sr/cli/gtk/qt/: s/plugin/driver/.
2012-02-28 23:52:30 +01:00
Uwe Hermann
d261dbbfcc
sr: Fix/document probe names.
2012-02-28 01:09:29 +01:00
Uwe Hermann
04254c3f83
sr: la8: Improve comments and messages a bit.
2012-02-23 22:16:16 +01:00
Uwe Hermann
47671b0f26
sr: la8: Remove some unneeded checks.
2012-02-23 00:27:12 +01:00
Uwe Hermann
ea9cfed7a5
sr: Consistent ctx name for per-dev-inst context.
2012-02-18 18:07:42 +01:00
Uwe Hermann
a9a245b428
sr: s/config_set/dev_config_set/.
...
This functions is per-device-instance, so use dev_ as prefix as with
the other ones.
2012-02-18 12:11:15 +01:00
Uwe Hermann
69040b7c8f
sr: s/acquisition_*/dev_acquisition_*/.
...
These functions are per-device-instance, so use dev_ as prefix as with
the other ones.
2012-02-18 12:03:49 +01:00
Uwe Hermann
e7eb703fff
sr: opendev/closedev -> dev_open/dev_close.
2012-02-18 11:57:43 +01:00
Uwe Hermann
8105505d06
sr: s/st*_acquisition/acquisition_st*/.
2012-02-18 11:46:51 +01:00
Uwe Hermann
5097b0d091
sr/cli/gtk/qt: s/get_dev_info/dev_info_get/.
2012-02-18 11:41:21 +01:00
Uwe Hermann
a7d05fcb38
sr/cli/gtk/qt: s/configuration/config/.
2012-02-18 00:31:35 +01:00
Uwe Hermann
ffedd0bf5d
sr/cli/gtk: s/capability/hwcap/.
2012-02-18 00:17:18 +01:00
Uwe Hermann
1d9a8a5fe1
sr/cli/gtk: A few more s/instance/inst/.
2012-02-17 23:55:27 +01:00
Uwe Hermann
bb7ef79377
sr/cli/gtk/qt: s/device/dev/ in many places.
...
Also, a few s/instance/inst/ occurences.
2012-02-17 23:47:00 +01:00
Uwe Hermann
d68e2d1a21
sr: Some more s/device_instance/dev_inst/.
2012-02-17 22:40:51 +01:00
Bert Vermeulen
9fc6aa0a56
sr: la8: remove debug output when no device is found
2012-02-14 13:18:17 +01:00
Bert Vermeulen
341ce41545
sr: don't free driver-specific per-device struct in drivers
...
sr_dev_inst_free() takes care of that.
2012-02-14 12:26:22 +01:00
Bert Vermeulen
da1466d677
sr: rename more functions to sr_thing_action format
...
Also improved the interface to find capabilities in a hardware plugin.
2012-02-14 00:23:51 +01:00
Bert Vermeulen
d3683c42e7
sr: rename all sr_device_instance_* functions to sr_dev_inst_*
2012-02-13 22:45:49 +01:00
Uwe Hermann
57ab7d9f92
sr: cleanup callback: Return int.
2012-02-13 19:49:01 +01:00
Uwe Hermann
3010f21c91
sr: stop_acquisition callback: Return int.
2012-02-13 19:49:00 +01:00
Uwe Hermann
133a37bfba
Use g_try_malloc/g_free/g_strdup consistently.
...
Avoid plain malloc()/free() in sr/srd, especially in the API calls.
Also avoid g_malloc*() in favor of g_try_malloc*().
Use g_strdup() instead of strdup() so that we can use g_free()
consistently everywhere.
Exceptions: Stuff that is allocated via other libs (not using glib),
should also be properly free'd using the respective free-ing function
(instead of g_free()). Examples: Stuff allocated by libusb, libftdi, etc.
Also, use sr_err() instead of sr_warn() for actual errors. sr_warn() is
meant for non-fatal/uncritical warnings.
2012-02-11 22:34:16 +01:00
Uwe Hermann
cd853ff0b2
sr: chronovu-la8: Add missing <stdlib.h> #include.
2012-02-11 00:39:25 +01:00
Uwe Hermann
5c64390e5a
sr/cli/gtk: Remove analog left-overs from API.
...
This will come back in some form or another later, but for now
don't clutter the API with non-working stuff. Removing stuff from APIs
is not possible without breaking the API, adding stuff later is simpler.
2012-02-05 15:05:12 +01:00
Uwe Hermann
ca070ed9a0
sr: Make more symbols private via static/SR_PRIV.
...
Additional zeroplus fixes:
- Remove unneeded function prototypes from .h files.
- Remove unused variables and/or use standard libusb #defines instead.
- Remove unused GL_* error code #defines.
2012-02-02 21:46:10 +01:00
Bert Vermeulen
0146970797
sr: remove unused time/duration fields from datafeed packets
2012-02-01 02:59:41 +01:00
Uwe Hermann
ae32d7d759
sr: la8: Fix typo.
2012-01-29 19:19:38 +01:00
Uwe Hermann
db8ae7b941
sr/srd: Remove/fix non-applicable autotools stuff.
2011-12-30 11:14:24 +01:00
Uwe Hermann
c37d2b1ba1
probe names: Fix cosmetics, add docs, fix off-by-one.
2011-12-29 19:50:14 +01:00
Kristoffer Sjöberg
464d12c72a
Move the probe naming to the creator of the device, and let each driver name its own probes.
2011-12-29 17:04:31 +01:00
Uwe Hermann
b7f09cf86d
libsigrok: Fix #includes.
...
In the lib, we should only #include "sigrok.h" or "sigrok-internal.h",
but not the (possibly installed and thus different/older versions) via
<sigrok.h> or <sigrok-internal.h>.
Frontends should of course use <sigrok.h> and <sigrok-internal.h>.
2011-12-28 23:07:08 +01:00
Uwe Hermann
25a605d187
libsigrok: Quickfix for a segfault in ChronoVu LA8.
2011-12-04 18:33:29 +01:00
Uwe Hermann
cb93f8a927
Other method to avoid "unused var" compiler warnings.
...
The '(void)varname' method is nicer than 'varname = varname' and also
prevents warnings when compiling sigrok with clang instead of gcc.
2011-11-24 22:57:48 +01:00
Bert Vermeulen
e7bad06355
la8: device not found during init() scan is not an error
...
fix some hardware plugin semantics
2011-11-20 03:19:06 +01:00
Bert Vermeulen
9c939c5132
use new datafeed packet format
2011-06-19 14:28:50 +02:00
Uwe Hermann
896a19fd65
LA8: Remove trailing whitespace.
2011-05-09 01:04:44 +02:00
Uwe Hermann
d1175d5f7e
LA8: Use sr_spew() where appropriate.
2011-05-09 01:03:27 +02:00
Uwe Hermann
f36cbf60cb
LA8: Improve trigger support and debug output.
2011-05-09 01:03:27 +02:00
Uwe Hermann
a76983fd20
LA8: Eliminate magic numbers.
2011-05-09 00:59:05 +02:00
Uwe Hermann
4d7b525ae9
LA8: Add trigger point support.
...
Report trigger point/position via SR_DF_TRIGGER packet.
2011-05-09 00:59:05 +02:00
Uwe Hermann
d3b1b51cbe
LA8: Free memory from g_*alloc*() via g_freee().
2011-05-05 13:06:14 +02:00
Uwe Hermann
697785d1ae
libsigrok: closedev() now has a return code.
...
This is useful to allow frontends to react upon close failures in a
way they see fit (e.g. a popup in the GUI, or error message in the CLI).
They can also still ignore the error if they want, of course.
2011-05-05 13:06:14 +02:00
Uwe Hermann
86f5e3d826
libsigrok: Rename open/close to opendev/closedev.
2011-05-05 13:06:11 +02:00
Uwe Hermann
4362438f1e
LA8: Shrink mangled_buf from 8MB to 4KB.
...
It's not necessary to have an 8MB buffer. Also, make it static, don't
use malloc() here.
2011-04-25 00:21:41 +02:00
Uwe Hermann
4bc5fd4568
LA8: Eliminate unused num_probes variable.
2011-04-25 00:21:40 +02:00
Uwe Hermann
309397702f
LA8: Replace some sr_warn() with sr_err().
2011-04-25 00:21:40 +02:00
Uwe Hermann
ecaf59db8d
LA8: probeconfig/trigger support.
...
This should make proper trigger support work for ChronoVu LA8.
2011-04-25 00:21:39 +02:00
Uwe Hermann
2e82a17b5a
LA8: Always use glib's memory allocation functions.
2011-04-16 18:08:17 +02:00
Uwe Hermann
15f2d0c0f2
Don't close/reset the FTDI device too often.
...
Only call la8_close_usb_reset_sequencer() in hw_closedev(), it's not
needed in hw_stop_acquisition().
Thanks Ken Mobley of ChronoVu for the report.
2011-04-15 20:47:26 +02:00
Uwe Hermann
2f5c8c9696
LA8: free() sample buffers in hw_closedev().
...
Thanks Ken Mobley of ChronoVu for the report.
2011-04-15 20:05:45 +02:00
Uwe Hermann
b08024a836
libsigrok: Introduce sr_dbg/sr_info/sr_warn/sr_err.
...
We should use these (internal) functions in libsigrok exclusively from
now on, i.e. no more use of glib's g_debug() etc.
These functions are only for libsigrok, the frontends use whatever
logging mechanism is suitable there.
2011-04-14 10:11:08 +02:00
Uwe Hermann
8703f512a7
LA8: Use the new SR_ERR_ARG macro.
2011-04-10 23:03:33 +02:00
Uwe Hermann
f4314d7e06
Add initial support for the ChronoVu LA8.
2011-04-04 19:40:30 +02:00