Merge git://github.com/libdivecomputer/libdivecomputer into NG-test

Shearwater: add extended information parsing
This adds the string field interface to the Shearwater family of dive computers. That includes proper serial number formatting, but it also has a lot of new fields for battery information (both the dive computer itself and the transmitter) but also deco model information. Much of the deco model cases come from Anton Lundin in the original subsurface branch, and Dirk Hohndel added the battery type and serial number and firmware version data. And I ended up massaging it even in that original branch, so it blamed me for all these lines even back there. The sign-offs from Dirk and Anton are from the original commits. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2018-04-19 07:59:50 -07:00 · 2018-04-17 12:28:33 -07:00 · 2018-04-17 12:28:33 -07:00 · 2018-04-17 12:28:33 -07:00 · 2018-04-17 12:28:33 -07:00 · 2018-04-17 12:28:33 -07:00
249 changed files with 5713 additions and 28053 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -1,173 +0,0 @@
-name: Build
-
-on: [push, pull_request]
-
-jobs:
-
-  linux:
-
-    name: Linux
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        compiler: [gcc, clang]
-
-    env:
-      CC: ${{ matrix.compiler }}
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: sudo apt-get install libbluetooth-dev libusb-1.0-0-dev
-      - run: autoreconf --install --force
-      - run: ./configure --prefix=/usr
-      - run: make
-      - run: make distcheck
-      - name: Package artifacts
-        run: |
-          make install DESTDIR=$PWD/artifacts
-          tar -czf ${{ github.job }}-${{ matrix.compiler }}.tar.gz -C artifacts usr
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ github.job }}-${{ matrix.compiler }}
-          path: ${{ github.job }}-${{ matrix.compiler }}.tar.gz
-
-  mac:
-
-    name: Mac
-
-    runs-on: macos-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        compiler: [gcc, clang]
-
-    env:
-      CC: ${{ matrix.compiler }}
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: brew install autoconf automake libtool hidapi libusb
-      - run: autoreconf --install --force
-      - run: ./configure --prefix=/usr
-      - run: make
-      - run: make distcheck
-      - name: Package artifacts
-        run: |
-          make install DESTDIR=$PWD/artifacts
-          tar -czf ${{ github.job }}-${{ matrix.compiler }}.tar.gz -C artifacts usr
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ github.job }}-${{ matrix.compiler }}
-          path: ${{ github.job }}-${{ matrix.compiler }}.tar.gz
-
-  windows:
-
-    name: Windows
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      fail-fast: false
-      matrix:
-        arch: [i686, x86_64]
-
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies
-        run: sudo apt-get install gcc-mingw-w64 binutils-mingw-w64 mingw-w64-tools
-      - name: Install libusb
-        env:
-          LIBUSB_VERSION: 1.0.26
-        run: |
-          wget -c https://github.com/libusb/libusb/archive/refs/tags/v${LIBUSB_VERSION}.tar.gz
-          tar xzf v${LIBUSB_VERSION}.tar.gz
-          pushd libusb-${LIBUSB_VERSION}
-          autoreconf --install --force
-          ./configure --host=${{ matrix.arch }}-w64-mingw32 --prefix=/usr
-          make
-          make install DESTDIR=$PWD/../artifacts
-          popd
-      - name: Install hidapi
-        env:
-          HIDAPI_VERSION: 0.12.0
-        run: |
-          wget -c https://github.com/libusb/hidapi/archive/refs/tags/hidapi-${HIDAPI_VERSION}.tar.gz
-          tar xzf hidapi-${HIDAPI_VERSION}.tar.gz
-          pushd hidapi-hidapi-${HIDAPI_VERSION}
-          autoreconf --install --force
-          ./configure --host=${{ matrix.arch }}-w64-mingw32 --prefix=/usr LDFLAGS='-static-libgcc'
-          make
-          make install DESTDIR=$PWD/../artifacts
-          popd
-      - run: autoreconf --install --force
-      - run: ./configure --host=${{ matrix.arch }}-w64-mingw32 --prefix=/usr
-        env:
-          PKG_CONFIG_LIBDIR: ${{ github.workspace }}/artifacts/usr/lib/pkgconfig
-          PKG_CONFIG_SYSROOT_DIR: ${{ github.workspace }}/artifacts
-          PKG_CONFIG_ALLOW_SYSTEM_CFLAGS: 1
-          PKG_CONFIG_ALLOW_SYSTEM_LIBS: 1
-      - run: make
-      - run: make distcheck
-      - name: Package artifacts
-        run: |
-          make install DESTDIR=$PWD/artifacts
-          tar -czf ${{ github.job }}-${{ matrix.arch }}.tar.gz -C artifacts usr
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ github.job }}-${{ matrix.arch }}
-          path: ${{ github.job }}-${{ matrix.arch }}.tar.gz
-
-#  msvc:
-#
-#    name: Visual Studio
-#
-#    runs-on: windows-latest
-#
-#    strategy:
-#      fail-fast: false
-#      matrix:
-#        platform: [x86, x64]
-#
-#    env:
-#      CONFIGURATION: Release
-#
-#    steps:
-#      - uses: actions/checkout@v3
-#      - uses: msys2/setup-msys2@v2
-#        with:
-#          install: autoconf automake libtool pkg-config make gcc
-#      - run: |
-#          autoreconf --install --force
-#          ./configure --prefix=/usr
-#          make -C src revision.h
-#        shell: msys2 {0}
-#      - uses: microsoft/setup-msbuild@v1
-#      - run: msbuild -m -p:Platform=${{ matrix.platform }} -p:Configuration=${{ env.CONFIGURATION }} contrib/msvc/libdivecomputer.vcxproj
-#      - uses: actions/upload-artifact@v3
-#        with:
-#          name: ${{ github.job }}-${{ matrix.platform }}
-#          path: contrib/msvc/${{ matrix.platform }}/${{ env.CONFIGURATION }}/bin
-
-  android:
-
-    name: Android
-
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-      - run: |
-          autoreconf --install --force
-          ./configure --prefix=/usr
-          make -C src revision.h
-      - run: $ANDROID_NDK/ndk-build -C contrib/android NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk
-      - uses: actions/upload-artifact@v3
-        with:
-          name: ${{ github.job }}
-          path: contrib/android/libs
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -1,47 +0,0 @@
-name: Release
-
-on:
-  push:
-    tags: 'v*'
-
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Version number
-        id: version
-        run: |
-          VERSION="${GITHUB_REF/refs\/tags\/v/}"
-          echo "version=${VERSION}" >> $GITHUB_OUTPUT
-
-      - name: Build distribution tarball
-        id: build
-        run: |
-          sudo apt-get install libbluetooth-dev libusb-1.0-0-dev
-          autoreconf --install --force
-          ./configure
-          make
-          make distcheck
-
-      - name: Check tarball version number
-        id: check
-        run: |
-          FILENAME="libdivecomputer-${{ steps.version.outputs.version }}.tar.gz"
-          if [ ! -f "${FILENAME}" ]; then
-             echo ::error ::Tarball \'${FILENAME}\' not found!
-             exit 1
-          fi
-
-      - name: Create Github release
-        id: release
-        run: |
-          VERSION="${{ steps.version.outputs.version }}"
-          if [ "${VERSION}" != "${VERSION%%-*}" ]; then
-             PRERELEASE="-p"
-          fi
-          gh release create ${PRERELEASE} "${{ github.ref }}" "libdivecomputer-${VERSION}.tar.gz"
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.gitignore
+++ b/.gitignore
@ -37,7 +37,32 @@ Makefile.in
 /doc/html/
 /doc/latex/

-/examples/dctool
+/examples/aladin
+/examples/atom2
+/examples/d9
+/examples/darwin
+/examples/edy
+/examples/eon
+/examples/frog
+/examples/iconhd
+/examples/leonardo
+/examples/memomouse
+/examples/n2ition3
+/examples/nemo
+/examples/ostc
+/examples/ostc-fwupdate
+/examples/predator
+/examples/puck
+/examples/sensus
+/examples/sensuspro
+/examples/sensusultra
+/examples/smart
+/examples/solution
+/examples/universal
+/examples/veo250
+/examples/vtpro
+/examples/vyper
+/examples/vyper2

 /include/libdivecomputer/version.h

@ -47,10 +72,11 @@ Makefile.in
 /m4/ltsugar.m4
 /m4/ltversion.m4

-/msvc/x64/
-/msvc/x86/
+/msvc/Debug/
+/msvc/Release/
 /msvc/*.ncb
 /msvc/*.suo
+/msvc/*.vcproj.*.user

 /src/libdivecomputer.exp
 /src/libdivecomputer.la
--- a/.travis.yml
+++ b/.travis.yml
@ -1,55 +0,0 @@
-language: c
-
-matrix:
-  include:
-    - os: linux
-      compiler: gcc
-
-    - os: linux
-      compiler: clang
-
-    - os: osx
-      compiler: gcc
-
-    - os: osx
-      compiler: clang
-
-    - os: linux
-      compiler: i686-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64
-            - binutils-mingw-w64
-            - mingw-w64-tools
-
-    - os: linux
-      compiler: x86_64-w64-mingw32-gcc
-      addons:
-        apt:
-          packages:
-            - gcc-mingw-w64
-            - binutils-mingw-w64
-            - mingw-w64-tools
-
-addons:
-  apt:
-    packages:
-      - libbluetooth-dev
-      - libusb-1.0-0-dev
-  homebrew:
-    packages:
-      - hidapi
-      - libusb
-
-script:
-  - case $CC in
-        *-gcc) TARGET="${CC%-gcc}" ;;
-    esac
-  - if [ -n "$TARGET" ]; then
-        TARGETOPTS="--host=${TARGET}";
-        unset CC;
-    fi
-  - autoreconf --install --force
-  - ./configure $TARGETOPTS --disable-doc
-  - make
--- a/Makefile.am
+++ b/Makefile.am
@ -16,8 +16,4 @@ pkgconfig_DATA = libdivecomputer.pc

 EXTRA_DIST = \
 	libdivecomputer.pc.in \
-	contrib/README \
-	contrib/android/Android.mk \
-	contrib/msvc/libdivecomputer.vcxproj \
-	contrib/msvc/libdivecomputer.vcxproj.filters \
-	contrib/udev/libdivecomputer.rules
+	msvc/libdivecomputer.vcproj
--- a/74
+++ b/74
@ -1,77 +1,3 @@
-Version 0.8.0 (2023-05-11)
-==========================
-
-The v0.8.0 release is mainly a bugfix release, and brings in support for a
-number of new devices. This release is fully backwards compatible with the
-previous one.
-
-New features:
-
- * Add support for new backends:
-    - excursion: Deep Six Excursion, Crest CR-4, Genesis Centauri, Tusa TC1, Scorpena Alpha
-    - screen: Seac Screen and Action
-    - cosmiq: Deepblu Cosmiq+
-    - s1: Oceans S1
-    - freedom: Divesoft Freedom and Liberty
- * Add support for some new devices:
-    - Aqualung: i200C
-    - Cressi: Donatello, Michelangelo, Neon
-    - Mares: Puck Pro +
-    - Oceanic: Geo Air
-    - Ratio: iX3M 2
-    - Scubapro: G2 TEK
-    - Shearwater: Petrel 3, Perdix 2
-    - Sherwood: Amphos Air 2.0
- * Add support for parsing the decompression model
- * Add a public api to configure the depth calibration
- * Add a public api to configure the clock synchronization
- * Add a basic Android build system
-
-Removed/changed features:
-
- * Migrate to Visual Studio 2013 (or newer)
- * Move the Visual Studio project to the contrib directory
-
-Version 0.7.0 (2021-05-07)
-==========================
-
-The main highlight of the v0.7.0 release is the introduction of the new
-I/O interface. With this common interface, the dive computer backends
-can more easily use different I/O implementations at runtime, including
-an application defined one. This is needed to support Bluetooth Low
-Energy (BLE), for which there is no built-in implementation available.
-
-Due to the fundamental changes to the I/O layer, this release is not
-backwards compatible.
-
-New features:
-
- * A new I/O interface
- * Add support for new backends:
-    - goa: Cressi Goa and Cartesio
-    - divecomputereu: Tecdiving DiveComputer.eu
-    - extreme: McLean Extreme
-    - lynx: Liquivision Xen, Xeo, Lynx and Kaon
-    - sp2: Sporasub SP2
- * Add support for many new devices:
-    - Aqualung: i100, i200C, i300C, i470TC, i550C, i770R
-    - Heinrichs Weikamp: OSTC 2 TR
-    - Mares: Genius, Horizon, Quad Air, Smart Air
-    - Oceanic: Geo 4.0, Pro Plus 4, Pro Plus X, Veo 4.0
-    - Ratio: iDive Color, iX3M GPS, iX3M 2021
-    - Scubapro: A1, A2, Aladin H Matrix, G2 Console, G2 HUD
-    - Seac: Guru, Jack
-    - Shearwater: Peregrine, Teric
-    - Sherwood: Amphos 2.0, Beacon, Sage, Wisdom 4
-    - Suunto: D5, EON Steel Black
-    - Tusa: Talis
- * Firmware upgrade support for the Ratio computers
- * Support for semi-closed circuit diving
-
-Removed/changed features:
-
- * Unify the Uwatec Smart, Meridian and G2 backends
-
 Version 0.6.0 (2017-11-24)
 ==========================

--- a/configure.ac
+++ b/configure.ac
@ -1,6 +1,6 @@
 # Versioning.
 m4_define([dc_version_major],[0])
-m4_define([dc_version_minor],[9])
+m4_define([dc_version_minor],[7])
 m4_define([dc_version_micro],[0])
 m4_define([dc_version_suffix],[devel-Subsurface-NG])
 m4_define([dc_version],dc_version_major.dc_version_minor.dc_version_micro[]m4_ifset([dc_version_suffix],-[dc_version_suffix]))
@ -72,21 +72,18 @@ AM_CONDITIONAL([HAVE_MANDOC],[test -n "$MANDOC"])
 # Enable automake silent build rules.
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

-# Checks for operating system.
-AC_MSG_CHECKING([for operating system])
+# Checks for native Windows.
+AC_MSG_CHECKING([for native Win32])
 case "$host" in
  *-*-mingw*)
-    platform=windows
-    ;;
-  *-*-darwin*)
-    platform=mac
+    os_win32=yes
    ;;
  *)
-    platform=default
+    os_win32=no
    ;;
 esac
-AC_MSG_RESULT([$platform])
-AM_CONDITIONAL([OS_WIN32], [test "$platform" = "windows"])
+AC_MSG_RESULT([$os_win32])
+AM_CONDITIONAL([OS_WIN32], [test "$os_win32" = "yes"])

 DEPENDENCIES=""

@ -103,29 +100,16 @@ AS_IF([test "x$with_libusb" != "xno"], [
 	])
 ])

-# Checks for MTP support.
-AC_ARG_WITH([libmtp],
-	[AS_HELP_STRING([--without-libmtp],
-		[Build without the libmtp library])],
-	[], [with_libmtp=auto])
-AS_IF([test "x$with_libmtp" != "xno"], [
-	PKG_CHECK_MODULES([LIBMTP], [libmtp], [have_libmtp=yes], [have_libmtp=no])
-	AS_IF([test "x$have_libmtp" = "xyes"], [
-		AC_DEFINE([HAVE_LIBMTP], [1], [libmtp library])
-		DEPENDENCIES="$DEPENDENCIES libmtp"
-	])
-])
-
 # Checks for HIDAPI support.
 AC_ARG_WITH([hidapi],
 	[AS_HELP_STRING([--without-hidapi],
 		[Build without the hidapi library])],
-	[], [with_hidapi=hidapi])
+	[], [with_hidapi=auto])
 AS_IF([test "x$with_hidapi" != "xno"], [
-	PKG_CHECK_MODULES([HIDAPI], [$with_hidapi], [have_hidapi=yes], [have_hidapi=no])
+	PKG_CHECK_MODULES([HIDAPI], [hidapi], [have_hidapi=yes], [have_hidapi=no])
 	AS_IF([test "x$have_hidapi" = "xyes"], [
 		AC_DEFINE([HAVE_HIDAPI], [1], [hidapi library])
-		DEPENDENCIES="$DEPENDENCIES $with_hidapi"
+		DEPENDENCIES="$DEPENDENCIES hidapi"
 	])
 ])

@ -170,7 +154,7 @@ AC_CHECK_HEADERS([sys/socket.h linux/types.h linux/irda.h], , , [
 # Checks for header files.
 AC_CHECK_HEADERS([linux/serial.h])
 AC_CHECK_HEADERS([IOKit/serial/ioss.h])
-AC_CHECK_HEADERS([unistd.h getopt.h])
+AC_CHECK_HEADERS([getopt.h])
 AC_CHECK_HEADERS([sys/param.h])
 AC_CHECK_HEADERS([pthread.h])
 AC_CHECK_HEADERS([mach/mach_time.h])
@ -190,7 +174,6 @@ AC_CHECK_FUNCS([clock_gettime mach_absolute_time])
 AC_CHECK_FUNCS([getopt_long])

 # Checks for supported compiler options.
-AX_APPEND_COMPILE_FLAGS([-Werror=unknown-warning-option],[ERROR_CFLAGS])
 AX_APPEND_COMPILE_FLAGS([ \
 	-Wall \
 	-Wshadow \
@ -207,13 +190,10 @@ AX_APPEND_COMPILE_FLAGS([ \
 	-Wno-unused-but-set-variable \
 	-Wno-pointer-sign \
 	-Wno-shadow \
-	-Wenum-conversion \
-	-Werror=enum-conversion \
-	-fmacro-prefix-map='$(top_srcdir)/'= \
-],,[$ERROR_CFLAGS])
+])

 # Windows specific compiler options.
-AS_IF([test "$platform" = "windows"], [
+AS_IF([test "$os_win32" = "yes"], [
 	AX_APPEND_COMPILE_FLAGS([-Wno-pedantic-ms-format])
 ])

@ -229,25 +209,6 @@ m4_ifset([dc_version_suffix],[
 	AC_DEFINE(HAVE_VERSION_SUFFIX, [1], [Define if a version suffix is present.])
 ])

-# Supported transports
-transport_serial="yes"
-transport_usb="${have_libusb-no}"
-if test "$have_hidapi" = "yes"; then
-	transport_usbhid="yes"
-elif test "$have_libusb" = "yes" && test "$platform" != "mac"; then
-	transport_usbhid="yes"
-else
-	transport_usbhid="no"
-fi
-if test "$platform" = "windows"; then
-	transport_irda="$ac_cv_header_af_irda_h"
-	transport_bluetooth="$ac_cv_header_ws2bth_h"
-else
-	transport_irda="$ac_cv_header_linux_irda_h"
-	transport_bluetooth="${have_bluez-no}"
-fi
-transport_ble="no"
-
 AC_CONFIG_FILES([
   libdivecomputer.pc
   Makefile
@ -255,41 +216,10 @@ AC_CONFIG_FILES([
   include/libdivecomputer/Makefile
   include/libdivecomputer/version.h
   src/Makefile
+   src/libdivecomputer.rc
   doc/Makefile
   doc/doxygen.cfg
   doc/man/Makefile
   examples/Makefile
 ])
 AC_OUTPUT
-AC_MSG_NOTICE([
-  $PACKAGE $VERSION
-  ===============
-
-  Compiler:
-
-    CC      : $CC
-    CFLAGS  : $CFLAGS
-    LDFLAGS : $LDFLAGS
-
-  Features:
-
-    Logging              : $enable_logging
-    Pseudo terminal      : $enable_pty
-    Example applications : $enable_examples
-    Documentation        : $enable_doc
-
-  Transports:
-
-    Serial    : $transport_serial
-    USB       : $transport_usb
-    USBHID    : $transport_usbhid
-    IrDA      : $transport_irda
-    Bluetooth : $transport_bluetooth
-    BLE       : $transport_ble
-
-  Building:
-
-    Type 'make' to compile $PACKAGE.
-
-    Type 'make install' to install $PACKAGE.
-])
--- a/contrib/README
+++ b/contrib/README
@ -1,56 +0,0 @@
-Alternative build systems
-=========================
-
-The autotools based build system is the official build system for the
-libdivecomputer project. But for convenience, a few alternative build systems
-are available as well. Unfortunately, these builds systems require a few extra
-steps to generate some header files.
-
-If you have access to a UNIX build system (for example a Linux virtual machine,
-MinGW, Cygwin or the Windows Subsystem for Linux), you can use the autotools
-build system to generate those files:
-
-  $ autoreconf --install --force
-  $ ./configure
-  $ make -C src revision.h
-
-Alternative, you can generate those files manually. First, create the version.h
-file from the version.h.in template:
-
-  $ cp include/libdivecomputer/version.h.in include/libdivecomputer/version.h
-
-and replace all the @DC_VERSION@ placeholders with the values defined in the
-configure.ac file.
-
-Next, generate the revision.h file:
-
-  $ echo "#define DC_VERSION_REVISION \"$(git rev-parse --verify HEAD)\"" > src/revision.h
-
-The alternative build systems are ready to use now.
-
-Visual Studio
-------------
-
-The Visual Studio project file can be opened in the IDE, or build directly from
-the command-line:
-
-  msbuild -m -p:Platform=x86|x64 -p:Configuration=Debug|Release contrib/msvc/libdivecomputer.vcxproj
-
-Android NDK
-----------
-
-  $ANDROID_NDK/ndk-build -C contrib/android NDK_PROJECT_PATH=. APP_BUILD_SCRIPT=Android.mk
-
-Linux udev rules
-================
-
-For dive computers using USB or USB HID communication, regular users typically
-don't have the necessary permissions to access the device nodes. This can be
-fixed with some udev rules.
-
-Install the udev rules, and reload them:
-
-  $ sudo cp contrib/udev/libdivecomputer.rules /etc/udev/rules.d/
-  $ sudo udevadm control --reload
-
-Note: the provided udev rules assume the user is in the plugdev group.
--- a/contrib/android/Android.mk
+++ b/contrib/android/Android.mk
@ -1,148 +0,0 @@
-LOCAL_PATH := $(call my-dir)/../..
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := libdivecomputer
-LOCAL_CFLAGS := -DENABLE_LOGGING -DHAVE_VERSION_SUFFIX -DHAVE_PTHREAD_H -DHAVE_STRERROR_R -DHAVE_CLOCK_GETTIME -DHAVE_LOCALTIME_R -DHAVE_GMTIME_R -DHAVE_TIMEGM -DHAVE_STRUCT_TM_TM_GMTOFF
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SRC_FILES := \
-	src/aes.c \
-	src/array.c \
-	src/atomics_cobalt.c \
-	src/atomics_cobalt_parser.c \
-	src/bluetooth.c \
-	src/buffer.c \
-	src/checksum.c \
-	src/citizen_aqualand.c \
-	src/citizen_aqualand_parser.c \
-	src/cochran_commander.c \
-	src/cochran_commander_parser.c \
-	src/common.c \
-	src/context.c \
-	src/cressi_edy.c \
-	src/cressi_edy_parser.c \
-	src/cressi_goa.c \
-	src/cressi_goa_parser.c \
-	src/cressi_leonardo.c \
-	src/cressi_leonardo_parser.c \
-	src/custom.c \
-	src/datetime.c \
-	src/deepblu_cosmiq.c \
-	src/deepblu_cosmiq_parser.c \
-	src/deepsix_excursion.c \
-	src/deepsix_excursion_parser.c \
-	src/descriptor.c \
-	src/device.c \
-	src/diverite_nitekq.c \
-	src/diverite_nitekq_parser.c \
-	src/divesoft_freedom.c \
-	src/divesoft_freedom_parser.c \
-	src/divesystem_idive.c \
-	src/divesystem_idive_parser.c \
-	src/hdlc.c \
-	src/hw_frog.c \
-	src/hw_ostc3.c \
-	src/hw_ostc.c \
-	src/hw_ostc_parser.c \
-	src/ihex.c \
-	src/iostream.c \
-	src/irda.c \
-	src/iterator.c \
-	src/liquivision_lynx.c \
-	src/liquivision_lynx_parser.c \
-	src/mares_common.c \
-	src/mares_darwin.c \
-	src/mares_darwin_parser.c \
-	src/mares_iconhd.c \
-	src/mares_iconhd_parser.c \
-	src/mares_nemo.c \
-	src/mares_nemo_parser.c \
-	src/mares_puck.c \
-	src/mclean_extreme.c \
-	src/mclean_extreme_parser.c \
-	src/oceanic_atom2.c \
-	src/oceanic_atom2_parser.c \
-	src/oceanic_common.c \
-	src/oceanic_veo250.c \
-	src/oceanic_veo250_parser.c \
-	src/oceanic_vtpro.c \
-	src/oceanic_vtpro_parser.c \
-	src/oceans_s1.c \
-	src/oceans_s1_common.c \
-	src/oceans_s1_parser.c \
-	src/packet.c \
-	src/parser.c \
-	src/pelagic_i330r.c \
-	src/platform.c \
-	src/rbstream.c \
-	src/reefnet_sensus.c \
-	src/reefnet_sensus_parser.c \
-	src/reefnet_sensuspro.c \
-	src/reefnet_sensuspro_parser.c \
-	src/reefnet_sensusultra.c \
-	src/reefnet_sensusultra_parser.c \
-	src/ringbuffer.c \
-	src/seac_screen.c \
-	src/seac_screen_parser.c \
-	src/serial_posix.c \
-	src/shearwater_common.c \
-	src/shearwater_petrel.c \
-	src/shearwater_predator.c \
-	src/shearwater_predator_parser.c \
-	src/socket.c \
-	src/sporasub_sp2.c \
-	src/sporasub_sp2_parser.c \
-	src/suunto_common2.c \
-	src/suunto_common.c \
-	src/suunto_d9.c \
-	src/suunto_d9_parser.c \
-	src/suunto_eon.c \
-	src/suunto_eon_parser.c \
-	src/suunto_eonsteel.c \
-	src/suunto_eonsteel_parser.c \
-	src/suunto_solution.c \
-	src/suunto_solution_parser.c \
-	src/suunto_vyper2.c \
-	src/suunto_vyper.c \
-	src/suunto_vyper_parser.c \
-	src/tecdiving_divecomputereu.c \
-	src/tecdiving_divecomputereu_parser.c \
-	src/timer.c \
-	src/usb.c \
-	src/usbhid.c \
-	src/uwatec_aladin.c \
-	src/uwatec_memomouse.c \
-	src/uwatec_memomouse_parser.c \
-	src/uwatec_smart.c \
-	src/uwatec_smart_parser.c \
-	src/version.c \
-	src/zeagle_n2ition3.c \
-	src/field-cache.c \
-	src/usb_storage.c \
-	src/garmin.c \
-	src/garmin_parser.c
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := dctool
-LOCAL_SHARED_LIBRARIES := libdivecomputer
-LOCAL_CFLAGS := -DHAVE_UNISTD_H -DHAVE_GETOPT_H -DHAVE_GETOPT_LONG -DHAVE_DECL_OPTRESET=1
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_SRC_FILES := \
-	examples/common.c \
-	examples/dctool.c \
-	examples/dctool_download.c \
-	examples/dctool_dump.c \
-	examples/dctool_fwupdate.c \
-	examples/dctool_help.c \
-	examples/dctool_list.c \
-	examples/dctool_parse.c \
-	examples/dctool_read.c \
-	examples/dctool_scan.c \
-	examples/dctool_timesync.c \
-	examples/dctool_version.c \
-	examples/dctool_write.c \
-	examples/output.c \
-	examples/output_raw.c \
-	examples/output_xml.c \
-	examples/utils.c
-include $(BUILD_EXECUTABLE)
--- a/contrib/msvc/libdivecomputer.vcxproj
+++ b/contrib/msvc/libdivecomputer.vcxproj
@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{CEA7215A-D6B5-4840-8086-3C854F371997}</ProjectGuid>
-    <RootNamespace>libdivecomputer</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\</OutDir>
-    <IntDir>$(PlatformTarget)\$(Configuration)\obj\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>$(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\</OutDir>
-    <IntDir>$(PlatformTarget)\$(Configuration)\obj\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\</OutDir>
-    <IntDir>$(PlatformTarget)\$(Configuration)\obj\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(SolutionDir)$(PlatformTarget)\$(Configuration)\bin\</OutDir>
-    <IntDir>$(PlatformTarget)\$(Configuration)\obj\</IntDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_VERSION_SUFFIX;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>$(OutDir)libdivecomputer.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_VERSION_SUFFIX;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>$(OutDir)libdivecomputer.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_VERSION_SUFFIX;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>$(OutDir)libdivecomputer.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_VERSION_SUFFIX;HAVE_AF_IRDA_H;HAVE_WS2BTH_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <ModuleDefinitionFile>$(OutDir)libdivecomputer.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\aes.c" />
-    <ClCompile Include="..\..\src\array.c" />
-    <ClCompile Include="..\..\src\atomics_cobalt.c" />
-    <ClCompile Include="..\..\src\atomics_cobalt_parser.c" />
-    <ClCompile Include="..\..\src\bluetooth.c" />
-    <ClCompile Include="..\..\src\buffer.c" />
-    <ClCompile Include="..\..\src\checksum.c" />
-    <ClCompile Include="..\..\src\citizen_aqualand.c" />
-    <ClCompile Include="..\..\src\citizen_aqualand_parser.c" />
-    <ClCompile Include="..\..\src\cochran_commander.c" />
-    <ClCompile Include="..\..\src\cochran_commander_parser.c" />
-    <ClCompile Include="..\..\src\common.c" />
-    <ClCompile Include="..\..\src\context.c" />
-    <ClCompile Include="..\..\src\cressi_edy.c" />
-    <ClCompile Include="..\..\src\cressi_edy_parser.c" />
-    <ClCompile Include="..\..\src\cressi_goa.c" />
-    <ClCompile Include="..\..\src\cressi_goa_parser.c" />
-    <ClCompile Include="..\..\src\cressi_leonardo.c" />
-    <ClCompile Include="..\..\src\cressi_leonardo_parser.c" />
-    <ClCompile Include="..\..\src\custom.c" />
-    <ClCompile Include="..\..\src\datetime.c" />
-    <ClCompile Include="..\..\src\deepblu_cosmiq.c" />
-    <ClCompile Include="..\..\src\deepblu_cosmiq_parser.c" />
-    <ClCompile Include="..\..\src\deepsix_excursion.c" />
-    <ClCompile Include="..\..\src\deepsix_excursion_parser.c" />
-    <ClCompile Include="..\..\src\descriptor.c" />
-    <ClCompile Include="..\..\src\device.c" />
-    <ClCompile Include="..\..\src\diverite_nitekq.c" />
-    <ClCompile Include="..\..\src\diverite_nitekq_parser.c" />
-    <ClCompile Include="..\..\src\divesoft_freedom.c" />
-    <ClCompile Include="..\..\src\divesoft_freedom_parser.c" />
-    <ClCompile Include="..\..\src\divesystem_idive.c" />
-    <ClCompile Include="..\..\src\divesystem_idive_parser.c" />
-    <ClCompile Include="..\..\src\hdlc.c" />
-    <ClCompile Include="..\..\src\hw_frog.c" />
-    <ClCompile Include="..\..\src\hw_ostc.c" />
-    <ClCompile Include="..\..\src\hw_ostc3.c" />
-    <ClCompile Include="..\..\src\hw_ostc_parser.c" />
-    <ClCompile Include="..\..\src\ihex.c" />
-    <ClCompile Include="..\..\src\iostream.c" />
-    <ClCompile Include="..\..\src\irda.c" />
-    <ClCompile Include="..\..\src\iterator.c" />
-    <ClCompile Include="..\..\src\liquivision_lynx.c" />
-    <ClCompile Include="..\..\src\liquivision_lynx_parser.c" />
-    <ClCompile Include="..\..\src\mares_common.c" />
-    <ClCompile Include="..\..\src\mares_darwin.c" />
-    <ClCompile Include="..\..\src\mares_darwin_parser.c" />
-    <ClCompile Include="..\..\src\mares_iconhd.c" />
-    <ClCompile Include="..\..\src\mares_iconhd_parser.c" />
-    <ClCompile Include="..\..\src\mares_nemo.c" />
-    <ClCompile Include="..\..\src\mares_nemo_parser.c" />
-    <ClCompile Include="..\..\src\mares_puck.c" />
-    <ClCompile Include="..\..\src\mclean_extreme.c" />
-    <ClCompile Include="..\..\src\mclean_extreme_parser.c" />
-    <ClCompile Include="..\..\src\oceanic_atom2.c" />
-    <ClCompile Include="..\..\src\oceanic_atom2_parser.c" />
-    <ClCompile Include="..\..\src\oceanic_common.c" />
-    <ClCompile Include="..\..\src\oceanic_veo250.c" />
-    <ClCompile Include="..\..\src\oceanic_veo250_parser.c" />
-    <ClCompile Include="..\..\src\oceanic_vtpro.c" />
-    <ClCompile Include="..\..\src\oceanic_vtpro_parser.c" />
-    <ClCompile Include="..\..\src\oceans_s1.c" />
-    <ClCompile Include="..\..\src\oceans_s1_common.c" />
-    <ClCompile Include="..\..\src\oceans_s1_parser.c" />
-    <ClCompile Include="..\..\src\packet.c" />
-    <ClCompile Include="..\..\src\parser.c" />
-    <ClCompile Include="..\..\src\pelagic_i330r.c" />
-    <ClCompile Include="..\..\src\platform.c" />
-    <ClCompile Include="..\..\src\rbstream.c" />
-    <ClCompile Include="..\..\src\reefnet_sensus.c" />
-    <ClCompile Include="..\..\src\reefnet_sensuspro.c" />
-    <ClCompile Include="..\..\src\reefnet_sensuspro_parser.c" />
-    <ClCompile Include="..\..\src\reefnet_sensusultra.c" />
-    <ClCompile Include="..\..\src\reefnet_sensusultra_parser.c" />
-    <ClCompile Include="..\..\src\reefnet_sensus_parser.c" />
-    <ClCompile Include="..\..\src\ringbuffer.c" />
-    <ClCompile Include="..\..\src\seac_screen.c" />
-    <ClCompile Include="..\..\src\seac_screen_parser.c" />
-    <ClCompile Include="..\..\src\serial_win32.c" />
-    <ClCompile Include="..\..\src\shearwater_common.c" />
-    <ClCompile Include="..\..\src\shearwater_petrel.c" />
-    <ClCompile Include="..\..\src\shearwater_predator.c" />
-    <ClCompile Include="..\..\src\shearwater_predator_parser.c" />
-    <ClCompile Include="..\..\src\socket.c" />
-    <ClCompile Include="..\..\src\sporasub_sp2.c" />
-    <ClCompile Include="..\..\src\sporasub_sp2_parser.c" />
-    <ClCompile Include="..\..\src\suunto_common.c" />
-    <ClCompile Include="..\..\src\suunto_common2.c" />
-    <ClCompile Include="..\..\src\suunto_d9.c" />
-    <ClCompile Include="..\..\src\suunto_d9_parser.c" />
-    <ClCompile Include="..\..\src\suunto_eon.c" />
-    <ClCompile Include="..\..\src\suunto_eonsteel.c" />
-    <ClCompile Include="..\..\src\suunto_eonsteel_parser.c" />
-    <ClCompile Include="..\..\src\suunto_eon_parser.c" />
-    <ClCompile Include="..\..\src\suunto_solution.c" />
-    <ClCompile Include="..\..\src\suunto_solution_parser.c" />
-    <ClCompile Include="..\..\src\suunto_vyper.c" />
-    <ClCompile Include="..\..\src\suunto_vyper2.c" />
-    <ClCompile Include="..\..\src\suunto_vyper_parser.c" />
-    <ClCompile Include="..\..\src\tecdiving_divecomputereu.c" />
-    <ClCompile Include="..\..\src\tecdiving_divecomputereu_parser.c" />
-    <ClCompile Include="..\..\src\timer.c" />
-    <ClCompile Include="..\..\src\usb.c" />
-    <ClCompile Include="..\..\src\usbhid.c" />
-    <ClCompile Include="..\..\src\uwatec_aladin.c" />
-    <ClCompile Include="..\..\src\uwatec_memomouse.c" />
-    <ClCompile Include="..\..\src\uwatec_memomouse_parser.c" />
-    <ClCompile Include="..\..\src\uwatec_smart.c" />
-    <ClCompile Include="..\..\src\uwatec_smart_parser.c" />
-    <ClCompile Include="..\..\src\version.c" />
-    <ClCompile Include="..\..\src\zeagle_n2ition3.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\libdivecomputer\atomics_cobalt.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\ble.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\bluetooth.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\buffer.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\common.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\context.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\custom.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\datetime.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\descriptor.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\device.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\divesystem_idive.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\hw_frog.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\hw_ostc.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\hw_ostc3.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\ioctl.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\iostream.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\irda.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\iterator.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\oceanic_atom2.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\oceanic_veo250.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\oceanic_vtpro.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\parser.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\reefnet_sensus.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\reefnet_sensuspro.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\reefnet_sensusultra.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\serial.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\suunto_d9.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\suunto_eon.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\suunto_vyper2.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\units.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\usb.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\usbhid.h" />
-    <ClInclude Include="..\..\include\libdivecomputer\version.h" />
-    <ClInclude Include="..\..\src\aes.h" />
-    <ClInclude Include="..\..\src\array.h" />
-    <ClInclude Include="..\..\src\atomics_cobalt.h" />
-    <ClInclude Include="..\..\src\checksum.h" />
-    <ClInclude Include="..\..\src\citizen_aqualand.h" />
-    <ClInclude Include="..\..\src\cochran_commander.h" />
-    <ClInclude Include="..\..\src\common-private.h" />
-    <ClInclude Include="..\..\src\context-private.h" />
-    <ClInclude Include="..\..\src\cressi_edy.h" />
-    <ClInclude Include="..\..\src\cressi_goa.h" />
-    <ClInclude Include="..\..\src\cressi_leonardo.h" />
-    <ClInclude Include="..\..\src\deepblu_cosmiq.h" />
-    <ClInclude Include="..\..\src\deepsix_excursion.h" />
-    <ClInclude Include="..\..\src\device-private.h" />
-    <ClInclude Include="..\..\src\diverite_nitekq.h" />
-    <ClInclude Include="..\..\src\divesoft_freedom.h" />
-    <ClInclude Include="..\..\src\divesystem_idive.h" />
-    <ClInclude Include="..\..\src\hdlc.h" />
-    <ClInclude Include="..\..\src\hw_frog.h" />
-    <ClInclude Include="..\..\src\hw_ostc.h" />
-    <ClInclude Include="..\..\src\hw_ostc3.h" />
-    <ClInclude Include="..\..\src\ihex.h" />
-    <ClInclude Include="..\..\src\iostream-private.h" />
-    <ClInclude Include="..\..\src\iterator-private.h" />
-    <ClInclude Include="..\..\src\liquivision_lynx.h" />
-    <ClInclude Include="..\..\src\mares_common.h" />
-    <ClInclude Include="..\..\src\mares_darwin.h" />
-    <ClInclude Include="..\..\src\mares_iconhd.h" />
-    <ClInclude Include="..\..\src\mares_nemo.h" />
-    <ClInclude Include="..\..\src\mares_puck.h" />
-    <ClInclude Include="..\..\src\mclean_extreme.h" />
-    <ClInclude Include="..\..\src\oceanic_atom2.h" />
-    <ClInclude Include="..\..\src\oceanic_common.h" />
-    <ClInclude Include="..\..\src\oceanic_veo250.h" />
-    <ClInclude Include="..\..\src\oceanic_vtpro.h" />
-    <ClInclude Include="..\..\src\oceans_s1.h" />
-    <ClInclude Include="..\..\src\oceans_s1_common.h" />
-    <ClInclude Include="..\..\src\packet.h" />
-    <ClInclude Include="..\..\src\parser-private.h" />
-    <ClInclude Include="..\..\src\pelagic_i330r.h" />
-    <ClInclude Include="..\..\src\platform.h" />
-    <ClInclude Include="..\..\src\rbstream.h" />
-    <ClInclude Include="..\..\src\reefnet_sensus.h" />
-    <ClInclude Include="..\..\src\reefnet_sensuspro.h" />
-    <ClInclude Include="..\..\src\reefnet_sensusultra.h" />
-    <ClInclude Include="..\..\src\revision.h" />
-    <ClInclude Include="..\..\src\ringbuffer.h" />
-    <ClInclude Include="..\..\src\seac_screen.h" />
-    <ClInclude Include="..\..\src\shearwater_common.h" />
-    <ClInclude Include="..\..\src\shearwater_petrel.h" />
-    <ClInclude Include="..\..\src\shearwater_predator.h" />
-    <ClInclude Include="..\..\src\socket.h" />
-    <ClInclude Include="..\..\src\sporasub_sp2.h" />
-    <ClInclude Include="..\..\src\suunto_common.h" />
-    <ClInclude Include="..\..\src\suunto_common2.h" />
-    <ClInclude Include="..\..\src\suunto_d9.h" />
-    <ClInclude Include="..\..\src\suunto_eon.h" />
-    <ClInclude Include="..\..\src\suunto_eonsteel.h" />
-    <ClInclude Include="..\..\src\suunto_solution.h" />
-    <ClInclude Include="..\..\src\suunto_vyper.h" />
-    <ClInclude Include="..\..\src\suunto_vyper2.h" />
-    <ClInclude Include="..\..\src\tecdiving_divecomputereu.h" />
-    <ClInclude Include="..\..\src\timer.h" />
-    <ClInclude Include="..\..\src\uwatec_aladin.h" />
-    <ClInclude Include="..\..\src\uwatec_memomouse.h" />
-    <ClInclude Include="..\..\src\uwatec_smart.h" />
-    <ClInclude Include="..\..\src\zeagle_n2ition3.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\..\src\libdivecomputer.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <CustomBuild Include="..\..\src\libdivecomputer.symbols">
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">echo EXPORTS &gt; "$(OutDir)libdivecomputer.def" &amp;&amp; type "%(FullPath)" &gt;&gt; "$(OutDir)libdivecomputer.def"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">echo EXPORTS &gt; "$(OutDir)libdivecomputer.def" &amp;&amp; type "%(FullPath)" &gt;&gt; "$(OutDir)libdivecomputer.def"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(OutDir)libdivecomputer.def;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(OutDir)libdivecomputer.def;%(Outputs)</Outputs>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">echo EXPORTS &gt; "$(OutDir)libdivecomputer.def" &amp;&amp; type "%(FullPath)" &gt;&gt; "$(OutDir)libdivecomputer.def"</Command>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo EXPORTS &gt; "$(OutDir)libdivecomputer.def" &amp;&amp; type "%(FullPath)" &gt;&gt; "$(OutDir)libdivecomputer.def"</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(OutDir)libdivecomputer.def;%(Outputs)</Outputs>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(OutDir)libdivecomputer.def;%(Outputs)</Outputs>
-    </CustomBuild>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/contrib/msvc/libdivecomputer.vcxproj.filters
+++ b/contrib/msvc/libdivecomputer.vcxproj.filters
@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-</Project>
--- a/contrib/udev/libdivecomputer.rules
+++ b/contrib/udev/libdivecomputer.rules
@ -1,35 +1,17 @@
 # Atomic Aquatics Cobalt
 SUBSYSTEM=="usb", ATTR{idVendor}=="0471", ATTR{idProduct}=="0888", GROUP="plugdev"
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="0471", ATTRS{idProduct}=="0888", GROUP="plugdev"

 # Suunto EON Steel
 SUBSYSTEM=="usb", ATTR{idVendor}=="1493", ATTR{idProduct}=="0030", GROUP="plugdev"
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1493", ATTRS{idProduct}=="0030", GROUP="plugdev"

 # Suunto EON Core
 SUBSYSTEM=="usb", ATTR{idVendor}=="1493", ATTR{idProduct}=="0033", GROUP="plugdev"
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1493", ATTRS{idProduct}=="0033", GROUP="plugdev"
-
-# Suunto D5
-SUBSYSTEM=="usb", ATTR{idVendor}=="1493", ATTR{idProduct}=="0035", GROUP="plugdev"
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1493", ATTRS{idProduct}=="0035", GROUP="plugdev"
-
-# Suunto EON Steel Black
-SUBSYSTEM=="usb", ATTR{idVendor}=="1493", ATTR{idProduct}=="0036", GROUP="plugdev"
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1493", ATTRS{idProduct}=="0036", GROUP="plugdev"

 # Scubapro G2
 SUBSYSTEM=="usb", ATTR{idVendor}=="2e6c", ATTR{idProduct}=="3201", GROUP="plugdev"
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2e6c", ATTRS{idProduct}=="3201", GROUP="plugdev"

 # Scubapro G2 Console
 SUBSYSTEM=="usb", ATTR{idVendor}=="2e6c", ATTR{idProduct}=="3211", GROUP="plugdev"
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2e6c", ATTRS{idProduct}=="3211", GROUP="plugdev"
-
-# Scubapro G2 HUD
-SUBSYSTEM=="usb", ATTR{idVendor}=="2e6c", ATTR{idProduct}=="4201", GROUP="plugdev"
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="2e6c", ATTRS{idProduct}=="4201", GROUP="plugdev"

 # Scubapro Aladin Square
 SUBSYSTEM=="usb", ATTR{idVendor}=="c251", ATTR{idProduct}=="2006", GROUP="plugdev"
-SUBSYSTEM=="hidraw", ATTRS{idVendor}=="c251", ATTRS{idProduct}=="2006", GROUP="plugdev"
--- a/doc/McLeanExtreme-wire-format.txt
+++ b/doc/McLeanExtreme-wire-format.txt
@ -1,102 +0,0 @@
-
-COMPUTER CONFIGURATION
----------------------
-
-The computer configuration (including gradient factors, gasses etc) is read and written as a single, fixed size block.
-
-Config section
--------------
-
-Computer configuration and individual dive configurations both start with identical generic configuration sections of length 0x002d bytes
-
-0x0000  uint8_t     format                          ZERO
-0x0001  uint8_t     gas[0]_pO2                      oxygen content [0, 100] (percent)
-0x0002  uint8_t     gas[0]_pHe                      helium content [0, 100] (percent)
-0x0003  uint8_t     gas[1]_pO2                      oxygen content [0, 100] (percent)
-0x0004  uint8_t     gas[1]_pHe                      helium content [0, 100] (percent)
-0x0005  uint8_t     gas[2]_pO2                      oxygen content [0, 100] (percent)
-0x0006  uint8_t     gas[2]_pHe                      helium content [0, 100] (percent)
-0x0007  uint8_t     gas[3]_pO2                      oxygen content [0, 100] (percent)
-0x0008  uint8_t     gas[3]_pHe                      helium content [0, 100] (percent)
-0x0009  uint8_t     gas[4]_pO2                      oxygen content [0, 100] (percent)
-0x000a  uint8_t     gas[4]_pHe                      helium content [0, 100] (percent)
-0x000b  uint8_t     gas[5]_pO2                      oxygen content [0, 100] (percent)
-0x000c  uint8_t     gas[5]_pHe                      helium content [0, 100] (percent)
-0x000d  uint8_t     gas[6]_pO2                      oxygen content [0, 100] (percent)
-0x000e  uint8_t     gas[6]_pHe                      helium content [0, 100] (percent)
-0x000f  uint8_t     gas[7]_pO2                      oxygen content [0, 100] (percent)
-0x0010  uint8_t     gas[7]_pHe                      helium content [0, 100] (percent)
-0x0011  uint8_t     gas_mask                        bitwise mask of enabled gasses
-0x0012  uint8_t     gas_active                      current gas index
-0x0013  uint8_t     setpoint[0]                     (centibar)
-0x0014  uint8_t     setpoint[1]                     (centibar)
-0x0015  uint8_t     setpoint[2]                     (centibar)
-0x0016  uint8_t     setpoint_mask                   bitwise mask of enabled setpoints
-0x0017  uint8_t     setpoint_active                 current setpoint index
-0x0018  bool        metric                          display units [true: metric, false: imperial]
-0x0019  uint16_t    name                            dive number
-0x001b  uint8_t     laststop_index                  last stop depth enumeration [0, 3] (metric: 3m, 4m, 5m, 6m imperial: 10ft, 13ft, 16ft, 18ft)
-0x001c  uint16_t    Vasc                            ascent speed limit (millibar/minute)
-0x001e  uint16_t    Psurf                           surface pressure (millibar)
-0x0020  uint8_t     gfs_index                       predefined gf enumeration [0, 5] (only used in rec mode)
-0x0021  uint8_t     gf lo                           custom gf low [0, 255] (ignored in rec mode)
-0x0022  uint8_t     gf hi                           custom gf high [0, 255] (ignored in rec mode)
-0x0023  uint8_t     density_index                   predefined water density enumeration [0: 1.000, 1: 1.020, 2: 1.030]
-0x0024  uint16_t    ppN2_limit                      nitrogen partial pressure alert (millibars)
-0x0026  uint16_t    ppO2_limit                      oxygen partial pressure alert (millibars)
-0x0028  uint16_t    ppO2_bottomlimit                oxygen partial pressure alert (millibars)
-0x002a  uint16_t    density_limit                   (units ??)
-0x002c  uint8_t     operatingmode                   operating mode enumeration [0: OC rec, 1: OC tec, 2: CC, 3: Gauge]
-
-Computer configuration
----------------------
-
-The computer configuration is read and written as a single block of 0x006a bytes formatted thusly:
-
-<config section as above>
-0x002d +
-0x0000  int64_t     epoch                           internal adjustment used to set computer time
-0x0008  uint16_t    inactive_timeout                number of seconds of inactivity before the computer turns itself off
-0x000a  uint16_t    dive_timeout                    number of seconds on surface before declaring dive finished
-0x000c  uint16_t    log_period                      number of seconds between dive samples
-0x000e  uint16_t    log_timeout                     not used
-0x0010  uint16_t    brightness_timeout              number of seconds of inactivity before the computer dims the screen
-0x0012  uint8_t     brightness                      dimmed screen brightness [0, 10]
-0x0013  uint8_t     colorscheme                     computer color scheme enumeration [0, 12]
-0x0014  uint8_t     language                        computer display language enumeration [0, 1]
-0x0015  uint8_t     batterytype                     user-defined battery type enumeration [0, 4]
-0x0016  uint16_t    batterytime                     computer up time since last battery change
-0x0018  <48 bytes>                                  compass calibration data (cannot be written)
-0x0048  uint8_t     button_sensitivity              piezo button sensitivity [0, 9]
-0x0049  uint8_t     orientation                     screen and button orientation
-0x004a  char[32]    diver_name                      diver name (guaranteed at least one nul terminator)
-0x006a
-
-Dive configuration
------------------
-
-Individual dives are read as a single block of 0x002d bytes formatted thusly:
-
-<config section as above>
-0x002d +
-0x0000  uint32_t    log_start                       log start (seconds since midnight 1 jan 2000)
-0x0004  uint32_t    dive_start                      dive start (seconds since midnight 1 jan 2000)
-0x0008  uint32_t    dive_end                        dive end (seconds since midnight 1 jan 2000)
-0x000c  uint32_t    log_end                         log end (seconds since midnight 1 jan 2000)
-0x0010  uint8_t     temp_min                        minimum ambient temperature (degrees centigrade)
-0x0011  uint8_t     temp_max                        maximum ambient temperature (degrees centigrade)
-0x0012  uint16_t    pO2_min                         minimum inspired oxygen partial pressure during the dive (millibars)
-0x0014  uint16_t    pO2_max                         maximum inspired oxygen partial pressure during the dive (millibars)
-0x0016  uint16_t    Pmax                            maximum ambient pressure during the dive (millibars)
-0x0018  uint16_t    Pav                             average ambient pressure during the dive (millibars)
-0x001a  uint32_t    ISS                             integral supersaturation of dive mbar*minutes
-0x001e  uint16_t    CNS_start                       CNS at start of dive (percent)
-0x0020  uint16_t    CNS_max                         maximum CNS encountered during the dive (percent)
-0x0022  uint16_t    OTU                             OTU dive
-0x0024  uint16_t    tndl                            shortest NDL calculated during dive (seconds)
-0x0026  uint32_t    tdeco                           longest decompression time calculated during dive (seconds)
-0x002a  uint8_t     ndeco                           deepest decompression stop index calculated during dive (seconds)
-0x002b  uint16_t    tdesat                          desaturation time calculated at end of dive (seconds)
-0x002d
-
-
--- a/doc/man/Makefile.am
+++ b/doc/man/Makefile.am
@ -14,10 +14,8 @@ MANPAGES = \
 	dc_datetime_mktime.3 \
 	dc_datetime_now.3 \
 	dc_descriptor_free.3 \
-	dc_descriptor_get_model.3 \
 	dc_descriptor_get_product.3 \
 	dc_descriptor_get_vendor.3 \
-	dc_descriptor_get_transports.3 \
 	dc_descriptor_iterator.3 \
 	dc_device_close.3 \
 	dc_device_foreach.3 \
@ -32,29 +30,8 @@ MANPAGES = \
 	dc_parser_get_field.3 \
 	dc_parser_new.3 \
 	dc_parser_samples_foreach.3 \
-	dc_bluetooth_open.3 \
-	dc_bluetooth_iterator_new.3 \
-	dc_bluetooth_device_get_address.3 \
-	dc_bluetooth_device_get_name.3 \
-	dc_bluetooth_addr2str.3 \
-	dc_bluetooth_str2addr.3 \
-	dc_bluetooth_device_free.3 \
-	dc_usbhid_open.3 \
-	dc_usbhid_device_get_pid.3 \
-	dc_usbhid_device_get_vid.3 \
-	dc_usbhid_iterator_new.3 \
-	dc_usbhid_device_free.3 \
-	dc_serial_open.3 \
-	dc_serial_device_get_name.3 \
-	dc_serial_iterator_new.3 \
-	dc_serial_device_free.3 \
-	dc_irda_open.3 \
-	dc_irda_device_get_name.3 \
-	dc_irda_device_get_address.3 \
-	dc_irda_iterator_new.3 \
-	dc_irda_device_free.3 \
-	dc_iostream_close.3 \
-	libdivecomputer.3  
+	dc_parser_set_data.3 \
+	libdivecomputer.3

 HTMLPAGES = $(MANPAGES:%=%.html)

--- a/doc/man/dc_bluetooth_addr2str.3
+++ b/doc/man/dc_bluetooth_addr2str.3
@ -1,61 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_BLUETOOTH_ADDR2STR 3
-.Os
-.Sh NAME
-.Nm dc_bluetooth_addr2str
-.Nd Convert a bluetooth address to a string.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/bluetooth.h
-.Ft "const char*"
-.Fo dc_bluetooth_addr2str
-.Fa "dc_bluetooth_address_t address"
-.Fa "char *str"
-.Fa "size_t size"
-.Fc
-.Sh DESCRIPTION
-Convert a bluetooth address to a string.
-.Pp
-The bluetooth address is formatted as XX:XX:XX:XX:XX:XX, where each XX is a
-hexadecimal number specifying an octet of the 48-bit address.
-The minimum size for the buffer is
-.Dv DC_BLUETOOTH_SIZE
-bytes.
-.Pp
-The reverse can be done with
-.Xr dc_bluetooth_str2addr 3 .
-.Sh RETURN VALUES
-Returns the bluetooth address represented as a string.
-.Sh SEE ALSO
-.Xr dc_bluetooth_str2addr 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_bluetooth_device_free.3
+++ b/doc/man/dc_bluetooth_device_free.3
@ -1,52 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_BLUETOOTH_DEVICE_FREE 3
-.Os
-.Sh NAME
-.Nm dc_bluetooth_device_free
-.Nd Destroy the bluetooth device and free all resources.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/bluetooth.h
-.Ft void
-.Fo dc_bluetooth_device_free
-.Fa "dc_bluetooth_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Destroy the bluetooth device and free all resources.
-The bluetooth
-.Fa device
-usually found by searching through
-.Xr dc_bluetooth_iterator_new 3 .
-.Sh SEE ALSO
-.Xr dc_bluetooth_iterator_new 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_bluetooth_device_get_address.3
+++ b/doc/man/dc_bluetooth_device_get_address.3
@ -1,69 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_BLUETOOTH_DEVICE_GET_ADDRESS 3
-.Os
-.Sh NAME
-.Nm dc_bluetooth_device_get_address
-.Nd Get the address of a bluetooth device.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/bluetooth.h
-.Ft "dc_bluetooth_address_t"
-.Fo dc_bluetooth_device_get_address
-.Fa "dc_bluetooth_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Get the bluetooth device address of given bluetooth
-.Fa device .
-Required when opening transport communication with
-.Xr dc_bluetooth_open 3 .
-Requires a valid
-.Fa device
-of type
-.Ft dc_bluetooth_device_t
-which can be retrieved using
-.Xr dc_bluetooth_iterator_new 3 .
-.Sh RETURN VALUES
-Returns the bluetooth address of
-.Fa device
-as
-.Ft dc_bluetooth_address_t
-which is a 64bit integer holding the bluetooth address.
-
-The address can be formatted as a string by using
-.Xr dc_bluetooth_addr2str 3 .
-.Sh SEE ALSO
-.Xr dc_bluetooth_open 3 ,
-.Xr dc_bluetooth_iterator_new 3 ,
-.Xr dc_bluetooth_device_get_name 3 ,
-.Xr dc_bluetooth_addr2str 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_bluetooth_device_get_name.3
+++ b/doc/man/dc_bluetooth_device_get_name.3
@ -1,61 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_BLUETOOTH_DEVICE_GET_NAME 3
-.Os
-.Sh NAME
-.Nm dc_bluetooth_device_get_name
-.Nd Get the name of a bluetooth device.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/bluetooth.h
-.Ft "const char *"
-.Fo dc_bluetooth_device_get_name
-.Fa "dc_bluetooth_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Get the name of given bluetooth
-.Fa device .
-Used for displaying.
-Requires a valid
-.Fa bluetooth_device
-of type
-.Ft dc_bluetooth_device_t
-which can be retrieved using
-.Xr dc_bluetooth_iterator_new 3 .
-.Sh RETURN VALUES
-Returns the bluetooth device of
-.Fa device .
-.Sh SEE ALSO
-.Xr dc_bluetooth_open 3 ,
-.Xr dc_bluetooth_iterator_new 3 ,
-.Xr dc_bluetooth_device_get_address 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_bluetooth_iterator_new.3
+++ b/doc/man/dc_bluetooth_iterator_new.3
@ -1,102 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_BLUETOOTH_ITERATOR_NEW 3
-.Os
-.Sh NAME
-.Nm dc_bluetooth_iterator_new
-.Nd Create an iterator to enumerate the bluetooth devices.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/bluetooth.h
-.Ft dc_status_t
-.Fo dc_bluetooth_iterator_new
-.Fa "dc_iterator_t **iterator"
-.Fa "dc_context_t *context"
-.Fa "dc_descriptor_t *descriptor"
-.Fc
-.Sh DESCRIPTION
-Iterates through the available bluetooth devices which matches the given
-.Fa descriptor .
-Accepts a
-.Fa context
-opened with
-.Xr dc_context_new 3
-and a
-.Fa descriptor
-usually found by searching through
-.Xr dc_descriptor_iterator 3 .
-.Pp
-On returning
-.Dv DC_STATUS_SUCCESS
-the
-.Fa iterator
-will be set to an
-.Ft dc_iterator_t
-which can be used to iterate the available bluetooth devices using
-.Xr dc_iterator_next 3 .
-.Pp
-The value type of the iterator is of type
-.Ft dc_bluetooth_device_t .
-This value can be used in functions to extract information about this specific bluetooth device, namely
-.Xr dc_bluetooth_device_get_name 3
-and
-.Xr dc_bluetooth_device_get_address 3 .
-When done the bluetooth device needs to be freed with
-.Xr dc_bluetooth_device_free 3 .
-.Pp
-After iterating the
-.Fa iterator
-needs to be freed using
-.Xr dc_iterator_free 3 .
-
-.Sh RETURN VALUES
-Returns
-.Dv DC_STATUS_SUCCESS
-on success, or another
-.Ft dc_status_t
-code on failure.
-
-On
-.Dv DC_STATUS_SUCCESS
-the returned
-.Fa iterator
-needs to be freed when done using
-.Xr dc_iterator_free 3 .
-.Sh SEE ALSO
-.Xr dc_context_new 3 ,
-.Xr dc_usbhid_iterator_new 3 ,
-.Xr dc_serial_iterator_new 3 ,
-.Xr dc_irda_iterator_new 3 ,
-.Xr dc_bluetooth_device_get_name 3 ,
-.Xr dc_bluetooth_device_get_address 3 ,
-.Xr dc_bluetooth_device_free 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_bluetooth_open.3
+++ b/doc/man/dc_bluetooth_open.3
@ -1,87 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_BLUETOOTH_OPEN 3
-.Os
-.Sh NAME
-.Nm dc_bluetooth_open
-.Nd Opens an iostream for a bluetooth device
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/bluetooth.h
-.Ft dc_status_t
-.Fo dc_bluetooth_open
-.Fa "dc_iostream_t **iostream"
-.Fa "dc_context_t *context"
-.Fa "dc_bluetooth_address_t address"
-.Fa "unsigned int port"
-.Fc
-.Sh DESCRIPTION
-Opens an iostream for a bluetooth device.
-Accepts a
-.Fa context
-opened with
-.Xr dc_context_new 3 ,
-a 48-bit bluetooth
-.Fa address
-given by
-.Xr dc_bluetooth_iterator_new 3
-together with
-.Xr dc_bluetooth_device_get_address 3
-or
-.Xr dc_bluetooth_str2addr 3
-and a bluetooth rfcomm
-.Fa port
-number (use 0 for autodetection).
-.Pp
-Upon returning
-.Dv DC_STATUS_SUCCESS ,
-the
-.Fa iostream
-pointer must be freed with
-.Xr dc_iostream_close 3 .
-.Sh RETURN VALUES
-Returns
-.Dv DC_STATUS_SUCCESS
-on success or one of several error values on error.
-On success, the
-.Fa iostream
-pointer is filled in with an open handle.
-.Sh SEE ALSO
-.Xr dc_context_new 3 ,
-.Xr dc_iostream_close 3 ,
-.Xr dc_serial_open 3 ,
-.Xr dc_irda_open 3 ,
-.Xr dc_usbhid_open 3 ,
-.Xr dc_bluetooth_iterator_new 3 ,
-.Xr dc_bluetooth_device_get_address 3 ,
-.Xr dc_bluetooth_str2addr 3 ,
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_bluetooth_str2addr.3
+++ b/doc/man/dc_bluetooth_str2addr.3
@ -1,58 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_BLUETOOTH_STR2ADDR 3
-.Os
-.Sh NAME
-.Nm dc_bluetooth_str2addr
-.Nd Convert a string to a bluetooth address.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/bluetooth.h
-.Ft "dc_bluetooth_address_t"
-.Fo dc_bluetooth_addr2str
-.Fa "const char *address"
-.Fc
-.Sh DESCRIPTION
-Convert a string to a bluetooth address.
-.Pp
-The string
-.Fa address
-is expected to be in the format XX:XX:XX:XX:XX:XX,
-where each XX is a hexadecimal number specifying an octet of the 48-bit address.
-.Pp
-The reverse can be done with
-.Xr dc_bluetooth_addr2str 3 .
-.Sh RETURN VALUES
-Returns the bluetooth address represented as a 48-bit number.
-.Sh SEE ALSO
-.Xr dc_bluetooth_addr2str 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_datetime_gmtime.3
+++ b/doc/man/dc_datetime_gmtime.3
@ -82,7 +82,7 @@ is
 .Sh SEE ALSO
 .Xr dc_datetime_localtime 3 ,
 .Xr dc_datetime_mktime 3 ,
-.Xr dc_datetime_now 3
+.Xr dc_datetime_new 3
 .Sh AUTHORS
 The
 .Lb libdivecomputer
--- a/doc/man/dc_datetime_localtime.3
+++ b/doc/man/dc_datetime_localtime.3
@ -82,7 +82,7 @@ is
 .Sh SEE ALSO
 .Xr dc_datetime_gmtime 3 ,
 .Xr dc_datetime_mktime 3 ,
-.Xr dc_datetime_now 3
+.Xr dc_datetime_new 3
 .Sh AUTHORS
 The
 .Lb libdivecomputer
--- a/doc/man/dc_datetime_mktime.3
+++ b/doc/man/dc_datetime_mktime.3
@ -47,7 +47,7 @@ may not sanely be converted.
 .Sh SEE ALSO
 .Xr dc_datetime_gmtime 3 ,
 .Xr dc_datetime_localtime 3 ,
-.Xr dc_datetime_now 3
+.Xr dc_datetime_new 3
 .Sh AUTHORS
 The
 .Lb libdivecomputer
--- a/doc/man/dc_descriptor_get_transports.3
+++ b/doc/man/dc_descriptor_get_transports.3
@ -1,72 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_DESCRIPTOR_GET_TRANSPORTS 3
-.Os
-.Sh NAME
-.Nm dc_descriptor_get_transports
-.Nd Gets the transports supported by the given descriptor.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/descriptor.h
-.Ft "unsigned int"
-.Fo dc_descriptor_get_transports
-.Fa "dc_descriptor_t *descriptor"
-.Fc
-.Sh DESCRIPTION
-Gets the transports supported by the given
-.Fa descriptor .
-The
-.Fa descriptor
-usually found by searching through
-.Xr dc_descriptor_iterator 3 .
-.Sh RETURN VALUES
-Returns a union (bitwise OR) of the transports supported by the given
-.Fa descriptor .
-.Pp
-The result is combination of
-.Dv DC_TRANSPORT_USB ,
-.Dv DC_TRANSPORT_USBHID ,
-.Dv DC_TRANSPORT_BLE ,
-.Dv DC_TRANSPORT_BLUETOOTH ,
-.Dv DC_TRANSPORT_SERIAL ,
-.Dv DC_TRANSPORT_IRDA
-.Pp
-To determine if a specific transport is supported use the following code
-.Bd -literal -offset indent
-unsigned int transports = dc_descriptor_get_transports(descriptor);
-if(transports & DC_TRANSPORT_USBHID) {
-    // Device supports USB HID as transport
-}
-.Ed
-.Sh SEE ALSO
-.Xr dc_descriptor_iterator 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_device_foreach.3
+++ b/doc/man/dc_device_foreach.3
@ -53,7 +53,7 @@ with
 Each dive invokes
 .Fa callback
 with the dive data, which should be parsed with
-.Xr dc_parser_new 3 ,
+.Xr dc_parser_set_data 3 ,
 and the binary fingerprint of the dive.
 The fingerprint can be used to record the newest dive and stop
 processing (on subsequent invocations) when the same dive fingerprint is
@ -72,7 +72,7 @@ If
 returns zero, this will not be reflected in the return value (usually
 .Dv DC_STATUS_SUCCESS ) .
 .Sh SEE ALSO
-.Xr dc_parser_new 3
+.Xr dc_parser_set_data 3
 .Sh AUTHORS
 The
 .Lb libdivecomputer
--- a/doc/man/dc_device_open.3
+++ b/doc/man/dc_device_open.3
@ -18,7 +18,7 @@
 .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .\"
-.Dd June 5, 2020
+.Dd January 5, 2017
 .Dt DC_DEVICE_OPEN 3
 .Os
 .Sh NAME
@ -33,7 +33,7 @@
 .Fa "dc_device_t **device"
 .Fa "dc_context_t *context"
 .Fa "dc_descriptor_t *descriptor"
-.Fa "dc_iostream_t *iostream"
+.Fa "const char *name"
 .Fc
 .Sh DESCRIPTION
 Open a dive computer device for processing.
@ -45,14 +45,19 @@ a dive computer
 .Fa descriptor
 usually found by searching through
 .Xr dc_descriptor_iterator 3 ,
-and a 
-.Fa iostream
-opened with a transport specific open function like
-.Xr dc_usbhid_open 3 ,
-.Xr dc_irda_open 3 ,
-.Xr dc_serial_open 3 ,
+and a platform-specific device
+.Fa name
+.Po
+such as
+.Pa /dev/ttyUSBx
+on Linux,
+.Pa /dev/tty.xxx
+on Mac OS X,
+.Pa /dev/ttyUx
+on the BSDs,
 or
-.Xr dc_bluetooth_open 3
+.Pa COMx
+on Microsoft Windows
 .Pc .
 .Pp
 Upon returning
@ -78,10 +83,6 @@ The
 library was written by
 .An Jef Driesen ,
 .Mt jef@libdivecomputer.org .
-.br
 The manpages were written by
 .An Kristaps Dzonsons ,
 .Mt kristaps@bsd.lv .
-and
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl
--- a/doc/man/dc_iostream_close.3
+++ b/doc/man/dc_iostream_close.3
@ -1,60 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_IOSTREAM_CLOSE 3
-.Os
-.Sh NAME
-.Nm dc_iostream_close
-.Nd Close the I/O stream and free all resources.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/iostream.h
-.Ft dc_status_t
-.Fo dc_iostream_close
-.Fa "dc_iostream_t *iostream"
-.Fc
-.Sh DESCRIPTION
-Close the I/O stream and free all resources.
-Accepts the
-.Fa iostream
-to close and free.
-.Sh RETURN VALUES
-Returns
-.Dv DC_STATUS_SUCCESS
-on success, or another
-.Ft dc_status_t
-code on failure.
-.Sh SEE ALSO
-.Xr dc_usbhid_open 3 ,
-.Xr dc_serial_open 3 ,
-.Xr dc_irda_open 3 ,
-.Xr dc_bluetooth_open 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_irda_device_free.3
+++ b/doc/man/dc_irda_device_free.3
@ -1,52 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_IRDA_DEVICE_FREE 3
-.Os
-.Sh NAME
-.Nm dc_irda_device_free
-.Nd Destroy the irda device and free all resources.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/irda.h
-.Ft void
-.Fo dc_irda_device_free
-.Fa "dc_irda_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Destroy the irda device and free all resources.
-The irda
-.Fa device
-usually found by searching through
-.Xr dc_irda_iterator_new 3 .
-.Sh SEE ALSO
-.Xr dc_irda_iterator_new 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_irda_device_get_address.3
+++ b/doc/man/dc_irda_device_get_address.3
@ -1,59 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_IRDA_DEVICE_GET_ADDRESS 3
-.Os
-.Sh NAME
-.Nm dc_irda_device_get_address
-.Nd Get the address of the IrDA device.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/irda.h
-.Ft "unsigned int"
-.Fo dc_irda_device_get_address
-.Fa "dc_irda_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Get the address of the IrDA device. Return value used for opening a IrDA device using
-.Xr dc_irda_open 3 .
-Requires a valid irda
-.Fa device
-of type
-.Ft dc_irda_device_t
-which can be retrieved using
-.Xr dc_irda_iterator_new 3 .
-.Sh RETURN VALUES
-Returns the IrDA address of given IrDA
-.Fa device
-.Sh SEE ALSO
-.Xr dc_irda_open 3 ,
-.Xr dc_irda_device_get_name 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_irda_device_get_name.3
+++ b/doc/man/dc_irda_device_get_name.3
@ -1,58 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_IRDA_DEVICE_GET_NAME 3
-.Os
-.Sh NAME
-.Nm dc_irda_device_get_name
-.Nd Get the address of the IrDA device.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/irda.h
-.Ft "const char *"
-.Fo dc_irda_device_get_name
-.Fa "dc_irda_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Get the name of the IrDA device. Used for displaying.
-Requires a valid irda
-.Fa device
-of type
-.Ft dc_irda_device_t
-which can be retrieved using
-.Xr dc_irda_iterator_new 3 .
-.Sh RETURN VALUES
-Returns the IrDA name of given
-.Fa irda_device
-.Sh SEE ALSO
-.Xr dc_irda_device_get_address 3 .
-.Xr dc_irda_iterator_new 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_irda_iterator_new.3
+++ b/doc/man/dc_irda_iterator_new.3
@ -1,102 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_IRDA_ITERATOR_NEW 3
-.Os
-.Sh NAME
-.Nm dc_irda_iterator_new
-.Nd Create an iterator to enumerate the IrDA devices.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/irda.h
-.Ft dc_status_t
-.Fo dc_irda_iterator_new
-.Fa "dc_iterator_t **iterator"
-.Fa "dc_context_t *context"
-.Fa "dc_descriptor_t *descriptor"
-.Fc
-.Sh DESCRIPTION
-Iterates through the available IrDA devices which matches the given
-.Fa descriptor .
-Accepts a
-.Fa context
-opened with
-.Xr dc_context_new 3
-and a
-.Fa descriptor
-usually found by searching through
-.Xr dc_descriptor_iterator 3 .
-.Pp
-On returning
-.Dv DC_STATUS_SUCCESS
-the
-.Fa iterator
-will be set to an
-.Ft dc_iterator_t
-which can be used to iterate the available IrDA devices using
-.Xr dc_iterator_next 3 .
-.Pp
-The value type of the iterator is of type
-.Ft dc_irda_device_t .
-This value can be used in functions to extract information about this specific IrDA device, namely
-.Xr dc_irda_device_get_name 3
-and
-.Xr dc_irda_device_get_address 3 .
-When done the IrDA device needs to be freed with
-.Xr dc_irda_device_free 3 .
-.Pp
-After iterating the
-.Fa iterator
-needs to be freed using
-.Xr dc_iterator_free 3 .
-
-.Sh RETURN VALUES
-Returns
-.Dv DC_STATUS_SUCCESS
-on success, or another
-.Ft dc_status_t
-code on failure.
-
-On
-.Dv DC_STATUS_SUCCESS
-the returned
-.Fa iterator
-needs to be freed when done using
-.Xr dc_iterator_free 3 .
-.Sh SEE ALSO
-.Xr dc_context_new 3 ,
-.Xr dc_usbhid_iterator_new 3 ,
-.Xr dc_serial_iterator_new 3 ,
-.Xr dc_bluetooth_iterator_new 3 ,
-.Xr dc_irda_device_get_name 3 ,
-.Xr dc_irda_device_get_address 3 ,
-.Xr dc_irda_device_free 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_irda_open.3
+++ b/doc/man/dc_irda_open.3
@ -1,85 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_IRDA_OPEN 3
-.Os
-.Sh NAME
-.Nm dc_irda_open
-.Nd Opens an iostream for a IrDA device
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/irda.h
-.Ft dc_status_t
-.Fo dc_irda_open
-.Fa "dc_iostream_t **iostream"
-.Fa "dc_context_t *context"
-.Fa "unsigned int address"
-.Fa "unsigned int lsap"
-.Fc
-.Sh DESCRIPTION
-Opens an iostream for a IrDA (Infra Red) device.
-Accepts a
-.Fa context
-opened with
-.Xr dc_context_new 3 ,
-.Fa address
-given through
-.Xr dc_irda_iterator_new 3
-together with
-.Xr dc_irda_device_get_address 3
-, the last argument 
-.Fa lsap
-is a port number used during the communication. Currently only Uwatec computers use IrDA comminication and for those the
-.Fa lsap
-can be hardcoded to 1
-.Pp
-Upon returning
-.Dv DC_STATUS_SUCCESS ,
-the
-.Fa iostream
-pointer must be freed with
-.Xr dc_iostream_close 3 .
-.Sh RETURN VALUES
-Returns
-.Dv DC_STATUS_SUCCESS
-on success or one of several error values on error.
-On success, the
-.Fa iostream
-pointer is filled in with an open handle.
-.Sh SEE ALSO
-.Xr dc_context_new 3 ,
-.Xr dc_iostream_close 3 ,
-.Xr dc_serial_open 3 ,
-.Xr dc_usbhid_open 3 ,
-.Xr dc_bluetooth_open 3 ,
-.Xr dc_irda_iterator_new 3 ,
-.Xr dc_irda_device_get_address 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_parser_get_datetime.3
+++ b/doc/man/dc_parser_get_datetime.3
@ -37,7 +37,7 @@
 Extract the date and time of a dive,
 .Fa parser ,
 previously initialised with
-.Xr dc_parser_new 3 .
+.Xr dc_parser_set_data 3 .
 This returns the broken-down time-stamp of the dive in the local time of
 the dive.
 .Pp
@ -57,7 +57,7 @@ messages on further failure.
 .Sh SEE ALSO
 .Xr dc_datetime_gmtime 3 ,
 .Xr dc_datetime_localtime 3 ,
-.Xr dc_parser_new 3
+.Xr dc_parser_set_data 3
 .Sh AUTHORS
 The
 .Lb libdivecomputer
--- a/doc/man/dc_parser_get_field.3
+++ b/doc/man/dc_parser_get_field.3
@ -39,7 +39,7 @@
 Extract a field from a dive,
 .Fa parser ,
 previously initialised with
-.Xr dc_parser_new 3 .
+.Xr dc_parser_set_data 3 .
 The
 .Fa value
 field type depends upon the
@ -149,7 +149,7 @@ the tank volume units as
 or
 .Dv DC_TANKVOLUME_METRIC ;
 .Va volume ,
-the tank volume in litres or zero if the tank is
+the tank volume in bar or zero if the tank is
 .Dv DC_TANKVOLUME_NONE ;
 .Va workpressure ,
 the work pressure in bar or zero if
@ -187,7 +187,7 @@ if the field was retrieved,
 if the field is not supported by the device, or other error messages on
 further failure.
 .Sh SEE ALSO
-.Xr dc_parser_new 3
+.Xr dc_parser_set_data 3
 .Sh AUTHORS
 The
 .Lb libdivecomputer
--- a/doc/man/dc_parser_new.3
+++ b/doc/man/dc_parser_new.3
@ -39,6 +39,8 @@
 .Fa "dc_parser_t **parser"
 .Fa "dc_context_t *context"
 .Fa "dc_descriptor_t *descriptor"
+.Fa "unsigned int devtime"
+.Fa "dc_ticks_t systime"
 .Fc
 .Sh DESCRIPTION
 Creates a parser for a single dive extracted from the dive computer with
@ -53,6 +55,10 @@ parameter; and
 .Nm dc_parser_new2 ,
 which is given device values (model, etc.) directly.
 .Pp
+After filling in the
+.Fa parser
+parameter, one usually sets parser data with
+.Xr dc_parser_set_data 3 .
 The pointer must later be freed with
 .Xr dc_parser_destroy 3 .
 .Sh RETURN VALUES
--- a/doc/man/dc_parser_samples_foreach.3
+++ b/doc/man/dc_parser_samples_foreach.3
@ -31,7 +31,7 @@
 .Ft "typedef void"
 .Fo "(*dc_sample_callback_t)"
 .Fa "dc_sample_type_t type"
-.Fa "const dc_sample_value_t *value"
+.Fa "dc_sample_value_t value"
 .Fa "void *userdata"
 .Fc
 .Ft dc_status_t
@ -42,7 +42,7 @@
 .Fc
 .Sh DESCRIPTION
 Extract the samples taken during a dive as previously initialised with
-.Xr dc_parser_new 3 .
+.Xr dc_parser_set_data 3 .
 Each sample is passed to
 .Fa callback
 with the
@ -63,7 +63,7 @@ closed.
 The following sample types may be raised:
 .Bl -tag -width Ds
 .It Dv DC_SAMPLE_TIME
-The time of the sample taken in milliseconds after the dive began.
+The time of the sample taken in seconds after the dive began.
 Set in the
 .Fa time
 field.
@ -126,7 +126,7 @@ Sets the
 .Fa rbt
 field.
 .It Dv DC_SAMPLE_HEARTBEAT
-The diver's heartbeat in beats per minute.
+The diver's heartbeet in beats per minute.
 Sets the
 .Fa heartbeat
 field.
@ -184,7 +184,7 @@ Returns
 .Dv DC_STATUS_OK
 on success and another code on failure.
 .Sh SEE ALSO
-.Xr dc_parser_new 3
+.Xr dc_parser_set_data 3
 .Sh AUTHORS
 The
 .Lb libdivecomputer
--- a/doc/man/dc_descriptor_get_model.3
+++ b/doc/man/dc_descriptor_get_model.3
@ -1,8 +1,7 @@
-
 .\"
 .\" libdivecomputer
 .\"
-.\" Copyright (C) 2018 Kristaps Dzonsons <kristaps@bsd.lv>
+.\" Copyright (C) 2017 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
 .\" This library is free software; you can redistribute it and/or
 .\" modify it under the terms of the GNU Lesser General Public
@ -19,28 +18,42 @@
 .\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
 .\" MA 02110-1301 USA
 .\"
-.Dd August 19, 2018
-.Dt DC_DESCRIPTOR_GET_MODEL 3
+.Dd January 5, 2017
+.Dt DC_PARSER_SET_DATA 3
 .Os
 .Sh NAME
-.Nm dc_descriptor_get_model
-.Nd get the model of a dive computer descriptor
+.Nm dc_parser_set_data
+.Nd assigns parse data to a dive parser
 .Sh LIBRARY
 .Lb libdivecomputer
 .Sh SYNOPSIS
-.In libdivecomputer/descriptor.h
-.Ft "unsigned int"
-.Fo dc_descriptor_get_model
-.Fa "dc_descriptor_t *descriptor"
+.In libdivecomputer/parser.h
+.Ft dc_status_t
+.Fo dc_parser_set_data
+.Fa "dc_parser_t *parser"
+.Fa "const unsigned char *data"
+.Fa "unsigned int size"
 .Fc
 .Sh DESCRIPTION
-Gets the model number of a dive computer descriptor or 0 if none was
-defined for the computer.
-0 is also a valid model number.
+Assigns the binary sequence
+.Fa data
+of length
+.Fa size
+bytes to
+.Fa parser ,
+which was created with
+.Xr dc_parser_new 3 .
+How the data is parsed depends upon the values provided to
+.Xr dc_parser_new 3 .
+The data usually comes from the callback assigned to
+.Xr dc_device_foreach 3 .
 .Sh RETURN VALUES
-This returns the model number or 0 if none exists.
+Returns
+.Dv DC_STATUS_OK
+on success and another code on failure.
 .Sh SEE ALSO
-.Xr dc_descriptor_iterator 3
+.Xr dc_device_foreach 3 ,
+.Xr dc_parser_new 3
 .Sh AUTHORS
 The
 .Lb libdivecomputer
--- a/doc/man/dc_serial_device_free.3
+++ b/doc/man/dc_serial_device_free.3
@ -1,52 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_SERIAL_DEVICE_FREE 3
-.Os
-.Sh NAME
-.Nm dc_serial_device_free
-.Nd Destroy the serial device and free all resources.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/serial.h
-.Ft void
-.Fo dc_serial_device_free
-.Fa "dc_serial_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Destroy the serial device and free all resources.
-The serial
-.Fa device
-usually found by searching through
-.Xr dc_serial_iterator_new 3 .
-.Sh SEE ALSO
-.Xr dc_serial_iterator_new 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_serial_device_get_name.3
+++ b/doc/man/dc_serial_device_get_name.3
@ -1,59 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_SERIAL_DEVICE_GET_NAME 3
-.Os
-.Sh NAME
-.Nm dc_serial_device_get_name
-.Nd Get the device name of the serial device.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/serial.h
-.Ft "const char *"
-.Fo dc_serial_device_get_name
-.Fa "dc_serial_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Get the device node of the serial device. Used when opening serial transport with
-.Xr dc_serial_open 3 .
-Requires a valid serial
-.Fa device
-of type
-.Ft dc_serial_device_t
-which can be retrieved using
-.Xr dc_serial_iterator_new 3 .
-.Sh RETURN VALUES
-Returns the device name of given serial
-.Fa device
-.Sh SEE ALSO
-.Xr dc_serial_open 3 ,
-.Xr dc_serial_iterator_new 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_serial_iterator_new.3
+++ b/doc/man/dc_serial_iterator_new.3
@ -1,99 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_SERIAL_ITERATOR_NEW 3
-.Os
-.Sh NAME
-.Nm dc_serial_iterator_new
-.Nd Create an iterator to enumerate the serial devices.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/serial.h
-.Ft dc_status_t
-.Fo dc_serial_iterator_new
-.Fa "dc_iterator_t **iterator"
-.Fa "dc_context_t *context"
-.Fa "dc_descriptor_t *descriptor"
-.Fc
-.Sh DESCRIPTION
-Iterates through the available serial devices matching the given
-.Fa descriptor .
-Accepts a
-.Fa context
-opened with
-.Xr dc_context_new 3
-and a
-.Fa descriptor
-usually found by searching through
-.Xr dc_descriptor_iterator 3 .
-.Pp
-On returning
-.Dv DC_STATUS_SUCCESS
-the
-.Fa iterator
-will be set to an 
-.Ft dc_iterator_t
-which can be used to iterate the available serial devices using
-.Xr dc_iterator_next 3 .
-.Pp
-The value type of the iterator is of type
-.Ft dc_serial_device_t .
-This value can be used in functions to extract information about this specific serial device, namely
-.Xr dc_serial_device_get_name 3
-When done the serial device needs to be freed with
-.Xr dc_serial_device_free 3 .
-.Pp
-After iterating the
-.Fa iterator
-needs to be freed using
-.Xr dc_iterator_free 3 .
-
-.Sh RETURN VALUES
-Returns
-.Dv DC_STATUS_SUCCESS 
-on success, or another
-.Ft dc_status_t
-code on failure.
-
-On 
-.Dv DC_STATUS_SUCCESS
-the returned
-.Fa iterator
-needs to be freed when done using
-.Xr dc_iterator_free 3 .
-.Sh SEE ALSO
-.Xr dc_context_new 3 ,
-.Xr dc_usbhid_iterator_new 3 ,
-.Xr dc_irda_iterator_new 3 ,
-.Xr dc_bluetooth_iterator_new 3 ,
-.Xr dc_serial_device_get_name 3 ,
-.Xr dc_serial_device_free 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_serial_open.3
+++ b/doc/man/dc_serial_open.3
@ -1,80 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_SERIAL_OPEN 3
-.Os
-.Sh NAME
-.Nm dc_serial_open
-.Nd Opens an iostream for a serial device
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/serial.h
-.Ft dc_status_t
-.Fo dc_serial_open
-.Fa "dc_iostream_t **iostream"
-.Fa "dc_context_t *context"
-.Fa "const char *name"
-.Fc
-.Sh DESCRIPTION
-Opens an iostream for a serial device.
-Accepts a
-.Fa context
-opened with
-.Xr dc_context_new 3
-and a
-.Fa name
-device name, usually found through
-.Xr dc_serial_iterator_new 3
-with
-.Xr dc_serial_device_get_name 3 .
-.Pp
-Upon returning
-.Dv DC_STATUS_SUCCESS ,
-the
-.Fa iostream
-pointer must be freed with
-.Xr dc_iostream_close 3 .
-.Sh RETURN VALUES
-Returns
-.Dv DC_STATUS_SUCCESS
-on success or one of several error values on error.
-On success, the
-.Fa iostream
-pointer is filled in with an open handle.
-.Sh SEE ALSO
-.Xr dc_context_new 3 ,
-.Xr dc_iostream_close 3 ,
-.Xr dc_usbhid_open 3 ,
-.Xr dc_irda_open 3 ,
-.Xr dc_bluetooth_open 3 ,
-.Xr dc_serial_iterator_new 3 ,
-.Xr dc_serial_device_get_name 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_usbhid_device_free.3
+++ b/doc/man/dc_usbhid_device_free.3
@ -1,52 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_USBHID_DEVICE_FREE 3
-.Os
-.Sh NAME
-.Nm dc_usbhid_device_free
-.Nd Destroy the USB HID device and free all resources.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/usbhid.h
-.Ft void
-.Fo dc_usbhid_device_free
-.Fa "dc_usbhid_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Destroy the USB HID device and free all resources.
-The usbhid
-.Fa device
-usually found by searching through
-.Xr dc_usbhid_iterator_new 3 .
-.Sh SEE ALSO
-.Xr dc_usbhid_iterator_new 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_usbhid_device_get_pid.3
+++ b/doc/man/dc_usbhid_device_get_pid.3
@ -1,58 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_USBHID_DEVICE_GET_PID 3
-.Os
-.Sh NAME
-.Nm dc_usbhid_device_get_pid
-.Nd Get the product id (PID) of the USB HID device.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/usbhid.h
-.Ft "unsigned int"
-.Fo dc_usbhid_device_get_pid
-.Fa "dc_usbhid_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Get the product id (PID) of the USB HID device. Used for displaying.
-Requires a valid usbhid
-.Fa device
-of type
-.Ft dc_usbhid_device_t
-which can be retrieved using
-.Xr dc_usbhid_iterator_new 3 .
-.Sh RETURN VALUES
-Returns the product id (PID) of given
-.Fa usbhid_device
-.Sh SEE ALSO
-.Xr dc_usbhid_device_get_vid 3 ,
-.Xr dc_usbhid_iterator_new 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_usbhid_device_get_vid.3
+++ b/doc/man/dc_usbhid_device_get_vid.3
@ -1,58 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_USBHID_DEVICE_GET_VID 3
-.Os
-.Sh NAME
-.Nm dc_usbhid_device_get_vid
-.Nd Get the vendor id (VID) of the USB HID device.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/usbhid.h
-.Ft "unsigned int"
-.Fo dc_usbhid_device_get_vid
-.Fa "dc_usbhid_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Get the vendor id (VID) of the USB HID device. Used for displaying.
-Requires a valid usbhid
-.Fa device
-of type
-.Ft dc_usbhid_device_t
-which can be retrieved using
-.Xr dc_usbhid_iterator_new 3 .
-.Sh RETURN VALUES
-Returns the vendor id (VID) of given usbhid
-.Fa device
-.Sh SEE ALSO
-.Xr dc_usbhid_device_get_vid 3 ,
-.Xr dc_usbhid_iterator_new 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_usbhid_iterator_new.3
+++ b/doc/man/dc_usbhid_iterator_new.3
@ -1,101 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_USBHID_ITERATOR_NEW 3
-.Os
-.Sh NAME
-.Nm dc_usbhid_iterator_new
-.Nd Create an iterator to enumerate the USB HID devices.
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/usbhid.h
-.Ft dc_status_t
-.Fo dc_usbhid_iterator_new
-.Fa "dc_iterator_t **iterator"
-.Fa "dc_context_t *context"
-.Fa "dc_descriptor_t *descriptor"
-.Fc
-.Sh DESCRIPTION
-Iterates through the available USB HID devices matching the given
-.Fa descriptor .
-Accepts a
-.Fa context
-opened with
-.Xr dc_context_new 3
-and a
-.Fa descriptor
-usually found by searching through
-.Xr dc_descriptor_iterator 3 .
-.Pp
-On returning
-.Dv DC_STATUS_SUCCESS
-the
-.Fa iterator
-will be set to an 
-.Ft dc_iterator_t
-which can be used to iterate the available USB HID devices using
-.Xr dc_iterator_next 3 .
-.Pp
-The value type of the iterator is of type
-.Ft dc_usbhid_device_t .
-This value can be used in functions to extract information about this specific USB HID device, namely
-.Xr dc_usbhid_device_get_pid 3
-and
-.Xr dc_usbhid_device_get_vid 3 .
-When done the USB HID device needs to be freed with
-.Xr dc_usbhid_device_free 3 .
-.Pp
-After iterating the
-.Fa iterator
-needs to be freed using
-.Xr dc_iterator_free 3 .
-
-.Sh RETURN VALUES
-Returns
-.Dv DC_STATUS_SUCCESS 
-on success, or another
-.Ft dc_status_t
-code on failure.
-
-On 
-.Dv DC_STATUS_SUCCESS
-the returned
-.Fa iterator
-needs to be freed when done using
-.Xr dc_iterator_free 3 .
-.Sh SEE ALSO
-.Xr dc_context_new 3 ,
-.Xr dc_bluetooth_iterator_new 3 ,
-.Xr dc_serial_iterator_new 3 ,
-.Xr dc_irda_iterator_new 3 ,
-.Xr dc_usbhid_device_get_pid 3 ,
-.Xr dc_usbhid_device_get_vid 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/dc_usbhid_open.3
+++ b/doc/man/dc_usbhid_open.3
@ -1,77 +0,0 @@
-.\"
-.\" libdivecomputer
-.\"
-.\" Copyright (C) 2020 Vincent Hagen <vinnie@script4web.nl>
-.\"
-.\" This library is free software; you can redistribute it and/or
-.\" modify it under the terms of the GNU Lesser General Public
-.\" License as published by the Free Software Foundation; either
-.\" version 2.1 of the License, or (at your option) any later version.
-.\"
-.\" This library is distributed in the hope that it will be useful,
-.\" but WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-.\" Lesser General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU Lesser General Public
-.\" License along with this library; if not, write to the Free Software
-.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-.\" MA 02110-1301 USA
-.\"
-.Dd June 5, 2020
-.Dt DC_USBHID_OPEN 3
-.Os
-.Sh NAME
-.Nm dc_usbhid_open
-.Nd Opens an iostream for a USB HID device
-.Sh LIBRARY
-.Lb libdivecomputer
-.Sh SYNOPSIS
-.In libdivecomputer/usbhid.h
-.Ft dc_status_t
-.Fo dc_usbhid_open
-.Fa "dc_iostream_t **iostream"
-.Fa "dc_context_t *context"
-.Fa "dc_usbhid_device_t *device"
-.Fc
-.Sh DESCRIPTION
-Opens an iostream for a USB HID device.
-Accepts a
-.Fa context
-opened with
-.Xr dc_context_new 3
-and a
-.Fa device
-usually found by searching through
-.Xr dc_usbhid_iterator_new 3 .
-.Pp
-Upon returning
-.Dv DC_STATUS_SUCCESS ,
-the
-.Fa iostream
-pointer must be freed with
-.Xr dc_iostream_close 3 .
-.Sh RETURN VALUES
-Returns
-.Dv DC_STATUS_SUCCESS
-on success or one of several error values on error.
-On success, the
-.Fa iostream
-pointer is filled in with an open handle.
-.Sh SEE ALSO
-.Xr dc_context_new 3 ,
-.Xr dc_usbhid_iterator_new 3 ,
-.Xr dc_iostream_close 3 ,
-.Xr dc_serial_open 3 ,
-.Xr dc_irda_open 3 ,
-.Xr dc_bluetooth_open 3 .
-.Sh AUTHORS
-The
-.Lb libdivecomputer
-library was written by
-.An Jef Driesen ,
-.Mt jef@libdivecomputer.org .
-.br
-This manpage is written by
-.An Vincent Hagen ,
-.Mt vinnie@script4web.nl .
--- a/doc/man/libdivecomputer.3
+++ b/doc/man/libdivecomputer.3
@ -41,8 +41,9 @@ these steps:
 .Bl -enum
 .It
 Create a new context with
-.Xr dc_context_new 3
-to initialize the library. Logging can be controlled with
+.Xr dc_context_new 3 .
+This supplies a parse context: logging, error handling, etc.
+Override the values with
 .Xr dc_context_set_logfunc 3
 and
 .Xr dc_context_set_loglevel 3 .
@ -51,28 +52,11 @@ Find a descriptor for their dive computer by iterating through
 .Xr dc_descriptor_iterator 3
 and searching by name, vendor, or product family.
 .It
-Find the transport to use for the communication. To determine the supported transports use
-.Xr dc_descriptor_get_transports 3 .
-.It
-Find the hardware device corresponding to the connected dive computer by iterating through
-.Xr dc_usbhid_iterator_new 3 ,
-.Xr dc_serial_iterator_new 3 ,
-.Xr dc_irda_iterator_new 3
-or
-.Xr dc_bluetooth_iterator_new 3 .
-.It
-Open the transport communcations with
-.Xr dc_usbhid_open 3 ,
-.Xr dc_serial_open 3 ,
-.Xr dc_irda_open 3 
-or
-.Xr dc_bluetooth_open 3 .
-.It
-Open a connection to the dive computer with
-.Xr dc_device_open 3 .
-Optionally use
+Open the hardware device to which the dive computer is connected with
+.Xr dc_device_open 3 ,
+then invoke
 .Xr dc_device_set_events 3 ,
-.Xr dc_device_set_fingerprint 3
+.Xr dc_device_set_fingerprint 3 ,
 and
 .Xr dc_device_set_cancel 3
 to set the logging events, last-seen fingerprint, and cancel routine,
@ -82,12 +66,13 @@ Iterate over all dives with
 .Xr dc_device_foreach 3 .
 .It
 For each iterated dive, create a new parser with
-.Xr dc_parser_new 3 .
+.Xr dc_parser_new 3
+and set the parsed data with
+.Xr dc_parser_set_data 3 .
 .It
 Get attributes of the parsed dive with
-.Xr dc_parser_get_field 3 .
-.It
-Iterate through the dive's samples (recorded data) with
+.Xr dc_parser_get_field 3 ,
+then iterate through the dive's samples (recorded data) with
 .Xr dc_parser_samples_foreach 3 .
 .El
 .Sh RETURN VALUES
@ -144,10 +129,7 @@ return
 .Dv DC_STATUS_SUCCESS .
 .El
 .Sh SEE ALSO
-.Xr dc_context_new 3 ,
-.Xr dc_descriptor_iterator 3
-.Xr dc_device_open 3
-.Xr dc_parser_new 3
+.Xr dc_buffer_new 3
 .Sh AUTHORS
 The
 .Lb libdivecomputer
--- a/examples/common.c
+++ b/examples/common.c
@ -31,7 +31,6 @@
 #include <libdivecomputer/serial.h>
 #include <libdivecomputer/bluetooth.h>
 #include <libdivecomputer/irda.h>
-#include <libdivecomputer/usb.h>
 #include <libdivecomputer/usbhid.h>

 #include "common.h"
@ -66,13 +65,14 @@ static const backend_table_t g_backends[] = {
 	{"aladin",      DC_FAMILY_UWATEC_ALADIN,       0x3F},
 	{"memomouse",   DC_FAMILY_UWATEC_MEMOMOUSE,    0},
 	{"smart",       DC_FAMILY_UWATEC_SMART,        0x10},
+	{"meridian",    DC_FAMILY_UWATEC_MERIDIAN,     0x20},
+	{"g2",          DC_FAMILY_UWATEC_G2,           0x11},
 	{"sensus",      DC_FAMILY_REEFNET_SENSUS,      1},
 	{"sensuspro",   DC_FAMILY_REEFNET_SENSUSPRO,   2},
 	{"sensusultra", DC_FAMILY_REEFNET_SENSUSULTRA, 3},
 	{"vtpro",       DC_FAMILY_OCEANIC_VTPRO,       0x4245},
 	{"veo250",      DC_FAMILY_OCEANIC_VEO250,      0x424C},
 	{"atom2",       DC_FAMILY_OCEANIC_ATOM2,       0x4342},
-	{"i330r",       DC_FAMILY_PELAGIC_I330R,       0x4744},
 	{"nemo",        DC_FAMILY_MARES_NEMO,          0},
 	{"puck",        DC_FAMILY_MARES_PUCK,          7},
 	{"darwin",      DC_FAMILY_MARES_DARWIN,        0},
@ -82,7 +82,6 @@ static const backend_table_t g_backends[] = {
 	{"ostc3",       DC_FAMILY_HW_OSTC3,            0x0A},
 	{"edy",         DC_FAMILY_CRESSI_EDY,          0x08},
 	{"leonardo",	DC_FAMILY_CRESSI_LEONARDO,     1},
-	{"goa",         DC_FAMILY_CRESSI_GOA,          2},
 	{"n2ition3",    DC_FAMILY_ZEAGLE_N2ITION3,     0},
 	{"cobalt",      DC_FAMILY_ATOMICS_COBALT,      0},
 	{"predator",	DC_FAMILY_SHEARWATER_PREDATOR, 2},
@ -91,18 +90,6 @@ static const backend_table_t g_backends[] = {
 	{"aqualand",    DC_FAMILY_CITIZEN_AQUALAND,    0},
 	{"idive",       DC_FAMILY_DIVESYSTEM_IDIVE,    0x03},
 	{"cochran",     DC_FAMILY_COCHRAN_COMMANDER,   0},
-	{"divecomputereu", DC_FAMILY_TECDIVING_DIVECOMPUTEREU, 0},
-	{"extreme",     DC_FAMILY_MCLEAN_EXTREME,      0},
-	{"lynx",        DC_FAMILY_LIQUIVISION_LYNX,    0},
-	{"sp2",         DC_FAMILY_SPORASUB_SP2,        0},
-	{"excursion",   DC_FAMILY_DEEPSIX_EXCURSION,   0},
-	{"screen",      DC_FAMILY_SEAC_SCREEN,         0},
-	{"cosmiq",      DC_FAMILY_DEEPBLU_COSMIQ,      0},
-	{"s1",          DC_FAMILY_OCEANS_S1,           0},
-	{"freedom",     DC_FAMILY_DIVESOFT_FREEDOM,    19},
-
-	// Not merged upstream yet
-	{"descentmk1",  DC_FAMILY_GARMIN,              0},
 };

 static const transport_table_t g_transports[] = {
@ -112,9 +99,6 @@ static const transport_table_t g_transports[] = {
 	{"irda",      DC_TRANSPORT_IRDA},
 	{"bluetooth", DC_TRANSPORT_BLUETOOTH},
 	{"ble",       DC_TRANSPORT_BLE},
-
-	// Not merged upstream yet
-	{"usbstorage",DC_TRANSPORT_USBSTORAGE},
 };

 const char *
@ -412,41 +396,6 @@ dctool_file_read (const char *filename)
 	return buffer;
 }

-static dc_status_t
-dctool_usb_open (dc_iostream_t **out, dc_context_t *context, dc_descriptor_t *descriptor)
-{
-	dc_status_t status = DC_STATUS_SUCCESS;
-	dc_iostream_t *iostream = NULL;
-
-	// Discover the usb device.
-	dc_iterator_t *iterator = NULL;
-	dc_usb_device_t *device = NULL;
-	dc_usb_iterator_new (&iterator, context, descriptor);
-	while (dc_iterator_next (iterator, &device) == DC_STATUS_SUCCESS) {
-		break;
-	}
-	dc_iterator_free (iterator);
-
-	if (device == NULL) {
-		ERROR ("No dive computer found.");
-		status = DC_STATUS_NODEVICE;
-		goto cleanup;
-	}
-
-	// Open the usb device.
-	status = dc_usb_open (&iostream, context, device);
-	if (status != DC_STATUS_SUCCESS) {
-		ERROR ("Failed to open the usb device.");
-		goto cleanup;
-	}
-
-	*out = iostream;
-
-cleanup:
-	dc_usb_device_free (device);
-	return status;
-}
-
 static dc_status_t
 dctool_usbhid_open (dc_iostream_t **out, dc_context_t *context, dc_descriptor_t *descriptor)
 {
@ -581,7 +530,7 @@ dctool_iostream_open (dc_iostream_t **iostream, dc_context_t *context, dc_descri
 	case DC_TRANSPORT_SERIAL:
 		return dc_serial_open (iostream, context, devname);
 	case DC_TRANSPORT_USB:
-		return dctool_usb_open(iostream, context, descriptor);
+		return DC_STATUS_SUCCESS;
 	case DC_TRANSPORT_USBHID:
 		return dctool_usbhid_open(iostream, context, descriptor);
 	case DC_TRANSPORT_IRDA:
@ -590,9 +539,5 @@ dctool_iostream_open (dc_iostream_t **iostream, dc_context_t *context, dc_descri
 		return dctool_bluetooth_open (iostream, context, descriptor, devname);
 	default:
 		return DC_STATUS_UNSUPPORTED;
-
-	// Not merged upstream yet
-	case DC_TRANSPORT_USBSTORAGE:
-		return dc_usb_storage_open (iostream, context, devname);
 	}
 }
--- a/examples/dctool.c
+++ b/examples/dctool.c
@ -24,12 +24,10 @@
 #endif

 #include <stdlib.h>
+#include <unistd.h>
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
@ -50,7 +48,7 @@
 #define RESET 1
 #endif

-#if defined(__GLIBC__) || defined(__MINGW32__) || defined(BSD) || defined(__ANDROID__)
+#if defined(__GLIBC__) || defined(__MINGW32__) || defined(BSD)
 #define NOPERMUTATION "+"
 #else
 #define NOPERMUTATION ""
@ -242,8 +240,7 @@ main (int argc, char *argv[])
 	}

 	// Translate the help option into a command.
-	char helpcmd[] = "help";
-	char *argv_help[] = {helpcmd, NULL, NULL};
+	char *argv_help[] = {(char *) "help", NULL, NULL};
 	if (help || argv[0] == NULL) {
 		if (argv[0]) {
 			argv_help[1] = argv[0];
--- a/examples/dctool_download.c
+++ b/examples/dctool_download.c
@ -24,11 +24,9 @@
 #endif

 #include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
@ -80,12 +78,20 @@ dive_cb (const unsigned char *data, unsigned int size, const unsigned char *fing

 	// Create the parser.
 	message ("Creating the parser.\n");
-	rc = dc_parser_new (&parser, divedata->device, data, size);
+	rc = dc_parser_new (&parser, divedata->device);
 	if (rc != DC_STATUS_SUCCESS) {
 		ERROR ("Error creating the parser.");
 		goto cleanup;
 	}

+	// Register the data.
+	message ("Registering the data.\n");
+	rc = dc_parser_set_data (parser, data, size);
+	if (rc != DC_STATUS_SUCCESS) {
+		ERROR ("Error registering the data.");
+		goto cleanup;
+	}
+
 	// Parse the dive data.
 	message ("Parsing the dive data.\n");
 	rc = dctool_output_write (divedata->output, parser, data, size, fingerprint, fsize);
--- a/examples/dctool_dump.c
+++ b/examples/dctool_dump.c
@ -24,11 +24,9 @@
 #endif

 #include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
--- a/examples/dctool_fwupdate.c
+++ b/examples/dctool_fwupdate.c
@ -24,10 +24,8 @@
 #endif

 #include <stdlib.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#include <stdio.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
@ -37,7 +35,6 @@
 #include <libdivecomputer/device.h>
 #include <libdivecomputer/hw_ostc.h>
 #include <libdivecomputer/hw_ostc3.h>
-#include <libdivecomputer/divesystem_idive.h>

 #include "dctool.h"
 #include "common.h"
@ -94,10 +91,7 @@ fwupdate (dc_context_t *context, dc_descriptor_t *descriptor, dc_transport_t tra
 		rc = hw_ostc_device_fwupdate (device, hexfile);
 		break;
 	case DC_FAMILY_HW_OSTC3:
-		rc = hw_ostc3_device_fwupdate (device, hexfile, false);
-		break;
-	case DC_FAMILY_DIVESYSTEM_IDIVE:
-		rc = divesystem_idive_device_fwupdate (device, hexfile);
+		rc = hw_ostc3_device_fwupdate (device, hexfile);
 		break;
 	default:
 		rc = DC_STATUS_UNSUPPORTED;
--- a/examples/dctool_help.c
+++ b/examples/dctool_help.c
@ -24,10 +24,8 @@
 #endif

 #include <stdlib.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#include <stdio.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
--- a/examples/dctool_list.c
+++ b/examples/dctool_list.c
@ -24,10 +24,8 @@
 #endif

 #include <stdlib.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#include <stdio.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
--- a/examples/dctool_parse.c
+++ b/examples/dctool_parse.c
@ -24,11 +24,9 @@
 #endif

 #include <stdlib.h>
+#include <unistd.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
@ -54,17 +52,17 @@ parse (dc_buffer_t *buffer, dc_context_t *context, dc_descriptor_t *descriptor,

 	// Create the parser.
 	message ("Creating the parser.\n");
-	rc = dc_parser_new2 (&parser, context, descriptor, data, size);
+	rc = dc_parser_new2 (&parser, context, descriptor, devtime, systime);
 	if (rc != DC_STATUS_SUCCESS) {
 		ERROR ("Error creating the parser.");
 		goto cleanup;
 	}

-	// Set the clock.
-	message ("Setting the clock.\n");
-	rc = dc_parser_set_clock (parser, devtime, systime);
-	if (rc != DC_STATUS_SUCCESS && rc != DC_STATUS_UNSUPPORTED) {
-		ERROR ("Error setting the clock.");
+	// Register the data.
+	message ("Registering the data.\n");
+	rc = dc_parser_set_data (parser, data, size);
+	if (rc != DC_STATUS_SUCCESS) {
+		ERROR ("Error registering the data.");
 		goto cleanup;
 	}

@ -154,7 +152,7 @@ dctool_parse_run (int argc, char *argv[], dc_context_t *context, dc_descriptor_t
 		goto cleanup;
 	}

-	for (int i = 0; i < argc; ++i) {
+	for (unsigned int i = 0; i < argc; ++i) {
 		// Read the input file.
 		buffer = dctool_file_read (argv[i]);
 		if (buffer == NULL) {
--- a/examples/dctool_read.c
+++ b/examples/dctool_read.c
@ -24,10 +24,8 @@
 #endif

 #include <stdlib.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#include <stdio.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
--- a/examples/dctool_scan.c
+++ b/examples/dctool_scan.c
@ -24,10 +24,8 @@
 #endif

 #include <stdlib.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#include <stdio.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
@ -38,7 +36,6 @@
 #include <libdivecomputer/serial.h>
 #include <libdivecomputer/irda.h>
 #include <libdivecomputer/bluetooth.h>
-#include <libdivecomputer/usb.h>
 #include <libdivecomputer/usbhid.h>

 #include "dctool.h"
@ -62,9 +59,6 @@ scan (dc_context_t *context, dc_descriptor_t *descriptor, dc_transport_t transpo
 	case DC_TRANSPORT_BLUETOOTH:
 		status = dc_bluetooth_iterator_new (&iterator, context, descriptor);
 		break;
-	case DC_TRANSPORT_USB:
-		status = dc_usb_iterator_new (&iterator, context, descriptor);
-		break;
 	case DC_TRANSPORT_USBHID:
 		status = dc_usbhid_iterator_new (&iterator, context, descriptor);
 		break;
@ -96,10 +90,6 @@ scan (dc_context_t *context, dc_descriptor_t *descriptor, dc_transport_t transpo
 				dc_bluetooth_device_get_name (device));
 			dc_bluetooth_device_free (device);
 			break;
-		case DC_TRANSPORT_USB:
-			printf ("%04x:%04x\n", dc_usb_device_get_vid (device), dc_usb_device_get_pid (device));
-			dc_usb_device_free (device);
-			break;
 		case DC_TRANSPORT_USBHID:
 			printf ("%04x:%04x\n", dc_usbhid_device_get_vid (device), dc_usbhid_device_get_pid (device));
 			dc_usbhid_device_free (device);
@ -160,7 +150,7 @@ dctool_scan_run (int argc, char *argv[], dc_context_t *context, dc_descriptor_t

 	// Show help message.
 	if (help) {
-		dctool_command_showhelp (&dctool_scan);
+		dctool_command_showhelp (&dctool_list);
 		return EXIT_SUCCESS;
 	}

--- a/examples/dctool_timesync.c
+++ b/examples/dctool_timesync.c
@ -24,10 +24,8 @@
 #endif

 #include <stdlib.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#include <stdio.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
@ -125,9 +123,6 @@ dctool_timesync_run (int argc, char *argv[], dc_context_t *context, dc_descripto
 		case 'h':
 			help = 1;
 			break;
-		case 't':
-			transport = dctool_transport_type (optarg);
-			break;
 		default:
 			return EXIT_FAILURE;
 		}
--- a/examples/dctool_version.c
+++ b/examples/dctool_version.c
@ -24,10 +24,8 @@
 #endif

 #include <stdlib.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#include <stdio.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
--- a/examples/dctool_write.c
+++ b/examples/dctool_write.c
@ -24,10 +24,8 @@
 #endif

 #include <stdlib.h>
-#include <stdio.h>
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
+#include <stdio.h>
 #ifdef HAVE_GETOPT_H
 #include <getopt.h>
 #endif
--- a/examples/output_raw.c
+++ b/examples/output_raw.c
@ -80,7 +80,7 @@ mktemplate_datetime (char *buffer, size_t size, dc_parser_t *parser)
 	n = snprintf (buffer, size, "%04i%02i%02iT%02i%02i%02i",
 		datetime.year, datetime.month, datetime.day,
 		datetime.hour, datetime.minute, datetime.second);
-	if (n < 0 || (size_t) n >= size)
+	if (n < 0 || n >= size)
 		return -1;

 	return n;
@ -92,7 +92,7 @@ mktemplate_number (char *buffer, size_t size, unsigned int number)
 	int n = 0;

 	n = snprintf (buffer, size, "%04u", number);
-	if (n < 0 || (size_t) n >= size)
+	if (n < 0 || n >= size)
 		return -1;

 	return n;
--- a/examples/output_xml.c
+++ b/examples/output_xml.c
@ -90,7 +90,7 @@ convert_volume (double value, dctool_units_t units)
 }

 static void
-sample_cb (dc_sample_type_t type, const dc_sample_value_t *value, void *userdata)
+sample_cb (dc_sample_type_t type, dc_sample_value_t value, void *userdata)
 {
 	static const char *events[] = {
 		"none", "deco", "rbt", "ascent", "ceiling", "workload", "transmitter",
@ -104,80 +104,64 @@ sample_cb (dc_sample_type_t type, const dc_sample_value_t *value, void *userdata

 	sample_data_t *sampledata = (sample_data_t *) userdata;

-	unsigned int seconds = 0, milliseconds = 0;
-
 	switch (type) {
 	case DC_SAMPLE_TIME:
-		seconds = value->time / 1000;
-		milliseconds = value->time % 1000;
 		if (sampledata->nsamples++)
 			fprintf (sampledata->ostream, "</sample>\n");
 		fprintf (sampledata->ostream, "<sample>\n");
-		if (milliseconds) {
-			fprintf (sampledata->ostream, "   <time>%02u:%02u.%03u</time>\n", seconds / 60, seconds % 60, milliseconds);
-		} else {
-			fprintf (sampledata->ostream, "   <time>%02u:%02u</time>\n", seconds / 60, seconds % 60);
-		}
+		fprintf (sampledata->ostream, "   <time>%02u:%02u</time>\n", value.time / 60, value.time % 60);
 		break;
 	case DC_SAMPLE_DEPTH:
 		fprintf (sampledata->ostream, "   <depth>%.2f</depth>\n",
-			convert_depth(value->depth, sampledata->units));
+			convert_depth(value.depth, sampledata->units));
 		break;
 	case DC_SAMPLE_PRESSURE:
 		fprintf (sampledata->ostream, "   <pressure tank=\"%u\">%.2f</pressure>\n",
-			value->pressure.tank,
-			convert_pressure(value->pressure.value, sampledata->units));
+			value.pressure.tank,
+			convert_pressure(value.pressure.value, sampledata->units));
 		break;
 	case DC_SAMPLE_TEMPERATURE:
 		fprintf (sampledata->ostream, "   <temperature>%.2f</temperature>\n",
-			convert_temperature(value->temperature, sampledata->units));
+			convert_temperature(value.temperature, sampledata->units));
 		break;
 	case DC_SAMPLE_EVENT:
-		if (value->event.type != SAMPLE_EVENT_GASCHANGE && value->event.type != SAMPLE_EVENT_GASCHANGE2) {
+		if (value.event.type != SAMPLE_EVENT_GASCHANGE && value.event.type != SAMPLE_EVENT_GASCHANGE2) {
 			fprintf (sampledata->ostream, "   <event type=\"%u\" time=\"%u\" flags=\"%u\" value=\"%u\">%s</event>\n",
-				value->event.type, value->event.time, value->event.flags, value->event.value, events[value->event.type]);
+				value.event.type, value.event.time, value.event.flags, value.event.value, events[value.event.type]);
 		}
 		break;
 	case DC_SAMPLE_RBT:
-		fprintf (sampledata->ostream, "   <rbt>%u</rbt>\n", value->rbt);
+		fprintf (sampledata->ostream, "   <rbt>%u</rbt>\n", value.rbt);
 		break;
 	case DC_SAMPLE_HEARTBEAT:
-		fprintf (sampledata->ostream, "   <heartbeat>%u</heartbeat>\n", value->heartbeat);
+		fprintf (sampledata->ostream, "   <heartbeat>%u</heartbeat>\n", value.heartbeat);
 		break;
 	case DC_SAMPLE_BEARING:
-		fprintf (sampledata->ostream, "   <bearing>%u</bearing>\n", value->bearing);
+		fprintf (sampledata->ostream, "   <bearing>%u</bearing>\n", value.bearing);
 		break;
 	case DC_SAMPLE_VENDOR:
-		fprintf (sampledata->ostream, "   <vendor type=\"%u\" size=\"%u\">", value->vendor.type, value->vendor.size);
-		for (unsigned int i = 0; i < value->vendor.size; ++i)
-			fprintf (sampledata->ostream, "%02X", ((const unsigned char *) value->vendor.data)[i]);
+		fprintf (sampledata->ostream, "   <vendor type=\"%u\" size=\"%u\">", value.vendor.type, value.vendor.size);
+		for (unsigned int i = 0; i < value.vendor.size; ++i)
+			fprintf (sampledata->ostream, "%02X", ((const unsigned char *) value.vendor.data)[i]);
 		fprintf (sampledata->ostream, "</vendor>\n");
 		break;
 	case DC_SAMPLE_SETPOINT:
-		fprintf (sampledata->ostream, "   <setpoint>%.2f</setpoint>\n", value->setpoint);
+		fprintf (sampledata->ostream, "   <setpoint>%.2f</setpoint>\n", value.setpoint);
 		break;
 	case DC_SAMPLE_PPO2:
-		if (value->ppo2.sensor != DC_SENSOR_NONE) {
-			fprintf (sampledata->ostream, "   <ppo2 sensor=\"%u\">%.2f</ppo2>\n", value->ppo2.sensor, value->ppo2.value);
-		} else {
-			fprintf (sampledata->ostream, "   <ppo2>%.2f</ppo2>\n", value->ppo2.value);
-		}
+		fprintf (sampledata->ostream, "   <ppo2>%.2f</ppo2>\n", value.ppo2);
 		break;
 	case DC_SAMPLE_CNS:
-		fprintf (sampledata->ostream, "   <cns>%.1f</cns>\n", value->cns * 100.0);
+		fprintf (sampledata->ostream, "   <cns>%.1f</cns>\n", value.cns * 100.0);
 		break;
 	case DC_SAMPLE_DECO:
 		fprintf (sampledata->ostream, "   <deco time=\"%u\" depth=\"%.2f\">%s</deco>\n",
-			value->deco.time,
-			convert_depth(value->deco.depth, sampledata->units),
-			decostop[value->deco.type]);
-		if (value->deco.tts) {
-			fprintf (sampledata->ostream, "   <tts>%u</tts>\n",
-				value->deco.tts);
-		}
+			value.deco.time,
+			convert_depth(value.deco.depth, sampledata->units),
+			decostop[value.deco.type]);
 		break;
 	case DC_SAMPLE_GASMIX:
-		fprintf (sampledata->ostream, "   <gasmix>%u</gasmix>\n", value->gasmix);
+		fprintf (sampledata->ostream, "   <gasmix>%u</gasmix>\n", value.gasmix);
 		break;
 	default:
 		break;
@ -254,7 +238,7 @@ dctool_xml_output_write (dctool_output_t *abstract, dc_parser_t *parser, const u
 		fprintf (output->ostream, "<datetime>%04i-%02i-%02i %02i:%02i:%02i %+03i:%02i</datetime>\n",
 			dt.year, dt.month, dt.day,
 			dt.hour, dt.minute, dt.second,
-			dt.timezone / 3600, (abs(dt.timezone) % 3600) / 60);
+			dt.timezone / 3600, (dt.timezone % 3600) / 60);
 	}

 	// Parse the divetime.
@ -281,20 +265,6 @@ dctool_xml_output_write (dctool_output_t *abstract, dc_parser_t *parser, const u
 	fprintf (output->ostream, "<maxdepth>%.2f</maxdepth>\n",
 		convert_depth(maxdepth, output->units));

-	// Parse the avgdepth.
-	message ("Parsing the avgdepth.\n");
-	double avgdepth = 0.0;
-	status = dc_parser_get_field (parser, DC_FIELD_AVGDEPTH, 0, &avgdepth);
-	if (status != DC_STATUS_SUCCESS && status != DC_STATUS_UNSUPPORTED) {
-		ERROR ("Error parsing the avgdepth.");
-		goto cleanup;
-	}
-
-	if (status != DC_STATUS_UNSUPPORTED) {
-		fprintf (output->ostream, "<avgdepth>%.2f</avgdepth>\n",
-			convert_depth(avgdepth, output->units));
-	}
-
 	// Parse the temperature.
 	message ("Parsing the temperature.\n");
 	for (unsigned int i = 0; i < 3; ++i) {
@ -338,19 +308,11 @@ dctool_xml_output_write (dctool_output_t *abstract, dc_parser_t *parser, const u
 			"<gasmix>\n"
 			"   <he>%.1f</he>\n"
 			"   <o2>%.1f</o2>\n"
-			"   <n2>%.1f</n2>\n",
+			"   <n2>%.1f</n2>\n"
+			"</gasmix>\n",
 			gasmix.helium * 100.0,
 			gasmix.oxygen * 100.0,
 			gasmix.nitrogen * 100.0);
-		if (gasmix.usage) {
-			const char *usage[] = {"none", "oxygen", "diluent", "sidemount"};
-			fprintf (output->ostream,
-				"   <usage>%s</usage>\n",
-				usage[gasmix.usage]);
-		}
-		fprintf (output->ostream,
-			"</gasmix>\n");
-
 	}

 	// Parse the tanks.
@ -378,12 +340,6 @@ dctool_xml_output_write (dctool_output_t *abstract, dc_parser_t *parser, const u
 				"   <gasmix>%u</gasmix>\n",
 				tank.gasmix);
 		}
-		if (tank.usage) {
-			const char *usage[] = {"none", "oxygen", "diluent", "sidemount"};
-			fprintf (output->ostream,
-				"   <usage>%s</usage>\n",
-				usage[tank.usage]);
-		}
 		if (tank.type != DC_TANKVOLUME_NONE) {
 			fprintf (output->ostream,
 				"   <type>%s</type>\n"
@ -416,30 +372,6 @@ dctool_xml_output_write (dctool_output_t *abstract, dc_parser_t *parser, const u
 			names[divemode]);
 	}

-	// Parse the deco model.
-	message ("Parsing the deco model.\n");
-	dc_decomodel_t decomodel = {DC_DECOMODEL_NONE};
-	status = dc_parser_get_field (parser, DC_FIELD_DECOMODEL, 0, &decomodel);
-	if (status != DC_STATUS_SUCCESS && status != DC_STATUS_UNSUPPORTED) {
-		ERROR ("Error parsing the deco model.");
-		goto cleanup;
-	}
-
-	if (status != DC_STATUS_UNSUPPORTED) {
-		const char *names[] = {"none", "buhlmann", "vpm", "rgbm", "dciem"};
-		fprintf (output->ostream, "<decomodel>%s</decomodel>\n",
-			names[decomodel.type]);
-		if (decomodel.type == DC_DECOMODEL_BUHLMANN &&
-			(decomodel.params.gf.low != 0 || decomodel.params.gf.high != 0)) {
-			fprintf (output->ostream, "<gf>%u/%u</gf>\n",
-				decomodel.params.gf.low, decomodel.params.gf.high);
-		}
-		if (decomodel.conservatism) {
-			fprintf (output->ostream, "<conservatism>%d</conservatism>\n",
-				decomodel.conservatism);
-		}
-	}
-
 	// Parse the salinity.
 	message ("Parsing the salinity.\n");
 	dc_salinity_t salinity = {DC_WATER_FRESH, 0.0};
@ -450,14 +382,8 @@ dctool_xml_output_write (dctool_output_t *abstract, dc_parser_t *parser, const u
 	}

 	if (status != DC_STATUS_UNSUPPORTED) {
-		const char *names[] = {"fresh", "salt"};
-		if (salinity.density) {
-			fprintf (output->ostream, "<salinity density=\"%.1f\">%s</salinity>\n",
-				salinity.density, names[salinity.type]);
-		} else {
-			fprintf (output->ostream, "<salinity>%s</salinity>\n",
-				names[salinity.type]);
-		}
+		fprintf (output->ostream, "<salinity type=\"%u\">%.1f</salinity>\n",
+			salinity.type, salinity.density);
 	}

 	// Parse the atmospheric pressure.
--- a/examples/utils.h
+++ b/examples/utils.h
@ -26,12 +26,6 @@
 extern "C" {
 #endif /* __cplusplus */

-#ifdef _MSC_VER
-#define snprintf _snprintf
-#define strcasecmp _stricmp
-#define strncasecmp _strnicmp
-#endif
-
 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)
 #define FUNCTION __func__
 #else
--- a/include/libdivecomputer/Makefile.am
+++ b/include/libdivecomputer/Makefile.am
@ -7,12 +7,9 @@ libdivecomputer_HEADERS = 	\
 	descriptor.h \
 	iterator.h \
 	iostream.h \
-	ioctl.h \
 	serial.h \
 	bluetooth.h \
-	ble.h \
 	irda.h \
-	usb.h \
 	usbhid.h \
 	custom.h \
 	device.h \
@ -31,5 +28,4 @@ libdivecomputer_HEADERS = 	\
 	hw_ostc.h \
 	hw_frog.h \
 	hw_ostc3.h \
-	atomics_cobalt.h \
-	divesystem_idive.h
+	atomics_cobalt.h
--- a/include/libdivecomputer/atomics_cobalt.h
+++ b/include/libdivecomputer/atomics_cobalt.h
@ -36,6 +36,9 @@ atomics_cobalt_device_version (dc_device_t *device, unsigned char data[], unsign
 dc_status_t
 atomics_cobalt_device_set_simulation (dc_device_t *device, unsigned int simulation);

+dc_status_t
+atomics_cobalt_parser_set_calibration (dc_parser_t *parser, double atmospheric, double hydrostatic);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/libdivecomputer/ble.h
+++ b/include/libdivecomputer/ble.h
@ -1,54 +0,0 @@
-/*
- * libdivecomputer
- *
- * Copyright (C) 2019 Jef Driesen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- */
-
-#ifndef DC_BLE_H
-#define DC_BLE_H
-
-#include "ioctl.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * Get the remote device name.
- */
-#define DC_IOCTL_BLE_GET_NAME   DC_IOCTL_IOR('b', 0, DC_IOCTL_SIZE_VARIABLE)
-
-/**
- * Get the bluetooth authentication PIN code.
- *
- * The data format is a NULL terminated string.
- */
-#define DC_IOCTL_BLE_GET_PINCODE   DC_IOCTL_IOR('b', 1, DC_IOCTL_SIZE_VARIABLE)
-
-/**
- * Get/set the bluetooth authentication access code.
- *
- * The data format is a variable sized byte array.
- */
-#define DC_IOCTL_BLE_GET_ACCESSCODE   DC_IOCTL_IOR('b', 2, DC_IOCTL_SIZE_VARIABLE)
-#define DC_IOCTL_BLE_SET_ACCESSCODE   DC_IOCTL_IOW('b', 2, DC_IOCTL_SIZE_VARIABLE)
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* DC_BLE_H */
--- a/include/libdivecomputer/buffer.h
+++ b/include/libdivecomputer/buffer.h
@ -51,9 +51,6 @@ dc_buffer_append (dc_buffer_t *buffer, const unsigned char data[], size_t size);
 int
 dc_buffer_prepend (dc_buffer_t *buffer, const unsigned char data[], size_t size);

-int
-dc_buffer_insert (dc_buffer_t *buffer, size_t offset, const unsigned char data[], size_t size);
-
 int
 dc_buffer_slice (dc_buffer_t *buffer, size_t offset, size_t size);

--- a/include/libdivecomputer/common.h
+++ b/include/libdivecomputer/common.h
@ -48,13 +48,9 @@ typedef enum dc_transport_t {
 	DC_TRANSPORT_USBHID    = (1 << 2),
 	DC_TRANSPORT_IRDA      = (1 << 3),
 	DC_TRANSPORT_BLUETOOTH = (1 << 4),
-	DC_TRANSPORT_BLE       = (1 << 5),
-	DC_TRANSPORT_USBSTORAGE= (1 << 6),
+	DC_TRANSPORT_BLE       = (1 << 5)
 } dc_transport_t;

-// Idiotic enums can't be queried
-#define DC_TRANSPORT_USBSTORAGE DC_TRANSPORT_USBSTORAGE
-
 typedef enum dc_family_t {
 	DC_FAMILY_NULL = 0,
 	/* Suunto */
@ -72,13 +68,12 @@ typedef enum dc_family_t {
 	DC_FAMILY_UWATEC_ALADIN = (3 << 16),
 	DC_FAMILY_UWATEC_MEMOMOUSE,
 	DC_FAMILY_UWATEC_SMART,
-	DC_FAMILY_UWATEC_MERIDIAN, /* Deprecated: integrated into the Uwatec Smart family. */
-	DC_FAMILY_UWATEC_G2, /* Deprecated: integrated into the Uwatec Smart family. */
+	DC_FAMILY_UWATEC_MERIDIAN,
+	DC_FAMILY_UWATEC_G2,
 	/* Oceanic */
 	DC_FAMILY_OCEANIC_VTPRO = (4 << 16),
 	DC_FAMILY_OCEANIC_VEO250,
 	DC_FAMILY_OCEANIC_ATOM2,
-	DC_FAMILY_PELAGIC_I330R,
 	/* Mares */
 	DC_FAMILY_MARES_NEMO = (5 << 16),
 	DC_FAMILY_MARES_PUCK,
@ -91,7 +86,6 @@ typedef enum dc_family_t {
 	/* Cressi */
 	DC_FAMILY_CRESSI_EDY = (7 << 16),
 	DC_FAMILY_CRESSI_LEONARDO,
-	DC_FAMILY_CRESSI_GOA,
 	/* Zeagle */
 	DC_FAMILY_ZEAGLE_N2ITION3 = (8 << 16),
 	/* Atomic Aquatics */
@ -107,28 +101,6 @@ typedef enum dc_family_t {
 	DC_FAMILY_DIVESYSTEM_IDIVE = (13 << 16),
 	/* Cochran */
 	DC_FAMILY_COCHRAN_COMMANDER = (14 << 16),
-	/* Tecdiving */
-	DC_FAMILY_TECDIVING_DIVECOMPUTEREU = (15 << 16),
-	/* McLean */
-	DC_FAMILY_MCLEAN_EXTREME = (16 << 16),
-	/* Liquivision */
-	DC_FAMILY_LIQUIVISION_LYNX = (17 << 16),
-	/* Sporasub */
-	DC_FAMILY_SPORASUB_SP2 = (18 << 16),
-	/* Deep Six */
-	DC_FAMILY_DEEPSIX_EXCURSION = (19 << 16),
-	/* Seac Screen */
-	DC_FAMILY_SEAC_SCREEN = (20 << 16),
-	/* Deepblu Cosmiq */
-	DC_FAMILY_DEEPBLU_COSMIQ = (21 << 16),
-	/* Oceans S1 */
-	DC_FAMILY_OCEANS_S1 = (22 << 16),
-	/* Divesoft Freedom */
-	DC_FAMILY_DIVESOFT_FREEDOM = (23 << 16),
-
-	// Not merged upstream yet
-	/* Garmin */
-	DC_FAMILY_GARMIN = (100 << 16),
 } dc_family_t;

 #ifdef __cplusplus
--- a/include/libdivecomputer/custom.h
+++ b/include/libdivecomputer/custom.h
@ -32,16 +32,15 @@ extern "C" {

 typedef struct dc_custom_cbs_t {
 	dc_status_t (*set_timeout) (void *userdata, int timeout);
+	dc_status_t (*set_latency) (void *userdata, unsigned int value);
 	dc_status_t (*set_break) (void *userdata, unsigned int value);
 	dc_status_t (*set_dtr) (void *userdata, unsigned int value);
 	dc_status_t (*set_rts) (void *userdata, unsigned int value);
 	dc_status_t (*get_lines) (void *userdata, unsigned int *value);
 	dc_status_t (*get_available) (void *userdata, size_t *value);
 	dc_status_t (*configure) (void *userdata, unsigned int baudrate, unsigned int databits, dc_parity_t parity, dc_stopbits_t stopbits, dc_flowcontrol_t flowcontrol);
-	dc_status_t (*poll) (void *userdata, int timeout);
 	dc_status_t (*read) (void *userdata, void *data, size_t size, size_t *actual);
 	dc_status_t (*write) (void *userdata, const void *data, size_t size, size_t *actual);
-	dc_status_t (*ioctl) (void *userdata, unsigned int request, void *data, size_t size);
 	dc_status_t (*flush) (void *userdata);
 	dc_status_t (*purge) (void *userdata, dc_direction_t direction);
 	dc_status_t (*sleep) (void *userdata, unsigned int milliseconds);
--- a/include/libdivecomputer/datetime.h
+++ b/include/libdivecomputer/datetime.h
@ -22,13 +22,11 @@
 #ifndef DC_DATETIME_H
 #define DC_DATETIME_H

-#include <limits.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

-#define DC_TIMEZONE_NONE INT_MIN
+#define DC_TIMEZONE_NONE 0x80000000

 #if defined (_WIN32) && !defined (__GNUC__)
 typedef __int64 dc_ticks_t;
--- a/include/libdivecomputer/descriptor.h
+++ b/include/libdivecomputer/descriptor.h
@ -29,96 +29,29 @@
 extern "C" {
 #endif /* __cplusplus */

-/**
- * Opaque object representing a supported dive computer.
- */
 typedef struct dc_descriptor_t dc_descriptor_t;

-/**
- * Create an iterator to enumerate the supported dive computers.
- *
- * @param[out] iterator  A location to store the iterator.
- * @returns #DC_STATUS_SUCCESS on success, or another #dc_status_t code
- * on failure.
- */
 dc_status_t
 dc_descriptor_iterator (dc_iterator_t **iterator);

-/**
- * Free the device descriptor.
- *
- * @param[in]  descriptor  A valid device descriptor.
- */
 void
 dc_descriptor_free (dc_descriptor_t *descriptor);

-/**
- * Get the vendor name of the dive computer.
- *
- * @param[in]  descriptor  A valid device descriptor.
- * @returns The vendor name of the dive computer on success, or NULL on failure.
- */
 const char *
 dc_descriptor_get_vendor (dc_descriptor_t *descriptor);

-/**
- * Get the product name of the dive computer.
- *
- * @param[in]  descriptor  A valid device descriptor.
- * @returns The product name of the dive computer on success, or NULL on
- * failure.
- */
 const char *
 dc_descriptor_get_product (dc_descriptor_t *descriptor);

-/**
- * Get the family type of the dive computer.
- *
- * @param[in]  descriptor  A valid device descriptor.
- * @returns The family type of the dive computer on success, or DC_FAMILY_NULL
- * on failure.
- */
 dc_family_t
 dc_descriptor_get_type (dc_descriptor_t *descriptor);

-/**
- * Get the model number of the dive computer.
- *
- * @param[in]  descriptor  A valid device descriptor.
- * @returns The model number of the dive computer on success, or zero on
- * failure.
- */
 unsigned int
 dc_descriptor_get_model (dc_descriptor_t *descriptor);

-/**
- * Get all transports supported by the dive computer.
- *
- * @param[in]  descriptor  A valid device descriptor.
- * @returns A bitmask with all the transports supported by the dive computer on
- * success, or DC_TRANSPORT_NONE on failure.
- */
 unsigned int
 dc_descriptor_get_transports (dc_descriptor_t *descriptor);

-/**
- * Check if a low-level I/O device matches a supported dive computer.
- *
- * @param[in]  descriptor  A valid device descriptor.
- * @param[in]  transport   The transport type of the I/O device.
- * @param[in]  userdata    A pointer to a transport specific data structure:
- *  - DC_TRANSPORT_SERIAL:    Name of the device node (string)
- *  - DC_TRANSPORT_USB:       USB VID/PID (#dc_usb_desc_t)
- *  - DC_TRANSPORT_USBHID:    USB VID/PID (#dc_usbhid_desc_t)
- *  - DC_TRANSPORT_IRDA:      IrDA device name (string)
- *  - DC_TRANSPORT_BLUETOOTH: Bluetooth device name (string)
- *  - DC_TRANSPORT_BLE:       Bluetooth device name (string)
- * @returns Non-zero if the device matches a supported dive computer, or zero if
- * there is no match.
- */
-int
-dc_descriptor_filter (dc_descriptor_t *descriptor, dc_transport_t transport, const void *userdata);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/libdivecomputer/hw_ostc3.h
+++ b/include/libdivecomputer/hw_ostc3.h
@ -22,8 +22,6 @@
 #ifndef DC_HW_OSTC3_H
 #define DC_HW_OSTC3_H

-#include <stdbool.h>
-
 #include "common.h"
 #include "device.h"
 #include "datetime.h"
@ -57,7 +55,7 @@ dc_status_t
 hw_ostc3_device_config_reset (dc_device_t *abstract);

 dc_status_t
-hw_ostc3_device_fwupdate (dc_device_t *abstract, const char *filename, bool forceUpdate);
+hw_ostc3_device_fwupdate (dc_device_t *abstract, const char *filename);

 #ifdef __cplusplus
 }
--- a/include/libdivecomputer/ioctl.h
+++ b/include/libdivecomputer/ioctl.h
@ -1,73 +0,0 @@
-/*
- * libdivecomputer
- *
- * Copyright (C) 2019 Jef Driesen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- */
-
-#ifndef DC_IOCTL_H
-#define DC_IOCTL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/*
- * Ioctl direction bits.
- *
- * Note: WRITE means the application is writing and the driver is
- * reading. READ means the application is reading and the driver is
- * writing.
- */
-#define DC_IOCTL_DIR_NONE  0u
-#define DC_IOCTL_DIR_READ  1u
-#define DC_IOCTL_DIR_WRITE 2u
-
-/*
- * Ioctl variable size bits.
- */
-#define DC_IOCTL_SIZE_VARIABLE 0
-
-/*
- * Helper macro to encode ioctl numbers.
- */
-#define DC_IOCTL_BASE(dir,type,nr,size) \
-	(((dir)  << 30) | \
-	 ((size) << 16) | \
-	 ((type) <<  8) | \
-	 ((nr)   <<  0))
-
-/*
- * Macros to encode ioctl numbers.
- */
-#define DC_IOCTL_IO(type,nr)        DC_IOCTL_BASE(DC_IOCTL_DIR_NONE, (type), (nr), 0)
-#define DC_IOCTL_IOR(type,nr,size)  DC_IOCTL_BASE(DC_IOCTL_DIR_READ, (type), (nr), (size))
-#define DC_IOCTL_IOW(type,nr,size)  DC_IOCTL_BASE(DC_IOCTL_DIR_WRITE, (type), (nr), (size))
-#define DC_IOCTL_IORW(type,nr,size) DC_IOCTL_BASE(DC_IOCTL_DIR_READ | DC_IOCTL_DIR_WRITE, (type), (nr), (size))
-
-/*
- * Macros to decode ioctl numbers.
- */
-#define DC_IOCTL_DIR(request)  (((request) >> 30) & 0x0003)
-#define DC_IOCTL_SIZE(request) (((request) >> 16) & 0x3FFF)
-#define DC_IOCTL_TYPE(request) (((request) >>  8) & 0x00FF)
-#define DC_IOCTL_NR(request)   (((request) >>  0) & 0x00FF)
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* DC_IOCTL_H */
--- a/include/libdivecomputer/iostream.h
+++ b/include/libdivecomputer/iostream.h
@ -22,7 +22,6 @@
 #ifndef DC_IOSTREAM_H
 #define DC_IOSTREAM_H

-#include <stddef.h>
 #include <libdivecomputer/common.h>
 #include <libdivecomputer/context.h>

@ -123,6 +122,22 @@ dc_iostream_get_transport (dc_iostream_t *iostream);
 dc_status_t
 dc_iostream_set_timeout (dc_iostream_t *iostream, int timeout);

+/**
+ * Set the receive latency.
+ *
+ * The effect of this setting is highly platform and driver specific. On
+ * Windows it does nothing at all, on Linux it controls the low latency
+ * flag (e.g. only zero vs non-zero latency), and on Mac OS X it sets
+ * the receive latency as requested.
+ *
+ * @param[in]  iostream  A valid I/O stream.
+ * @param[in]  value     The latency in milliseconds.
+ * @returns #DC_STATUS_SUCCESS on success, or another #dc_status_t code
+ * on failure.
+ */
+dc_status_t
+dc_iostream_set_latency (dc_iostream_t *iostream, unsigned int value);
+
 /**
 * Set the state of the break condition.
 *
@ -195,36 +210,6 @@ dc_iostream_get_available (dc_iostream_t *iostream, size_t *value);
 dc_status_t
 dc_iostream_configure (dc_iostream_t *iostream, unsigned int baudrate, unsigned int databits, dc_parity_t parity, dc_stopbits_t stopbits, dc_flowcontrol_t flowcontrol);

-/**
- * Poll the I/O stream for available data.
- *
- * There are three distinct modes available:
- *
- *  1. Blocking (timeout < 0):
- *
- *     The poll operation is blocked until one or more bytes have been
- *     received. If no bytes are received, the operation will block
- *     forever.
- *
- *  2. Non-blocking (timeout == 0):
- *
- *     The poll operation returns immediately, even if no bytes have
- *     been received.
- *
- *  3. Timeout (timeout > 0):
- *
- *     The poll operation is blocked until one or more bytes have been
- *     received. If no bytes are received within the specified amount of
- *     time, the operation will return with a timeout.
- *
- * @param[in]  iostream  A valid I/O stream.
- * @param[in]  timeout   The timeout in milliseconds.
- * @returns #DC_STATUS_SUCCESS on success, #DC_STATUS_TIMEOUT on
- * timeout, or another #dc_status_t code on failure.
- */
-dc_status_t
-dc_iostream_poll (dc_iostream_t *iostream, int timeout);
-
 /**
 * Read data from the I/O stream.
 *
@ -253,19 +238,6 @@ dc_iostream_read (dc_iostream_t *iostream, void *data, size_t size, size_t *actu
 dc_status_t
 dc_iostream_write (dc_iostream_t *iostream, const void *data, size_t size, size_t *actual);

-/**
- * Perform an I/O stream specific request.
- *
- * @param[in]  iostream  A valid I/O stream.
- * @param[in]  request   The request to perform.
- * @param[in,out]  data  The request specific data.
- * @param[in]  size      The size of the request specific data.
- * @returns #DC_STATUS_SUCCESS on success, or another #dc_status_t code
- * on failure.
- */
-dc_status_t
-dc_iostream_ioctl (dc_iostream_t *iostream, unsigned int request, void *data, size_t size);
-
 /**
 * Flush the internal output buffer and wait until the data has been
 * transmitted.
@ -310,9 +282,6 @@ dc_iostream_sleep (dc_iostream_t *iostream, unsigned int milliseconds);
 dc_status_t
 dc_iostream_close (dc_iostream_t *iostream);

-dc_status_t
-dc_usb_storage_open (dc_iostream_t **out, dc_context_t *context, const char *name);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/libdivecomputer/parser.h
+++ b/include/libdivecomputer/parser.h
@ -46,13 +46,9 @@ typedef enum dc_sample_type_t {
 	DC_SAMPLE_PPO2,
 	DC_SAMPLE_CNS,
 	DC_SAMPLE_DECO,
-	DC_SAMPLE_GASMIX,
-	DC_SAMPLE_TTS,		// time to surface in seconds
+	DC_SAMPLE_GASMIX
 } dc_sample_type_t;

-// Make it easy to test support compile-time with "#ifdef DC_SAMPLE_TTS"
-#define DC_SAMPLE_TTS DC_SAMPLE_TTS
-
 typedef enum dc_field_type_t {
 	DC_FIELD_DIVETIME,
 	DC_FIELD_MAXDEPTH,
@ -67,7 +63,6 @@ typedef enum dc_field_type_t {
 	DC_FIELD_TANK_COUNT,
 	DC_FIELD_TANK,
 	DC_FIELD_DIVEMODE,
-	DC_FIELD_DECOMODEL,
 	DC_FIELD_STRING,
 } dc_field_type_t;

@ -125,17 +120,6 @@ typedef enum parser_sample_flags_t {
 #define SAMPLE_FLAGS_SEVERITY_WARN    (3 << SAMPLE_FLAGS_SEVERITY_SHIFT)
 #define SAMPLE_FLAGS_SEVERITY_ALARM   (4 << SAMPLE_FLAGS_SEVERITY_SHIFT)

-/* these are used for the types of TAGs in Shearwater PNF info events */
-#define SAMPLE_FLAGS_TYPE_SHIFT 5
-#define SAMPLE_FLAGS_TYPE_MASK        (7 << SAMPLE_FLAGS_TYPE_SHIFT)
-#define SAMPLE_FLAGS_TYPE_NONE        (0 << SAMPLE_FLAGS_TYPE_SHIFT)
-#define SAMPLE_FLAGS_TYPE_INTEREST    (1 << SAMPLE_FLAGS_TYPE_SHIFT)
-#define SAMPLE_FLAGS_TYPE_NAVPOINT    (2 << SAMPLE_FLAGS_TYPE_SHIFT)
-#define SAMPLE_FLAGS_TYPE_DANGER      (3 << SAMPLE_FLAGS_TYPE_SHIFT)
-#define SAMPLE_FLAGS_TYPE_ANIMAL      (4 << SAMPLE_FLAGS_TYPE_SHIFT)
-#define SAMPLE_FLAGS_TYPE_ISSUE       (5 << SAMPLE_FLAGS_TYPE_SHIFT)
-#define SAMPLE_FLAGS_TYPE_INJURY      (6 << SAMPLE_FLAGS_TYPE_SHIFT)
-
 typedef enum parser_sample_vendor_t {
 	SAMPLE_VENDOR_NONE,
 	SAMPLE_VENDOR_UWATEC_ALADIN,
@ -173,26 +157,19 @@ typedef struct dc_salinity_t {
 	double density;
 } dc_salinity_t;

-typedef enum dc_usage_t {
-	DC_USAGE_NONE, // Usage not specified
-	DC_USAGE_OXYGEN,
-	DC_USAGE_DILUENT,
-	DC_USAGE_OPEN_CIRCUIT,
-} dc_usage_t;
-
 typedef struct dc_gasmix_t {
 	double helium;
 	double oxygen;
 	double nitrogen;
-	dc_usage_t usage;
 } dc_gasmix_t;

-#define DC_SENSOR_NONE    0xFFFFFFFF
 #define DC_GASMIX_UNKNOWN 0xFFFFFFFF

 typedef unsigned int dc_tankinfo_t;
 #define DC_TANKINFO_METRIC	1
 #define DC_TANKINFO_IMPERIAL	2
+#define DC_TANKINFO_CC_DILUENT	4
+#define DC_TANKINFO_CC_O2	8

 // For backwards compatibility
 #define DC_TANKVOLUME_NONE	0
@ -222,11 +199,6 @@ typedef unsigned int dc_tankinfo_t;
 * divide by 1 ATM (Vair = Vwater * Pwork / Patm).
 */

-typedef enum dc_tank_usage_t {
-	DC_TANK_USAGE_NONE,
-	DC_TANK_USAGE_SIDEMOUNT,
-} dc_tank_usage_t;
-
 typedef struct dc_tank_t {
    unsigned int gasmix;  /* Gas mix index, or DC_GASMIX_UNKNOWN */
    dc_tankinfo_t type;   /* Tank type - metric/imperial and oc/cc */
@ -234,53 +206,15 @@ typedef struct dc_tank_t {
    double workpressure;  /* Work pressure (bar) */
    double beginpressure; /* Begin pressure (bar) */
    double endpressure;   /* End pressure (bar) */
-    dc_tank_usage_t usage;
 } dc_tank_t;

-typedef enum dc_decomodel_type_t {
-	DC_DECOMODEL_NONE,
-	DC_DECOMODEL_BUHLMANN,
-	DC_DECOMODEL_VPM,
-	DC_DECOMODEL_RGBM,
-	DC_DECOMODEL_DCIEM,
-} dc_decomodel_type_t;
-
-/*
- * Decompression model
- *
- * The type field contains the decompression algorithm.
- *
- * The (optional) conservatism field contains the personal adjustment
- * setting of the algorithm. The exact interpretation depends on the
- * dive computer, but the default value (zero) will typically correspond
- * to the neutral setting, while a positive value is more conservative
- * and a negative value more aggressive.
- *
- * The (optional) params field contains the parameters of the algorithm:
- *
- * DC_DECOMODEL_BUHLMANN: The Gradient Factor (GF) parameters low and
- * high. For a pure Buhlmann algorithm (e.g. without GF enabled), both
- * values are 100. If GF are enabled, but the actual parameter values
- * are not available from the dive computer, both values are zero.
- */
-typedef struct dc_decomodel_t {
-	dc_decomodel_type_t type;
-	int conservatism;
-	union {
-		struct {
-			unsigned int high;
-			unsigned int low;
-		} gf;
-	} params;
-} dc_decomodel_t;
-
 typedef struct dc_field_string_t {
 	const char *desc;
 	const char *value;
 } dc_field_string_t;

 typedef union dc_sample_value_t {
-	unsigned int time; /* Milliseconds */
+	unsigned int time;
 	double depth;
 	struct {
 		unsigned int tank;
@ -303,41 +237,31 @@ typedef union dc_sample_value_t {
 		const void *data;
 	} vendor;
 	double setpoint;
-	struct {
-		unsigned int sensor;
-		double value;
-	} ppo2;
+	double ppo2;
 	double cns;
 	struct {
 		unsigned int type;
 		unsigned int time;
 		double depth;
-		unsigned int tts;
 	} deco;
 	unsigned int gasmix; /* Gas mix index */
 } dc_sample_value_t;

 typedef struct dc_parser_t dc_parser_t;

-typedef void (*dc_sample_callback_t) (dc_sample_type_t type, const dc_sample_value_t *value, void *userdata);
+typedef void (*dc_sample_callback_t) (dc_sample_type_t type, dc_sample_value_t value, void *userdata);

 dc_status_t
-dc_parser_new (dc_parser_t **parser, dc_device_t *device, const unsigned char data[], size_t size);
+dc_parser_new (dc_parser_t **parser, dc_device_t *device);

 dc_status_t
-dc_parser_new2 (dc_parser_t **parser, dc_context_t *context, dc_descriptor_t *descriptor, const unsigned char data[], size_t size);
+dc_parser_new2 (dc_parser_t **parser, dc_context_t *context, dc_descriptor_t *descriptor, unsigned int devtime, dc_ticks_t systime);

 dc_family_t
 dc_parser_get_type (dc_parser_t *parser);

 dc_status_t
-dc_parser_set_clock (dc_parser_t *parser, unsigned int devtime, dc_ticks_t systime);
-
-dc_status_t
-dc_parser_set_atmospheric (dc_parser_t *parser, double atmospheric);
-
-dc_status_t
-dc_parser_set_density (dc_parser_t *parser, double density);
+dc_parser_set_data (dc_parser_t *parser, const unsigned char *data, unsigned int size);

 dc_status_t
 dc_parser_get_datetime (dc_parser_t *parser, dc_datetime_t *datetime);
--- a/include/libdivecomputer/reefnet_sensus.h
+++ b/include/libdivecomputer/reefnet_sensus.h
@ -35,6 +35,9 @@ extern "C" {
 dc_status_t
 reefnet_sensus_device_get_handshake (dc_device_t *device, unsigned char data[], unsigned int size);

+dc_status_t
+reefnet_sensus_parser_set_calibration (dc_parser_t *parser, double atmospheric, double hydrostatic);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/libdivecomputer/reefnet_sensuspro.h
+++ b/include/libdivecomputer/reefnet_sensuspro.h
@ -38,6 +38,9 @@ reefnet_sensuspro_device_get_handshake (dc_device_t *device, unsigned char data[
 dc_status_t
 reefnet_sensuspro_device_write_interval (dc_device_t *device, unsigned char interval);

+dc_status_t
+reefnet_sensuspro_parser_set_calibration (dc_parser_t *parser, double atmospheric, double hydrostatic);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/libdivecomputer/reefnet_sensusultra.h
+++ b/include/libdivecomputer/reefnet_sensusultra.h
@ -56,6 +56,9 @@ reefnet_sensusultra_device_write_parameter (dc_device_t *device, reefnet_sensusu
 dc_status_t
 reefnet_sensusultra_device_sense (dc_device_t *device, unsigned char data[], unsigned int size);

+dc_status_t
+reefnet_sensusultra_parser_set_calibration (dc_parser_t *parser, double atmospheric, double hydrostatic);
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/libdivecomputer/serial.h
+++ b/include/libdivecomputer/serial.h
@ -27,7 +27,6 @@
 #include "iostream.h"
 #include "iterator.h"
 #include "descriptor.h"
-#include "ioctl.h"

 #ifdef __cplusplus
 extern "C" {
@ -78,16 +77,6 @@ dc_serial_iterator_new (dc_iterator_t **iterator, dc_context_t *context, dc_desc
 dc_status_t
 dc_serial_open (dc_iostream_t **iostream, dc_context_t *context, const char *name);

-/**
- * Set the receive latency in milliseconds.
- *
- * The effect of this setting is highly platform and driver specific. On
- * Windows it does nothing at all, on Linux it controls the low latency
- * flag (e.g. only zero vs non-zero latency), and on Mac OS X it sets
- * the receive latency as requested.
- */
-#define DC_IOCTL_SERIAL_SET_LATENCY DC_IOCTL_IOW('s', 0, sizeof(unsigned int))
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/include/libdivecomputer/usb.h
+++ b/include/libdivecomputer/usb.h
@ -1,153 +0,0 @@
-/*
- * libdivecomputer
- *
- * Copyright (C) 2020 Jef Driesen
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301 USA
- */
-
-#ifndef DC_USB_H
-#define DC_USB_H
-
-#include "common.h"
-#include "context.h"
-#include "iostream.h"
-#include "iterator.h"
-#include "descriptor.h"
-#include "ioctl.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/**
- * Perform a USB control transfer.
- *
- * The parameters for the control transfer are specified in the
- * #dc_usb_control_t data structure. If the control transfer requires
- * additional data as in- or output, the buffer must be located
- * immediately after the #dc_usb_control_t data structure, and the
- * length of the buffer must be indicated in the #wLength field. The
- * size of the ioctl request is the total size, including the size of
- * the #dc_usb_control_t structure.
- */
-#define DC_IOCTL_USB_CONTROL_READ  DC_IOCTL_IOR('u', 0, DC_IOCTL_SIZE_VARIABLE)
-#define DC_IOCTL_USB_CONTROL_WRITE DC_IOCTL_IOW('u', 0, DC_IOCTL_SIZE_VARIABLE)
-
-/**
- * USB control transfer.
- */
-typedef struct dc_usb_control_t {
-	unsigned char  bmRequestType;
-	unsigned char  bRequest;
-	unsigned short wValue;
-	unsigned short wIndex;
-	unsigned short wLength;
-} dc_usb_control_t;
-
-/**
- * Endpoint direction bits of the USB control transfer.
- */
-typedef enum dc_usb_endpoint_t {
-	DC_USB_ENDPOINT_OUT = 0x00,
-	DC_USB_ENDPOINT_IN = 0x80
-} dc_usb_endpoint_t;
-
-/**
- * Request type bits of the USB control transfer.
- */
-typedef enum dc_usb_request_t {
-	DC_USB_REQUEST_STANDARD = 0x00,
-	DC_USB_REQUEST_CLASS = 0x20,
-	DC_USB_REQUEST_VENDOR = 0x40,
-	DC_USB_REQUEST_RESERVED = 0x60
-} dc_usb_request_t;
-
-/**
- * Recipient bits of the USB control transfer.
- */
-typedef enum dc_usb_recipient_t {
-	DC_USB_RECIPIENT_DEVICE = 0x00,
-	DC_USB_RECIPIENT_INTERFACE = 0x01,
-	DC_USB_RECIPIENT_ENDPOINT = 0x02,
-	DC_USB_RECIPIENT_OTHER = 0x03,
-} dc_usb_recipient_t;
-
-/**
- * USB device descriptor.
- */
-typedef struct dc_usb_desc_t {
-	unsigned short vid;
-	unsigned short pid;
-} dc_usb_desc_t;
-
-/**
- * Opaque object representing a USB device.
- */
-typedef struct dc_usb_device_t dc_usb_device_t;
-
-/**
- * Get the vendor id (VID) of the USB device.
- *
- * @param[in]  device  A valid USB device.
- */
-unsigned int
-dc_usb_device_get_vid (dc_usb_device_t *device);
-
-/**
- * Get the product id (PID) of the USB device.
- *
- * @param[in]  device  A valid USB device.
- */
-unsigned int
-dc_usb_device_get_pid (dc_usb_device_t *device);
-
-/**
- * Destroy the USB device and free all resources.
- *
- * @param[in]  device  A valid USB device.
- */
-void
-dc_usb_device_free(dc_usb_device_t *device);
-
-/**
- * Create an iterator to enumerate the USB devices.
- *
- * @param[out] iterator    A location to store the iterator.
- * @param[in]  context     A valid context object.
- * @param[in]  descriptor  A valid device descriptor or NULL.
- * @returns #DC_STATUS_SUCCESS on success, or another #dc_status_t code
- * on failure.
- */
-dc_status_t
-dc_usb_iterator_new (dc_iterator_t **iterator, dc_context_t *context, dc_descriptor_t *descriptor);
-
-/**
- * Open a USB connection.
- *
- * @param[out]  iostream A location to store the USB connection.
- * @param[in]   context  A valid context object.
- * @param[in]   device   A valid USB device.
- * @returns #DC_STATUS_SUCCESS on success, or another #dc_status_t code
- * on failure.
- */
-dc_status_t
-dc_usb_open (dc_iostream_t **iostream, dc_context_t *context, dc_usb_device_t *device);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* DC_USB_H */
--- a/include/libdivecomputer/usbhid.h
+++ b/include/libdivecomputer/usbhid.h
@ -32,14 +32,6 @@
 extern "C" {
 #endif /* __cplusplus */

-/**
- * USB HID device descriptor.
- */
-typedef struct dc_usbhid_desc_t {
-	unsigned short vid;
-	unsigned short pid;
-} dc_usbhid_desc_t;
-
 /**
 * Opaque object representing a USB HID device.
 */
--- a/msvc/libdivecomputer.vcproj
+++ b/msvc/libdivecomputer.vcproj
@ -0,0 +1,903 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="libdivecomputer"
+	ProjectGUID="{CEA7215A-D6B5-4840-8086-3C854F371997}"
+	RootNamespace="libdivecomputer"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="196613"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_AF_IRDA_H;HAVE_WS2BTH_H"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="4"
+				CompileAs="2"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="2"
+				ModuleDefinitionFile="$(OutDir)/libdivecomputer.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="2"
+				EnableIntrinsicFunctions="true"
+				AdditionalIncludeDirectories="..\include"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_AF_IRDA_H;HAVE_WS2BTH_H"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+				CompileAs="2"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib"
+				LinkIncremental="1"
+				ModuleDefinitionFile="$(OutDir)/libdivecomputer.def"
+				GenerateDebugInformation="true"
+				SubSystem="2"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath="..\src\aes.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\array.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\atomics_cobalt.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\atomics_cobalt_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\bluetooth.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\buffer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\checksum.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\citizen_aqualand.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\citizen_aqualand_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\cochran_commander.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\cochran_commander_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\context.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\cressi_edy.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\cressi_edy_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\cressi_leonardo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\cressi_leonardo_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\custom.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\datetime.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\descriptor.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\device.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\diverite_nitekq.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\diverite_nitekq_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\divesystem_idive.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\divesystem_idive_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\hw_frog.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\hw_ostc.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\hw_ostc3.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\hw_ostc_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ihex.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\iostream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\irda.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\iterator.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_common.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_darwin.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_darwin_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_iconhd.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_iconhd_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_nemo.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_nemo_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_puck.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\oceanic_atom2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\oceanic_atom2_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\oceanic_common.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\oceanic_veo250.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\oceanic_veo250_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\oceanic_vtpro.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\oceanic_vtpro_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\rbstream.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\reefnet_sensus.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\reefnet_sensus_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\reefnet_sensuspro.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\reefnet_sensuspro_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\reefnet_sensusultra.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\reefnet_sensusultra_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ringbuffer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\serial_win32.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\shearwater_common.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\shearwater_petrel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\shearwater_predator.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\shearwater_predator_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\socket.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_common.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_common2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_d9.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_d9_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_eon.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_eon_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_eonsteel.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_eonsteel_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_solution.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_solution_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_vyper.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_vyper2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_vyper_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\timer.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\usbhid.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_aladin.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_g2.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_memomouse.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_memomouse_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_meridian.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_smart.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_smart_parser.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\version.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\zeagle_n2ition3.c"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath="..\src\aes.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\array.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\atomics_cobalt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\atomics_cobalt.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\bluetooth.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\buffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\checksum.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\citizen_aqualand.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\cochran_commander.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\common-private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\context-private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\context.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\cressi_edy.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\cressi_leonardo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\custom.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\datetime.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\descriptor.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\device-private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\device.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\diverite_nitekq.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\divesystem_idive.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\hw_frog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\hw_frog.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\hw_ostc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\hw_ostc.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\hw_ostc3.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\hw_ostc3.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ihex.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\iostream-private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\iostream.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\irda.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\iterator-private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\iterator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_darwin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_iconhd.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_nemo.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\mares_puck.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\oceanic_atom2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\oceanic_atom2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\oceanic_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\oceanic_veo250.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\oceanic_veo250.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\oceanic_vtpro.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\oceanic_vtpro.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\parser-private.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\parser.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\platform.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\rbstream.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\reefnet_sensus.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\reefnet_sensus.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\reefnet_sensuspro.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\reefnet_sensuspro.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\reefnet_sensusultra.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\reefnet_sensusultra.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\revision.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\ringbuffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\serial.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\shearwater_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\shearwater_petrel.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\shearwater_predator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\socket.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_common2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\suunto_d9.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_d9.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\suunto_eon.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_eon.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_eonsteel.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_solution.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_vyper.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\suunto_vyper2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\suunto_vyper2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\timer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\units.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\usbhid.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_aladin.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_g2.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_memomouse.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_meridian.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\uwatec_smart.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\version.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\zeagle_n2ition3.h"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+			<File
+				RelativePath="..\src\libdivecomputer.rc"
+				>
+			</File>
+			<File
+				RelativePath="..\src\libdivecomputer.symbols"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="echo EXPORTS &gt; &quot;$(OutDir)/libdivecomputer.def&quot; &amp;&amp; type &quot;$(InputPath)&quot; &gt;&gt; &quot;$(OutDir)/libdivecomputer.def&quot;"
+						Outputs="$(OutDir)/libdivecomputer.def"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						CommandLine="echo EXPORTS &gt; &quot;$(OutDir)/libdivecomputer.def&quot; &amp;&amp; type &quot;$(InputPath)&quot; &gt;&gt; &quot;$(OutDir)/libdivecomputer.def&quot;"
+						Outputs="$(OutDir)/libdivecomputer.def"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -1,9 +1,9 @@
 AM_CPPFLAGS = -I$(top_builddir)/include -I$(top_srcdir)/include
-AM_CFLAGS = $(LIBUSB_CFLAGS) $(LIBMTP_CFLAGS) $(HIDAPI_CFLAGS) $(BLUEZ_CFLAGS)
+AM_CFLAGS = $(LIBUSB_CFLAGS) $(HIDAPI_CFLAGS) $(BLUEZ_CFLAGS)

 lib_LTLIBRARIES = libdivecomputer.la

-libdivecomputer_la_LIBADD = $(LIBUSB_LIBS) $(LIBMTP_LIBS) $(HIDAPI_LIBS) $(BLUEZ_LIBS) -lm
+libdivecomputer_la_LIBADD = $(LIBUSB_LIBS) $(HIDAPI_LIBS) $(BLUEZ_LIBS) -lm
 libdivecomputer_la_LDFLAGS = \
 	-version-info $(DC_VERSION_LIBTOOL) \
 	-no-undefined \
@ -16,7 +16,7 @@ endif

 libdivecomputer_la_SOURCES = \
 	version.c \
-	descriptor.c \
+	descriptor-private.h descriptor.c \
 	iostream-private.h iostream.c \
 	iterator-private.h iterator.c \
 	common-private.h common.c \
@ -39,11 +39,12 @@ libdivecomputer_la_SOURCES = \
 	uwatec_aladin.h uwatec_aladin.c \
 	uwatec_memomouse.h uwatec_memomouse.c uwatec_memomouse_parser.c \
 	uwatec_smart.h uwatec_smart.c uwatec_smart_parser.c \
+	uwatec_meridian.h uwatec_meridian.c \
+	uwatec_g2.h uwatec_g2.c \
 	oceanic_common.h oceanic_common.c \
 	oceanic_atom2.h oceanic_atom2.c oceanic_atom2_parser.c \
 	oceanic_veo250.h oceanic_veo250.c oceanic_veo250_parser.c \
 	oceanic_vtpro.h oceanic_vtpro.c oceanic_vtpro_parser.c \
-	pelagic_i330r.h pelagic_i330r.c \
 	mares_common.h mares_common.c \
 	mares_nemo.h mares_nemo.c mares_nemo_parser.c \
 	mares_puck.h mares_puck.c \
@ -56,7 +57,6 @@ libdivecomputer_la_SOURCES = \
 	aes.h aes.c \
 	cressi_edy.h cressi_edy.c cressi_edy_parser.c \
 	cressi_leonardo.h cressi_leonardo.c cressi_leonardo_parser.c \
-	cressi_goa.h cressi_goa.c cressi_goa_parser.c \
 	zeagle_n2ition3.h zeagle_n2ition3.c \
 	atomics_cobalt.h atomics_cobalt.c atomics_cobalt_parser.c \
 	shearwater_common.h shearwater_common.c \
@ -65,38 +65,19 @@ libdivecomputer_la_SOURCES = \
 	diverite_nitekq.h diverite_nitekq.c diverite_nitekq_parser.c \
 	citizen_aqualand.h citizen_aqualand.c citizen_aqualand_parser.c \
 	divesystem_idive.h divesystem_idive.c divesystem_idive_parser.c \
-	platform.h platform.c \
+	platform.h \
 	ringbuffer.h ringbuffer.c \
 	rbstream.h rbstream.c \
 	checksum.h checksum.c \
 	array.h array.c \
 	buffer.c \
 	cochran_commander.h cochran_commander.c cochran_commander_parser.c \
-	tecdiving_divecomputereu.h tecdiving_divecomputereu.c tecdiving_divecomputereu_parser.c \
-	mclean_extreme.h mclean_extreme.c mclean_extreme_parser.c \
-	liquivision_lynx.h liquivision_lynx.c liquivision_lynx_parser.c \
-	sporasub_sp2.h sporasub_sp2.c sporasub_sp2_parser.c \
-	deepsix_excursion.h deepsix_excursion.c deepsix_excursion_parser.c \
-	seac_screen.h seac_screen.c seac_screen_parser.c \
-	deepblu_cosmiq.h deepblu_cosmiq.c deepblu_cosmiq_parser.c \
-	oceans_s1_common.h oceans_s1_common.c \
-	oceans_s1.h oceans_s1.c oceans_s1_parser.c \
-	divesoft_freedom.h divesoft_freedom.c divesoft_freedom_parser.c \
-	hdlc.h hdlc.c \
-	packet.h packet.c \
 	socket.h socket.c \
 	irda.c \
-	usb.c \
 	usbhid.c \
 	bluetooth.c \
 	custom.c

-# Not merged upstream yet
-libdivecomputer_la_SOURCES += \
-	usb_storage.c \
-	field-cache.h field-cache.c \
-	garmin.h garmin.c garmin_parser.c
-
 if OS_WIN32
 libdivecomputer_la_SOURCES += serial_win32.c
 else
@ -113,7 +94,7 @@ libdivecomputer.exp: libdivecomputer.symbols
 	$(AM_V_GEN) sed -e '/^$$/d' $< > $@

 .rc.lo:
-	$(AM_V_GEN) $(LIBTOOL) --silent --tag=CC --mode=compile $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS) $< -o $@
+	$(AM_V_GEN) $(LIBTOOL) --silent --tag=CC --mode=compile $(RC) $(DEFS) $(DEFAULT_INCLUDES) $< -o $@

 libdivecomputer.lo: revision.h

--- a/src/aes.c
+++ b/src/aes.c
@ -1,28 +1,4 @@
 /*
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>

 This is an implementation of the AES128 algorithm, specifically ECB and CBC mode.

@ -98,7 +74,7 @@ typedef struct aes_state_t {

 #if defined(CBC) && CBC
 	// Initial Vector used only for CBC mode
-	const uint8_t* Iv;
+	uint8_t* Iv;
 #endif
 } aes_state_t;

@ -542,7 +518,7 @@ void AES128_CBC_encrypt_buffer(uint8_t* output, uint8_t* input, uint32_t length,

  if(iv != 0)
  {
-    state.Iv = iv;
+    state.Iv = (uint8_t*)iv;
  }

  for(i = 0; i < length; i += KEYLEN)
@ -584,7 +560,7 @@ void AES128_CBC_decrypt_buffer(uint8_t* output, uint8_t* input, uint32_t length,
  // If iv is passed as 0, we continue to encrypt without re-setting the Iv
  if(iv != 0)
  {
-    state.Iv = iv;
+    state.Iv = (uint8_t*)iv;
  }

  for(i = 0; i < length; i += KEYLEN)
--- a/src/aes.h
+++ b/src/aes.h
@ -1,29 +1,3 @@
-/*
-This is free and unencumbered software released into the public domain.
-
-Anyone is free to copy, modify, publish, use, compile, sell, or
-distribute this software, either in source code form or as a compiled
-binary, for any purpose, commercial or non-commercial, and by any
-means.
-
-In jurisdictions that recognize copyright laws, the author or authors
-of this software dedicate any and all copyright interest in the
-software to the public domain. We make this dedication for the benefit
-of the public at large and to the detriment of our heirs and
-successors. We intend this dedication to be an overt act of
-relinquishment in perpetuity of all present and future rights to this
-software under copyright law.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-For more information, please refer to <http://unlicense.org/>
-*/
 #ifndef _AES_H_
 #define _AES_H_

--- a/src/array.c
+++ b/src/array.c
@ -160,30 +160,6 @@ array_convert_str2num (const unsigned char data[], unsigned int size)
 	return value;
 }

-unsigned int
-array_convert_bin2dec (const unsigned char data[], unsigned int size)
-{
-	unsigned int value = 0;
-	for (unsigned int i = 0; i < size; ++i) {
-		value *= 100;
-		value += data[i];
-	}
-
-	return value;
-}
-
-unsigned int
-array_convert_bcd2dec (const unsigned char data[], unsigned int size)
-{
-	unsigned int value = 0;
-	for (unsigned int i = 0; i < size; ++i) {
-		value *= 100;
-		value += bcd2dec(data[i]);
-	}
-
-	return value;
-}
-
 unsigned int
 array_uint_be (const unsigned char data[], unsigned int n)
 {
@ -191,7 +167,7 @@ array_uint_be (const unsigned char data[], unsigned int n)
 	unsigned int value = 0;
 	for (unsigned int i = 0; i < n; ++i) {
 		shift -= 8;
-		value |= (unsigned int) data[i] << shift;
+		value |= data[i] << shift;
 	}
 	return value;
 }
@ -202,170 +178,76 @@ array_uint_le (const unsigned char data[], unsigned int n)
 	unsigned int shift = 0;
 	unsigned int value = 0;
 	for (unsigned int i = 0; i < n; ++i) {
-		value |= (unsigned int) data[i] << shift;
+		value |= data[i] << shift;
 		shift += 8;
 	}
 	return value;
 }

-unsigned long long
-array_uint64_be (const unsigned char data[])
-{
-	return ((unsigned long long) data[0] << 56) |
-	       ((unsigned long long) data[1] << 48) |
-	       ((unsigned long long) data[2] << 40) |
-	       ((unsigned long long) data[3] << 32) |
-	       ((unsigned long long) data[4] << 24) |
-	       ((unsigned long long) data[5] << 16) |
-	       ((unsigned long long) data[6] <<  8) |
-	       ((unsigned long long) data[7] <<  0);
-}
-
-unsigned long long
-array_uint64_le (const unsigned char data[])
-{
-	return ((unsigned long long) data[0] <<  0) |
-	       ((unsigned long long) data[1] <<  8) |
-	       ((unsigned long long) data[2] << 16) |
-	       ((unsigned long long) data[3] << 24) |
-	       ((unsigned long long) data[4] << 32) |
-	       ((unsigned long long) data[5] << 40) |
-	       ((unsigned long long) data[6] << 48) |
-	       ((unsigned long long) data[7] << 56);
-}
-
 unsigned int
 array_uint32_be (const unsigned char data[])
 {
-	return ((unsigned int) data[0] << 24) |
-	       ((unsigned int) data[1] << 16) |
-	       ((unsigned int) data[2] <<  8) |
-	       ((unsigned int) data[3] <<  0);
+	return (data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3];
 }


 unsigned int
 array_uint32_le (const unsigned char data[])
 {
-	return ((unsigned int) data[0] <<  0) |
-	       ((unsigned int) data[1] <<  8) |
-	       ((unsigned int) data[2] << 16) |
-	       ((unsigned int) data[3] << 24);
+	return data[0] + (data[1] << 8) + (data[2] << 16) + (data[3] << 24);
 }


 unsigned int
 array_uint32_word_be (const unsigned char data[])
 {
-	return ((unsigned int) data[0] <<  8) |
-	       ((unsigned int) data[1] <<  0) |
-	       ((unsigned int) data[2] << 24) |
-	       ((unsigned int) data[3] << 16);
+	return data[1] + (data[0] << 8) + (data[3] << 16) + (data[2] << 24);
 }

-unsigned int
-array_uint24_be (const unsigned char data[])
-{
-	return ((unsigned int) data[0] << 16) |
-	       ((unsigned int) data[1] <<  8) |
-	       ((unsigned int) data[2] <<  0);
-}
-
-unsigned int
-array_uint24_le (const unsigned char data[])
-{
-	return ((unsigned int) data[0] <<  0) |
-	       ((unsigned int) data[1] <<  8) |
-	       ((unsigned int) data[2] << 16);
-}
-
-unsigned short
-array_uint16_be (const unsigned char data[])
-{
-	return ((unsigned int) data[0] <<  8) |
-	       ((unsigned int) data[1] <<  0);
-}
-
-
-unsigned short
-array_uint16_le (const unsigned char data[])
-{
-	return ((unsigned int) data[0] <<  0) |
-	       ((unsigned int) data[1] <<  8);
-}
-
-void
-array_uint64_be_set (unsigned char data[], const unsigned long long input)
-{
-	data[0] = (input >> 56) & 0xFF;
-	data[1] = (input >> 48) & 0xFF;
-	data[2] = (input >> 40) & 0xFF;
-	data[3] = (input >> 32) & 0xFF;
-	data[4] = (input >> 24) & 0xFF;
-	data[5] = (input >> 16) & 0xFF;
-	data[6] = (input >>  8) & 0xFF;
-	data[7] = (input      ) & 0xFF;
-}
-
-void
-array_uint64_le_set (unsigned char data[], const unsigned long long input)
-{
-	data[0] = (input      ) & 0xFF;
-	data[1] = (input >>  8) & 0xFF;
-	data[2] = (input >> 16) & 0xFF;
-	data[3] = (input >> 24) & 0xFF;
-	data[4] = (input >> 32) & 0xFF;
-	data[5] = (input >> 40) & 0xFF;
-	data[6] = (input >> 48) & 0xFF;
-	data[7] = (input >> 56) & 0xFF;
-}
-
-void
-array_uint32_be_set (unsigned char data[], const unsigned int input)
-{
-	data[0] = (input >> 24) & 0xFF;
-	data[1] = (input >> 16) & 0xFF;
-	data[2] = (input >>  8) & 0xFF;
-	data[3] = (input      ) & 0xFF;
-}

 void
 array_uint32_le_set (unsigned char data[], const unsigned int input)
 {
-	data[0] = (input      ) & 0xFF;
+	data[0] = input & 0xFF;
 	data[1] = (input >>  8) & 0xFF;
 	data[2] = (input >> 16) & 0xFF;
 	data[3] = (input >> 24) & 0xFF;
 }

+
+unsigned int
+array_uint24_be (const unsigned char data[])
+{
+	return (data[0] << 16) + (data[1] << 8) + data[2];
+}
+
+
 void
 array_uint24_be_set (unsigned char data[], const unsigned int input)
 {
 	data[0] = (input >> 16) & 0xFF;
 	data[1] = (input >>  8) & 0xFF;
-	data[2] = (input      ) & 0xFF;
+	data[2] = input & 0xFF;
 }

-void
-array_uint24_le_set (unsigned char data[], const unsigned int input)
+
+unsigned int
+array_uint24_le (const unsigned char data[])
 {
-	data[0] = (input      ) & 0xFF;
-	data[1] = (input >>  8) & 0xFF;
-	data[2] = (input >> 16) & 0xFF;
+	return data[0] + (data[1] << 8) + (data[2] << 16);
 }

-void
-array_uint16_be_set (unsigned char data[], const unsigned short input)
+unsigned short
+array_uint16_be (const unsigned char data[])
 {
-	data[0] = (input >>  8) & 0xFF;
-	data[1] = (input      ) & 0xFF;
+	return (data[0] << 8) + data[1];
 }

-void
-array_uint16_le_set (unsigned char data[], const unsigned short input)
+
+unsigned short
+array_uint16_le (const unsigned char data[])
 {
-	data[0] = (input      ) & 0xFF;
-	data[1] = (input >>  8) & 0xFF;
+	return data[0] + (data[1] << 8);
 }

 unsigned char
@ -373,45 +255,3 @@ bcd2dec (unsigned char value)
 {
 	return ((value >> 4) & 0x0f) * 10 + (value & 0x0f);
 }
-
-unsigned char
-dec2bcd (unsigned char value)
-{
-	if (value >= 100)
-		return 0;
-
-	unsigned char hi = value / 10;
-	unsigned char lo = value % 10;
-	return (hi << 4) | lo;
-}
-
-/*
- * When turning a two's-complement number with a certain number
- * of bits into one with more bits, the sign bit must be repeated
- * in all the extra bits.
- */
-unsigned int
-signextend (unsigned int value, unsigned int nbits)
-{
-	if (nbits <= 0 || nbits > 32)
-		return 0;
-
-	unsigned int signbit = 1U << (nbits - 1);
-	unsigned int mask = signbit - 1;
-
-	if ((value & signbit) == signbit)
-		return value | ~mask;
-	else
-		return value & mask;
-}
-
-unsigned int
-popcount (unsigned int value)
-{
-	unsigned int count = 0;
-	while (value) {
-		value &= value - 1;
-		count++;
-	}
-	return count;
-}
--- a/src/array.h
+++ b/src/array.h
@ -22,8 +22,6 @@
 #ifndef ARRAY_H
 #define ARRAY_H

-#define C_ARRAY_SIZE(a) (sizeof (a) / sizeof *(a))
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@ -54,24 +52,12 @@ array_convert_hex2bin (const unsigned char input[], unsigned int isize, unsigned
 unsigned int
 array_convert_str2num (const unsigned char data[], unsigned int size);

-unsigned int
-array_convert_bin2dec (const unsigned char data[], unsigned int size);
-
-unsigned int
-array_convert_bcd2dec (const unsigned char data[], unsigned int size);
-
 unsigned int
 array_uint_be (const unsigned char data[], unsigned int n);

 unsigned int
 array_uint_le (const unsigned char data[], unsigned int n);

-unsigned long long
-array_uint64_be (const unsigned char data[]);
-
-unsigned long long
-array_uint64_le (const unsigned char data[]);
-
 unsigned int
 array_uint32_be (const unsigned char data[]);

@ -81,9 +67,15 @@ array_uint32_le (const unsigned char data[]);
 unsigned int
 array_uint32_word_be (const unsigned char data[]);

+void
+array_uint32_le_set (unsigned char data[], const unsigned int input);
+
 unsigned int
 array_uint24_be (const unsigned char data[]);

+void
+array_uint24_be_set (unsigned char data[], const unsigned int input);
+
 unsigned int
 array_uint24_le (const unsigned char data[]);

@ -93,42 +85,9 @@ array_uint16_be (const unsigned char data[]);
 unsigned short
 array_uint16_le (const unsigned char data[]);

-void
-array_uint64_be_set (unsigned char data[], const unsigned long long input);
-
-void
-array_uint64_le_set (unsigned char data[], const unsigned long long input);
-
-void
-array_uint32_be_set (unsigned char data[], const unsigned int input);
-
-void
-array_uint32_le_set (unsigned char data[], const unsigned int input);
-
-void
-array_uint24_be_set (unsigned char data[], const unsigned int input);
-
-void
-array_uint24_le_set (unsigned char data[], const unsigned int input);
-
-void
-array_uint16_be_set (unsigned char data[], const unsigned short input);
-
-void
-array_uint16_le_set (unsigned char data[], const unsigned short input);
-
 unsigned char
 bcd2dec (unsigned char value);

-unsigned char
-dec2bcd (unsigned char value);
-
-unsigned int
-signextend (unsigned int value, unsigned int nbits);
-
-unsigned int
-popcount (unsigned int value);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- a/src/atomics_cobalt.c
+++ b/src/atomics_cobalt.c
@ -19,10 +19,19 @@
 * MA 02110-1301 USA
 */

+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <string.h> // memcmp, memcpy
 #include <stdlib.h> // malloc, free

-#include <libdivecomputer/usb.h>
+#ifdef HAVE_LIBUSB
+#ifdef _WIN32
+#define NOGDI
+#endif
+#include <libusb-1.0/libusb.h>
+#endif

 #include "atomics_cobalt.h"
 #include "context-private.h"
@ -32,8 +41,7 @@

 #define ISINSTANCE(device) dc_device_isinstance((device), &atomics_cobalt_device_vtable)

-#define COBALT1 0
-#define COBALT2 2
+#define EXITCODE(rc) (rc == LIBUSB_ERROR_TIMEOUT ? DC_STATUS_TIMEOUT : DC_STATUS_IO)

 #define VID 0x0471
 #define PID 0x0888
@ -41,15 +49,15 @@

 #define FP_OFFSET 20

-#define SZ_HEADER 228
-
-#define SZ_MEMORY1 (29 * 64 * 1024) // Cobalt 1
-#define SZ_MEMORY2 (41 * 64 * 1024) // Cobalt 2
+#define SZ_MEMORY (29 * 64 * 1024)
 #define SZ_VERSION 14

 typedef struct atomics_cobalt_device_t {
 	dc_device_t base;
-	dc_iostream_t *iostream;
+#ifdef HAVE_LIBUSB
+	libusb_context *context;
+	libusb_device_handle *handle;
+#endif
 	unsigned int simulation;
 	unsigned char fingerprint[6];
 	unsigned char version[SZ_VERSION];
@ -57,6 +65,7 @@ typedef struct atomics_cobalt_device_t {

 static dc_status_t atomics_cobalt_device_set_fingerprint (dc_device_t *abstract, const unsigned char data[], unsigned int size);
 static dc_status_t atomics_cobalt_device_foreach (dc_device_t *abstract, dc_dive_callback_t callback, void *userdata);
+static dc_status_t atomics_cobalt_device_close (dc_device_t *abstract);

 static const dc_device_vtable_t atomics_cobalt_device_vtable = {
 	sizeof(atomics_cobalt_device_t),
@ -67,19 +76,22 @@ static const dc_device_vtable_t atomics_cobalt_device_vtable = {
 	NULL, /* dump */
 	atomics_cobalt_device_foreach, /* foreach */
 	NULL, /* timesync */
-	NULL /* close */
+	atomics_cobalt_device_close /* close */
 };


 dc_status_t
-atomics_cobalt_device_open (dc_device_t **out, dc_context_t *context, dc_iostream_t *iostream)
+atomics_cobalt_device_open (dc_device_t **out, dc_context_t *context)
 {
+#ifdef HAVE_LIBUSB
 	dc_status_t status = DC_STATUS_SUCCESS;
 	atomics_cobalt_device_t *device = NULL;
+#endif

 	if (out == NULL)
 		return DC_STATUS_INVALIDARGS;

+#ifdef HAVE_LIBUSB
 	// Allocate memory.
 	device = (atomics_cobalt_device_t *) dc_device_allocate (context, &atomics_cobalt_device_vtable);
 	if (device == NULL) {
@ -88,30 +100,67 @@ atomics_cobalt_device_open (dc_device_t **out, dc_context_t *context, dc_iostrea
 	}

 	// Set the default values.
-	device->iostream = iostream;
+	device->context = NULL;
+	device->handle = NULL;
 	device->simulation = 0;
 	memset (device->fingerprint, 0, sizeof (device->fingerprint));

-	// Set the timeout for receiving data (2000 ms).
-	status = dc_iostream_set_timeout (device->iostream, TIMEOUT);
-	if (status != DC_STATUS_SUCCESS) {
-		ERROR (context, "Failed to set the timeout.");
+	int rc = libusb_init (&device->context);
+	if (rc < 0) {
+		ERROR (context, "Failed to initialize usb support.");
+		status = DC_STATUS_IO;
 		goto error_free;
 	}

+	device->handle = libusb_open_device_with_vid_pid (device->context, VID, PID);
+	if (device->handle == NULL) {
+		ERROR (context, "Failed to open the usb device.");
+		status = DC_STATUS_IO;
+		goto error_usb_exit;
+	}
+
+	rc = libusb_claim_interface (device->handle, 0);
+	if (rc < 0) {
+		ERROR (context, "Failed to claim the usb interface.");
+		status = DC_STATUS_IO;
+		goto error_usb_close;
+	}
+
 	status = atomics_cobalt_device_version ((dc_device_t *) device, device->version, sizeof (device->version));
 	if (status != DC_STATUS_SUCCESS) {
 		ERROR (context, "Failed to identify the dive computer.");
-		goto error_free;
+		goto error_usb_close;
 	}

 	*out = (dc_device_t*) device;

 	return DC_STATUS_SUCCESS;

+error_usb_close:
+	libusb_close (device->handle);
+error_usb_exit:
+	libusb_exit (device->context);
 error_free:
 	dc_device_deallocate ((dc_device_t *) device);
 	return status;
+#else
+	return DC_STATUS_UNSUPPORTED;
+#endif
+}
+
+
+static dc_status_t
+atomics_cobalt_device_close (dc_device_t *abstract)
+{
+	atomics_cobalt_device_t *device = (atomics_cobalt_device_t *) abstract;
+
+#ifdef HAVE_LIBUSB
+	libusb_release_interface(device->handle, 0);
+	libusb_close (device->handle);
+	libusb_exit (device->context);
+#endif
+
+	return DC_STATUS_SUCCESS;
 }


@ -149,7 +198,6 @@ atomics_cobalt_device_set_simulation (dc_device_t *abstract, unsigned int simula
 dc_status_t
 atomics_cobalt_device_version (dc_device_t *abstract, unsigned char data[], unsigned int size)
 {
-	dc_status_t status = DC_STATUS_SUCCESS;
 	atomics_cobalt_device_t *device = (atomics_cobalt_device_t *) abstract;

 	if (!ISINSTANCE (abstract))
@ -158,31 +206,31 @@ atomics_cobalt_device_version (dc_device_t *abstract, unsigned char data[], unsi
 	if (size < SZ_VERSION)
 		return DC_STATUS_INVALIDARGS;

+#ifdef HAVE_LIBUSB
 	// Send the command to the dive computer.
-	unsigned char bRequest = 0x01;
-	dc_usb_control_t control = {
-		DC_USB_REQUEST_VENDOR | DC_USB_RECIPIENT_DEVICE | DC_USB_ENDPOINT_OUT, /* bmRequestType */
-		bRequest, /* bRequest */
-		0, /* wValue */
-		0, /* wIndex */
-		0, /* wLength */
-	};
-
-	status = dc_iostream_ioctl (device->iostream, DC_IOCTL_USB_CONTROL_WRITE, &control, sizeof(control));
-	if (status != DC_STATUS_SUCCESS) {
+	uint8_t bRequest = 0x01;
+	int rc = libusb_control_transfer (device->handle,
+		LIBUSB_RECIPIENT_DEVICE | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT,
+		bRequest, 0, 0, NULL, 0, TIMEOUT);
+	if (rc != LIBUSB_SUCCESS) {
 		ERROR (abstract->context, "Failed to send the command.");
-		return status;
+		return EXITCODE(rc);
 	}

+	HEXDUMP (abstract->context, DC_LOGLEVEL_INFO, "Write", &bRequest, 1);
+
 	// Receive the answer from the dive computer.
-	size_t length = 0;
+	int length = 0;
 	unsigned char packet[SZ_VERSION + 2] = {0};
-	status = dc_iostream_read (device->iostream, packet, sizeof(packet), &length);
-	if (status != DC_STATUS_SUCCESS || length != sizeof (packet)) {
+	rc = libusb_bulk_transfer (device->handle, 0x82,
+		packet, sizeof (packet), &length, TIMEOUT);
+	if (rc != LIBUSB_SUCCESS || length != sizeof (packet)) {
 		ERROR (abstract->context, "Failed to receive the answer.");
-		return status;
+		return EXITCODE(rc);
 	}

+	HEXDUMP (abstract->context, DC_LOGLEVEL_INFO, "Read", packet, length);
+
 	// Verify the checksum of the packet.
 	unsigned short crc = array_uint16_le (packet + SZ_VERSION);
 	unsigned short ccrc = checksum_add_uint16 (packet, SZ_VERSION, 0x0);
@ -194,13 +242,16 @@ atomics_cobalt_device_version (dc_device_t *abstract, unsigned char data[], unsi
 	memcpy (data, packet, SZ_VERSION);

 	return DC_STATUS_SUCCESS;
+#else
+	return DC_STATUS_UNSUPPORTED;
+#endif
 }


 static dc_status_t
 atomics_cobalt_read_dive (dc_device_t *abstract, dc_buffer_t *buffer, int init, dc_event_progress_t *progress)
 {
-	dc_status_t status = DC_STATUS_SUCCESS;
+#ifdef HAVE_LIBUSB
 	atomics_cobalt_device_t *device = (atomics_cobalt_device_t *) abstract;

 	if (device_is_cancelled (abstract))
@ -212,47 +263,36 @@ atomics_cobalt_read_dive (dc_device_t *abstract, dc_buffer_t *buffer, int init,
 		return DC_STATUS_NOMEMORY;
 	}

-	// Adjust the maximum value to take into account the two byte checksum and
-	// the 8 byte serial number. Those extra bytes are not stored inside the
-	// dive header and are added dynamically during the data transfer. Since we
-	// don't know the total number of dives in advance, we can't calculate the
-	// total number of extra bytes and adjust the maximum on the fly.
-	if (progress) {
-		progress->maximum += 2 + 8;
-	}
-
 	// Send the command to the dive computer.
-	unsigned char bRequest = 0;
+	uint8_t bRequest = 0;
 	if (device->simulation)
 		bRequest = init ? 0x02 : 0x03;
 	else
 		bRequest = init ? 0x09 : 0x0A;
-
-	dc_usb_control_t control = {
-		DC_USB_REQUEST_VENDOR | DC_USB_RECIPIENT_DEVICE | DC_USB_ENDPOINT_OUT, /* bmRequestType */
-		bRequest, /* bRequest */
-		0, /* wValue */
-		0, /* wIndex */
-		0, /* wLength */
-	};
-
-	status = dc_iostream_ioctl (device->iostream, DC_IOCTL_USB_CONTROL_WRITE, &control, sizeof(control));
-	if (status != DC_STATUS_SUCCESS) {
+	int rc = libusb_control_transfer (device->handle,
+		LIBUSB_RECIPIENT_DEVICE | LIBUSB_REQUEST_TYPE_VENDOR | LIBUSB_ENDPOINT_OUT,
+		bRequest, 0, 0, NULL, 0, TIMEOUT);
+	if (rc != LIBUSB_SUCCESS) {
 		ERROR (abstract->context, "Failed to send the command.");
-		return status;
+		return EXITCODE(rc);
 	}

+	HEXDUMP (abstract->context, DC_LOGLEVEL_INFO, "Write", &bRequest, 1);
+
 	unsigned int nbytes = 0;
 	while (1) {
 		// Receive the answer from the dive computer.
-		size_t length = 0;
+		int length = 0;
 		unsigned char packet[8 * 1024] = {0};
-		status = dc_iostream_read (device->iostream, packet, sizeof(packet), &length);
-		if (status != DC_STATUS_SUCCESS && status != DC_STATUS_TIMEOUT) {
+		rc = libusb_bulk_transfer (device->handle, 0x82,
+			packet, sizeof (packet), &length, TIMEOUT);
+		if (rc != LIBUSB_SUCCESS && rc != LIBUSB_ERROR_TIMEOUT) {
 			ERROR (abstract->context, "Failed to receive the answer.");
-			return status;
+			return EXITCODE(rc);
 		}

+		HEXDUMP (abstract->context, DC_LOGLEVEL_INFO, "Read", packet, length);
+
 		// Update and emit a progress event.
 		if (progress) {
 			progress->current += length;
@ -299,6 +339,9 @@ atomics_cobalt_read_dive (dc_device_t *abstract, dc_buffer_t *buffer, int init,
 	dc_buffer_slice (buffer, 0, nbytes - 2);

 	return DC_STATUS_SUCCESS;
+#else
+	return DC_STATUS_UNSUPPORTED;
+#endif
 }


@ -307,12 +350,9 @@ atomics_cobalt_device_foreach (dc_device_t *abstract, dc_dive_callback_t callbac
 {
 	atomics_cobalt_device_t *device = (atomics_cobalt_device_t *) abstract;

-	// Get the model number.
-	unsigned int model = array_uint16_le (device->version + 12);
-
 	// Enable progress notifications.
 	dc_event_progress_t progress = EVENT_PROGRESS_INITIALIZER;
-	progress.maximum = (model == COBALT2 ? SZ_MEMORY2 : SZ_MEMORY1) + 2;
+	progress.maximum = SZ_MEMORY + 2;
 	device_event_emit (abstract, DC_EVENT_PROGRESS, &progress);

 	// Emit a vendor event.
@ -349,12 +389,6 @@ atomics_cobalt_device_foreach (dc_device_t *abstract, dc_dive_callback_t callbac
 			return DC_STATUS_SUCCESS;
 		}

-		if (size < SZ_HEADER) {
-			ERROR (abstract->context, "Dive header is too small (%u).", size);
-			dc_buffer_free (buffer);
-			return DC_STATUS_DATAFORMAT;
-		}
-
 		if (memcmp (data + FP_OFFSET, device->fingerprint, sizeof (device->fingerprint)) == 0) {
 			dc_buffer_free (buffer);
 			return DC_STATUS_SUCCESS;
@ -365,6 +399,12 @@ atomics_cobalt_device_foreach (dc_device_t *abstract, dc_dive_callback_t callbac
 			return DC_STATUS_SUCCESS;
 		}

+		// Adjust the maximum value to take into account the two checksum bytes
+		// for the next dive. Since we don't know the total number of dives in
+		// advance, we can't calculate the total number of checksum bytes and
+		// adjust the maximum on the fly.
+		progress.maximum += 2;
+
 		ndives++;
 	}

--- a/src/atomics_cobalt.h
+++ b/src/atomics_cobalt.h
@ -23,7 +23,6 @@
 #define ATOMICS_COBALT_H

 #include <libdivecomputer/context.h>
-#include <libdivecomputer/iostream.h>
 #include <libdivecomputer/device.h>
 #include <libdivecomputer/parser.h>
 #include <libdivecomputer/atomics_cobalt.h>
@ -33,10 +32,10 @@ extern "C" {
 #endif /* __cplusplus */

 dc_status_t
-atomics_cobalt_device_open (dc_device_t **device, dc_context_t *context, dc_iostream_t *iostream);
+atomics_cobalt_device_open (dc_device_t **device, dc_context_t *context);

 dc_status_t
-atomics_cobalt_parser_create (dc_parser_t **parser, dc_context_t *context, const unsigned char data[], size_t size);
+atomics_cobalt_parser_create (dc_parser_t **parser, dc_context_t *context);

 #ifdef __cplusplus
 }
--- a/src/atomics_cobalt_parser.c
+++ b/src/atomics_cobalt_parser.c
@ -46,10 +46,11 @@ typedef struct atomics_cobalt_parser_t atomics_cobalt_parser_t;
 struct atomics_cobalt_parser_t {
 	dc_parser_t base;
 	// Depth calibration.
+	double atmospheric;
 	double hydrostatic;
 };

-static dc_status_t atomics_cobalt_parser_set_density (dc_parser_t *abstract, double density);
+static dc_status_t atomics_cobalt_parser_set_data (dc_parser_t *abstract, const unsigned char *data, unsigned int size);
 static dc_status_t atomics_cobalt_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetime);
 static dc_status_t atomics_cobalt_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsigned int flags, void *value);
 static dc_status_t atomics_cobalt_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t callback, void *userdata);
@ -57,9 +58,7 @@ static dc_status_t atomics_cobalt_parser_samples_foreach (dc_parser_t *abstract,
 static const dc_parser_vtable_t atomics_cobalt_parser_vtable = {
 	sizeof(atomics_cobalt_parser_t),
 	DC_FAMILY_ATOMICS_COBALT,
-	NULL, /* set_clock */
-	NULL, /* set_atmospheric */
-	atomics_cobalt_parser_set_density, /* set_density */
+	atomics_cobalt_parser_set_data, /* set_data */
 	atomics_cobalt_parser_get_datetime, /* datetime */
 	atomics_cobalt_parser_get_field, /* fields */
 	atomics_cobalt_parser_samples_foreach, /* samples_foreach */
@ -68,7 +67,7 @@ static const dc_parser_vtable_t atomics_cobalt_parser_vtable = {


 dc_status_t
-atomics_cobalt_parser_create (dc_parser_t **out, dc_context_t *context, const unsigned char data[], size_t size)
+atomics_cobalt_parser_create (dc_parser_t **out, dc_context_t *context)
 {
 	atomics_cobalt_parser_t *parser = NULL;

@ -76,14 +75,15 @@ atomics_cobalt_parser_create (dc_parser_t **out, dc_context_t *context, const un
 		return DC_STATUS_INVALIDARGS;

 	// Allocate memory.
-	parser = (atomics_cobalt_parser_t *) dc_parser_allocate (context, &atomics_cobalt_parser_vtable, data, size);
+	parser = (atomics_cobalt_parser_t *) dc_parser_allocate (context, &atomics_cobalt_parser_vtable);
 	if (parser == NULL) {
 		ERROR (context, "Failed to allocate memory.");
 		return DC_STATUS_NOMEMORY;
 	}

 	// Set the default values.
-	parser->hydrostatic = DEF_DENSITY_SALT * GRAVITY;
+	parser->atmospheric = 0.0;
+	parser->hydrostatic = 1025.0 * GRAVITY;

 	*out = (dc_parser_t*) parser;

@ -92,11 +92,22 @@ atomics_cobalt_parser_create (dc_parser_t **out, dc_context_t *context, const un


 static dc_status_t
-atomics_cobalt_parser_set_density (dc_parser_t *abstract, double density)
+atomics_cobalt_parser_set_data (dc_parser_t *abstract, const unsigned char *data, unsigned int size)
 {
-	atomics_cobalt_parser_t *parser = (atomics_cobalt_parser_t *) abstract;
+	return DC_STATUS_SUCCESS;
+}

-	parser->hydrostatic = density * GRAVITY;
+
+dc_status_t
+atomics_cobalt_parser_set_calibration (dc_parser_t *abstract, double atmospheric, double hydrostatic)
+{
+	atomics_cobalt_parser_t *parser = (atomics_cobalt_parser_t*) abstract;
+
+	if (!ISINSTANCE (abstract))
+		return DC_STATUS_INVALIDARGS;
+
+	parser->atmospheric = atmospheric;
+	parser->hydrostatic = hydrostatic;

 	return DC_STATUS_SUCCESS;
 }
@ -140,10 +151,15 @@ atomics_cobalt_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, un
 	dc_gasmix_t *gasmix = (dc_gasmix_t *) value;
 	dc_tank_t *tank = (dc_tank_t *) value;

-	unsigned int atmospheric = array_uint16_le (p + 0x26);
+	double atmospheric = 0.0;
 	char buf[BUFLEN];
 	dc_field_string_t *string = (dc_field_string_t *) value;

+	if (parser->atmospheric)
+		atmospheric = parser->atmospheric;
+	else
+		atmospheric = array_uint16_le (p + 0x26) * BAR / 1000.0;
+
 	unsigned int workpressure = 0;

 	if (value) {
@ -152,14 +168,13 @@ atomics_cobalt_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, un
 			*((unsigned int *) value) = array_uint16_le (p + 0x58) * 60;
 			break;
 		case DC_FIELD_MAXDEPTH:
-			*((double *) value) = (signed int)(array_uint16_le (p + 0x56) - atmospheric) * (BAR / 1000.0) / parser->hydrostatic;
+			*((double *) value) = (array_uint16_le (p + 0x56) * BAR / 1000.0 - atmospheric) / parser->hydrostatic;
 			break;
 		case DC_FIELD_GASMIX_COUNT:
 		case DC_FIELD_TANK_COUNT:
 			*((unsigned int *) value) = p[0x2a];
 			break;
 		case DC_FIELD_GASMIX:
-			gasmix->usage = DC_USAGE_NONE;
 			gasmix->helium = p[SZ_HEADER + SZ_GASMIX * flags + 5] / 100.0;
 			gasmix->oxygen = p[SZ_HEADER + SZ_GASMIX * flags + 4] / 100.0;
 			gasmix->nitrogen = 1.0 - gasmix->oxygen - gasmix->helium;
@ -191,7 +206,6 @@ atomics_cobalt_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, un
 			tank->gasmix = flags;
 			tank->beginpressure = array_uint16_le(p + 6) * PSI / BAR;
 			tank->endpressure = array_uint16_le(p + 14) * PSI / BAR;
-			tank->usage = DC_TANK_USAGE_NONE;
 			break;
 		case DC_FIELD_DIVEMODE:
 			switch(p[0x24]) {
@ -206,9 +220,6 @@ atomics_cobalt_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, un
 				return DC_STATUS_DATAFORMAT;
 			}
 			break;
-		case DC_FIELD_ATMOSPHERIC:
-			*((double *) value) = atmospheric / 1000.0;
-			break;
 		case DC_FIELD_STRING:
 			switch(flags) {
 			case 0: // Serialnr
@ -263,7 +274,11 @@ atomics_cobalt_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback
 	if (size < header + SZ_SEGMENT * nsegments)
 		return DC_STATUS_DATAFORMAT;

-	unsigned int atmospheric = array_uint16_le (data + 0x26);
+	double atmospheric = 0.0;
+	if (parser->atmospheric)
+		atmospheric = parser->atmospheric;
+	else
+		atmospheric = array_uint16_le (data + 0x26) * BAR / 1000.0;

 	// Previous gas mix - initialize with impossible value
 	unsigned int gasmix_previous = 0xFFFFFFFF;
@ -289,19 +304,19 @@ atomics_cobalt_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback

 		// Time (seconds).
 		time += interval;
-		sample.time = time * 1000;
-		if (callback) callback (DC_SAMPLE_TIME, &sample, userdata);
+		sample.time = time;
+		if (callback) callback (DC_SAMPLE_TIME, sample, userdata);

 		// Depth (1/1000 bar).
 		unsigned int depth = array_uint16_le (data + offset + 0);
-		sample.depth = (signed int)(depth - atmospheric) * (BAR / 1000.0) / parser->hydrostatic;
-		if (callback) callback (DC_SAMPLE_DEPTH, &sample, userdata);
+		sample.depth = (depth * BAR / 1000.0 - atmospheric) / parser->hydrostatic;
+		if (callback) callback (DC_SAMPLE_DEPTH, sample, userdata);

 		// Pressure (1 psi).
 		unsigned int pressure = array_uint16_le (data + offset + 2);
 		sample.pressure.tank = tank;
 		sample.pressure.value = pressure * PSI / BAR;
-		if (callback) callback (DC_SAMPLE_PRESSURE, &sample, userdata);
+		if (callback) callback (DC_SAMPLE_PRESSURE, sample, userdata);

 		// Current gas mix
 		unsigned int gasmix = data[offset + 4];
@ -317,14 +332,14 @@ atomics_cobalt_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback
 				return DC_STATUS_DATAFORMAT;
 			}
 			sample.gasmix = idx;
-			if (callback) callback (DC_SAMPLE_GASMIX, &sample, userdata);
+			if (callback) callback (DC_SAMPLE_GASMIX, sample, userdata);
 			gasmix_previous = gasmix;
 		}

 		// Temperature (1 °F).
 		unsigned int temperature = data[offset + 8];
 		sample.temperature = (temperature - 32.0) * (5.0 / 9.0);
-		if (callback) callback (DC_SAMPLE_TEMPERATURE, &sample, userdata);
+		if (callback) callback (DC_SAMPLE_TEMPERATURE, sample, userdata);

 		// violation status
 		sample.event.type = 0;
@ -334,15 +349,15 @@ atomics_cobalt_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback
 		unsigned int violation = data[offset + 11];
 		if (violation & 0x01) {
 			sample.event.type = SAMPLE_EVENT_ASCENT;
-			if (callback) callback (DC_SAMPLE_EVENT, &sample, userdata);
+			if (callback) callback (DC_SAMPLE_EVENT, sample, userdata);
 		}
 		if (violation & 0x04) {
 			sample.event.type = SAMPLE_EVENT_CEILING;
-			if (callback) callback (DC_SAMPLE_EVENT, &sample, userdata);
+			if (callback) callback (DC_SAMPLE_EVENT, sample, userdata);
 		}
 		if (violation & 0x08) {
 			sample.event.type = SAMPLE_EVENT_PO2;
-			if (callback) callback (DC_SAMPLE_EVENT, &sample, userdata);
+			if (callback) callback (DC_SAMPLE_EVENT, sample, userdata);
 		}

 		// NDL & deco
@ -357,8 +372,7 @@ atomics_cobalt_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback
 			sample.deco.type = DC_DECO_NDL;
 		sample.deco.time = ndl;
 		sample.deco.depth = 0.0;
-		sample.deco.tts = 0;
-		if (callback) callback (DC_SAMPLE_DECO, &sample, userdata);
+		if (callback) callback (DC_SAMPLE_DECO, sample, userdata);

 		offset += SZ_SEGMENT;
 	}
--- a/src/bluetooth.c
+++ b/src/bluetooth.c
@ -24,6 +24,7 @@
 #endif

 #include <stdlib.h> // malloc, free
+#include <stdio.h>

 #include "socket.h"

@ -51,6 +52,7 @@
 #include "context-private.h"
 #include "iostream-private.h"
 #include "iterator-private.h"
+#include "descriptor-private.h"
 #include "platform.h"

 #ifdef _WIN32
@ -77,7 +79,7 @@ static dc_status_t dc_bluetooth_iterator_free (dc_iterator_t *iterator);

 typedef struct dc_bluetooth_iterator_t {
 	dc_iterator_t base;
-	dc_descriptor_t *descriptor;
+	dc_filter_t filter;
 #ifdef _WIN32
 	HANDLE hLookup;
 #else
@ -97,19 +99,18 @@ static const dc_iterator_vtable_t dc_bluetooth_iterator_vtable = {
 static const dc_iostream_vtable_t dc_bluetooth_vtable = {
 	sizeof(dc_socket_t),
 	dc_socket_set_timeout, /* set_timeout */
+	NULL, /* set_latency */
 	NULL, /* set_break */
 	NULL, /* set_dtr */
 	NULL, /* set_rts */
 	NULL, /* get_lines */
 	dc_socket_get_available, /* get_available */
 	NULL, /* configure */
-	dc_socket_poll, /* poll */
 	dc_socket_read, /* read */
 	dc_socket_write, /* write */
-	dc_socket_ioctl, /* ioctl */
 	NULL, /* flush */
 	NULL, /* purge */
-	dc_socket_sleep, /* sleep */
+	NULL, /* sleep */
 	dc_socket_close, /* close */
 };

@ -229,7 +230,7 @@ dc_bluetooth_addr2str(dc_bluetooth_address_t address, char *str, size_t size)
 	if (str == NULL || size < DC_BLUETOOTH_SIZE)
 		return NULL;

-	int n = dc_platform_snprintf(str, size, "%02X:%02X:%02X:%02X:%02X:%02X",
+	int n = snprintf(str, size, "%02X:%02X:%02X:%02X:%02X:%02X",
 		(unsigned char)((address >> 40) & 0xFF),
 		(unsigned char)((address >> 32) & 0xFF),
 		(unsigned char)((address >> 24) & 0xFF),
@ -311,12 +312,6 @@ dc_bluetooth_iterator_new (dc_iterator_t **out, dc_context_t *context, dc_descri
 		return DC_STATUS_NOMEMORY;
 	}

-	// Initialize the socket library.
-	status = dc_socket_init (context);
-	if (status != DC_STATUS_SUCCESS) {
-		goto error_free;
-	}
-
 #ifdef _WIN32
 	WSAQUERYSET wsaq;
 	memset(&wsaq, 0, sizeof (wsaq));
@ -333,7 +328,7 @@ dc_bluetooth_iterator_new (dc_iterator_t **out, dc_context_t *context, dc_descri
 		} else {
 			SYSERROR (context, errcode);
 			status = dc_socket_syserror(errcode);
-			goto error_socket_exit;
+			goto error_free;
 		}
 	}

@ -345,7 +340,7 @@ dc_bluetooth_iterator_new (dc_iterator_t **out, dc_context_t *context, dc_descri
 		s_errcode_t errcode = S_ERRNO;
 		SYSERROR (context, errcode);
 		status = dc_socket_syserror(errcode);
-		goto error_socket_exit;
+		goto error_free;
 	}

 	// Open a socket to the bluetooth adapter.
@ -354,7 +349,7 @@ dc_bluetooth_iterator_new (dc_iterator_t **out, dc_context_t *context, dc_descri
 		s_errcode_t errcode = S_ERRNO;
 		SYSERROR (context, errcode);
 		status = dc_socket_syserror(errcode);
-		goto error_socket_exit;
+		goto error_free;
 	}

 	// Perform the bluetooth device discovery. The inquiry lasts for at
@ -374,7 +369,7 @@ dc_bluetooth_iterator_new (dc_iterator_t **out, dc_context_t *context, dc_descri
 	iterator->count = ndevices;
 	iterator->current = 0;
 #endif
-	iterator->descriptor = descriptor;
+	iterator->filter = dc_descriptor_get_filter (descriptor);

 	*out = (dc_iterator_t *) iterator;

@ -384,8 +379,6 @@ dc_bluetooth_iterator_new (dc_iterator_t **out, dc_context_t *context, dc_descri
 error_close:
 	hci_close_dev(fd);
 #endif
-error_socket_exit:
-	dc_socket_exit (context);
 error_free:
 	dc_iterator_deallocate ((dc_iterator_t *) iterator);
 	return status;
@ -454,7 +447,7 @@ dc_bluetooth_iterator_next (dc_iterator_t *abstract, void *out)
 		INFO (abstract->context, "Discover: address=" DC_ADDRESS_FORMAT ", name=%s",
 			address, name ? name : "");

-		if (!dc_descriptor_filter (iterator->descriptor, DC_TRANSPORT_BLUETOOTH, name)) {
+		if (iterator->filter && !iterator->filter (DC_TRANSPORT_BLUETOOTH, name)) {
 			continue;
 		}

@ -493,7 +486,6 @@ dc_bluetooth_iterator_free (dc_iterator_t *abstract)
 	bt_free(iterator->devices);
 	hci_close_dev(iterator->fd);
 #endif
-	dc_socket_exit (abstract->context);

 	return DC_STATUS_SUCCESS;
 }
--- a/src/buffer.c
+++ b/src/buffer.c
@ -231,72 +231,6 @@ dc_buffer_prepend (dc_buffer_t *buffer, const unsigned char data[], size_t size)
 }


-int
-dc_buffer_insert (dc_buffer_t *buffer, size_t offset, const unsigned char data[], size_t size)
-{
-	if (buffer == NULL)
-		return 0;
-
-	if (offset > buffer->size)
-		return 0;
-
-	size_t head = buffer->offset;
-	size_t tail = buffer->capacity - (buffer->offset + buffer->size);
-
-	unsigned char *ptr = buffer->data + buffer->offset;
-
-	if (size <= head) {
-		if (buffer->size)
-			memmove (ptr - size, ptr, offset);
-		buffer->offset -= size;
-	} else if (size <= tail) {
-		if (buffer->size)
-			memmove (ptr + offset + size, ptr + offset, buffer->size - offset);
-	} else if (size <= tail + head) {
-		size_t n = buffer->size + size;
-		size_t available = buffer->capacity - n;
-
-		size_t tmp_offset = head > tail ? available : 0;
-
-		unsigned char *tmp = buffer->data;
-
-		if (buffer->size) {
-			memmove (tmp + tmp_offset, ptr, offset);
-			memmove (tmp + tmp_offset + offset + size, ptr + offset, buffer->size - offset);
-		}
-
-		buffer->offset = tmp_offset;
-	} else {
-		size_t n = buffer->size + size;
-		size_t capacity = dc_buffer_expand_calc (buffer, n);
-		size_t available = capacity - n;
-
-		size_t tmp_offset = head > tail ? available : 0;
-
-		unsigned char *tmp = (unsigned char *) malloc (capacity);
-		if (tmp == NULL)
-			return 0;
-
-		if (buffer->size) {
-			memcpy (tmp + tmp_offset, ptr, offset);
-			memcpy (tmp + tmp_offset + offset + size, ptr + offset, buffer->size - offset);
-		}
-
-		free (buffer->data);
-		buffer->data = tmp;
-		buffer->capacity = capacity;
-		buffer->offset = tmp_offset;
-	}
-
-	if (size)
-		memcpy (buffer->data + buffer->offset + offset, data, size);
-
-	buffer->size += size;
-
-	return 1;
-}
-
-
 int
 dc_buffer_slice (dc_buffer_t *buffer, size_t offset, size_t size)
 {
--- a/src/checksum.c
+++ b/src/checksum.c
@ -68,13 +68,8 @@ checksum_xor_uint8 (const unsigned char data[], unsigned int size, unsigned char
 }


-/*
- * Polynomial: 0x1021
- * RefIn: False
- * RefOut: False
- */
 unsigned short
-checksum_crc16_ccitt (const unsigned char data[], unsigned int size, unsigned short init, unsigned short xorout)
+checksum_crc_ccitt_uint16 (const unsigned char data[], unsigned int size)
 {
 	static const unsigned short crc_ccitt_table[] = {
 		0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
@ -111,174 +106,15 @@ checksum_crc16_ccitt (const unsigned char data[], unsigned int size, unsigned sh
 		0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
 	};

-	unsigned short crc = init;
+	unsigned short crc = 0xffff;
 	for (unsigned int i = 0; i < size; ++i)
 		crc = (crc << 8) ^ crc_ccitt_table[(crc >> 8) ^ data[i]];

-	return crc ^ xorout;
+	return crc;
 }

-
-/*
- * Polynomial: 0x1021
- * RefIn: True
- * RefOut: True
- */
-unsigned short
-checksum_crc16r_ccitt (const unsigned char data[], unsigned int size, unsigned short init, unsigned short xorout)
-{
-	static const unsigned short crc_ccitt_table[] = {
-		0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
-		0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
-		0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
-		0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
-		0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
-		0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
-		0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
-		0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
-		0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
-		0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
-		0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
-		0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
-		0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
-		0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
-		0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
-		0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
-		0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
-		0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
-		0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
-		0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
-		0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
-		0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
-		0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
-		0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
-		0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
-		0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
-		0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
-		0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
-		0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
-		0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
-		0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
-		0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
-	};
-
-	unsigned short crc = init;
-	for (unsigned int i = 0; i < size; ++i)
-		crc = (crc >> 8) ^ crc_ccitt_table[(crc ^ data[i]) & 0xff];
-
-	return crc ^ xorout;
-}
-
-/*
- * Polynomial: 0x8005
- * RefIn: False
- * RefOut: False
- */
-unsigned short
-checksum_crc16_ansi (const unsigned char data[], unsigned int size, unsigned short init, unsigned short xorout)
-{
-	static const unsigned short crc_ccitt_table[] = {
-		0x0000, 0x8005, 0x800f, 0x000a, 0x801b, 0x001e, 0x0014, 0x8011,
-		0x8033, 0x0036, 0x003c, 0x8039, 0x0028, 0x802d, 0x8027, 0x0022,
-		0x8063, 0x0066, 0x006c, 0x8069, 0x0078, 0x807d, 0x8077, 0x0072,
-		0x0050, 0x8055, 0x805f, 0x005a, 0x804b, 0x004e, 0x0044, 0x8041,
-		0x80c3, 0x00c6, 0x00cc, 0x80c9, 0x00d8, 0x80dd, 0x80d7, 0x00d2,
-		0x00f0, 0x80f5, 0x80ff, 0x00fa, 0x80eb, 0x00ee, 0x00e4, 0x80e1,
-		0x00a0, 0x80a5, 0x80af, 0x00aa, 0x80bb, 0x00be, 0x00b4, 0x80b1,
-		0x8093, 0x0096, 0x009c, 0x8099, 0x0088, 0x808d, 0x8087, 0x0082,
-		0x8183, 0x0186, 0x018c, 0x8189, 0x0198, 0x819d, 0x8197, 0x0192,
-		0x01b0, 0x81b5, 0x81bf, 0x01ba, 0x81ab, 0x01ae, 0x01a4, 0x81a1,
-		0x01e0, 0x81e5, 0x81ef, 0x01ea, 0x81fb, 0x01fe, 0x01f4, 0x81f1,
-		0x81d3, 0x01d6, 0x01dc, 0x81d9, 0x01c8, 0x81cd, 0x81c7, 0x01c2,
-		0x0140, 0x8145, 0x814f, 0x014a, 0x815b, 0x015e, 0x0154, 0x8151,
-		0x8173, 0x0176, 0x017c, 0x8179, 0x0168, 0x816d, 0x8167, 0x0162,
-		0x8123, 0x0126, 0x012c, 0x8129, 0x0138, 0x813d, 0x8137, 0x0132,
-		0x0110, 0x8115, 0x811f, 0x011a, 0x810b, 0x010e, 0x0104, 0x8101,
-		0x8303, 0x0306, 0x030c, 0x8309, 0x0318, 0x831d, 0x8317, 0x0312,
-		0x0330, 0x8335, 0x833f, 0x033a, 0x832b, 0x032e, 0x0324, 0x8321,
-		0x0360, 0x8365, 0x836f, 0x036a, 0x837b, 0x037e, 0x0374, 0x8371,
-		0x8353, 0x0356, 0x035c, 0x8359, 0x0348, 0x834d, 0x8347, 0x0342,
-		0x03c0, 0x83c5, 0x83cf, 0x03ca, 0x83db, 0x03de, 0x03d4, 0x83d1,
-		0x83f3, 0x03f6, 0x03fc, 0x83f9, 0x03e8, 0x83ed, 0x83e7, 0x03e2,
-		0x83a3, 0x03a6, 0x03ac, 0x83a9, 0x03b8, 0x83bd, 0x83b7, 0x03b2,
-		0x0390, 0x8395, 0x839f, 0x039a, 0x838b, 0x038e, 0x0384, 0x8381,
-		0x0280, 0x8285, 0x828f, 0x028a, 0x829b, 0x029e, 0x0294, 0x8291,
-		0x82b3, 0x02b6, 0x02bc, 0x82b9, 0x02a8, 0x82ad, 0x82a7, 0x02a2,
-		0x82e3, 0x02e6, 0x02ec, 0x82e9, 0x02f8, 0x82fd, 0x82f7, 0x02f2,
-		0x02d0, 0x82d5, 0x82df, 0x02da, 0x82cb, 0x02ce, 0x02c4, 0x82c1,
-		0x8243, 0x0246, 0x024c, 0x8249, 0x0258, 0x825d, 0x8257, 0x0252,
-		0x0270, 0x8275, 0x827f, 0x027a, 0x826b, 0x026e, 0x0264, 0x8261,
-		0x0220, 0x8225, 0x822f, 0x022a, 0x823b, 0x023e, 0x0234, 0x8231,
-		0x8213, 0x0216, 0x021c, 0x8219, 0x0208, 0x820d, 0x8207, 0x0202
-	};
-
-	unsigned short crc = init;
-	for (unsigned int i = 0; i < size; ++i)
-		crc = (crc << 8) ^ crc_ccitt_table[(crc >> 8) ^ data[i]];
-
-	return crc ^ xorout;
-}
-
-/*
- * Polynomial: 0x8005
- * RefIn: True
- * RefOut: True
- */
-unsigned short
-checksum_crc16r_ansi (const unsigned char data[], unsigned int size, unsigned short init, unsigned short xorout)
-{
-	static const unsigned short crc_ccitt_table[] = {
-		0x0000, 0xc0c1, 0xc181, 0x0140, 0xc301, 0x03c0, 0x0280, 0xc241,
-		0xc601, 0x06c0, 0x0780, 0xc741, 0x0500, 0xc5c1, 0xc481, 0x0440,
-		0xcc01, 0x0cc0, 0x0d80, 0xcd41, 0x0f00, 0xcfc1, 0xce81, 0x0e40,
-		0x0a00, 0xcac1, 0xcb81, 0x0b40, 0xc901, 0x09c0, 0x0880, 0xc841,
-		0xd801, 0x18c0, 0x1980, 0xd941, 0x1b00, 0xdbc1, 0xda81, 0x1a40,
-		0x1e00, 0xdec1, 0xdf81, 0x1f40, 0xdd01, 0x1dc0, 0x1c80, 0xdc41,
-		0x1400, 0xd4c1, 0xd581, 0x1540, 0xd701, 0x17c0, 0x1680, 0xd641,
-		0xd201, 0x12c0, 0x1380, 0xd341, 0x1100, 0xd1c1, 0xd081, 0x1040,
-		0xf001, 0x30c0, 0x3180, 0xf141, 0x3300, 0xf3c1, 0xf281, 0x3240,
-		0x3600, 0xf6c1, 0xf781, 0x3740, 0xf501, 0x35c0, 0x3480, 0xf441,
-		0x3c00, 0xfcc1, 0xfd81, 0x3d40, 0xff01, 0x3fc0, 0x3e80, 0xfe41,
-		0xfa01, 0x3ac0, 0x3b80, 0xfb41, 0x3900, 0xf9c1, 0xf881, 0x3840,
-		0x2800, 0xe8c1, 0xe981, 0x2940, 0xeb01, 0x2bc0, 0x2a80, 0xea41,
-		0xee01, 0x2ec0, 0x2f80, 0xef41, 0x2d00, 0xedc1, 0xec81, 0x2c40,
-		0xe401, 0x24c0, 0x2580, 0xe541, 0x2700, 0xe7c1, 0xe681, 0x2640,
-		0x2200, 0xe2c1, 0xe381, 0x2340, 0xe101, 0x21c0, 0x2080, 0xe041,
-		0xa001, 0x60c0, 0x6180, 0xa141, 0x6300, 0xa3c1, 0xa281, 0x6240,
-		0x6600, 0xa6c1, 0xa781, 0x6740, 0xa501, 0x65c0, 0x6480, 0xa441,
-		0x6c00, 0xacc1, 0xad81, 0x6d40, 0xaf01, 0x6fc0, 0x6e80, 0xae41,
-		0xaa01, 0x6ac0, 0x6b80, 0xab41, 0x6900, 0xa9c1, 0xa881, 0x6840,
-		0x7800, 0xb8c1, 0xb981, 0x7940, 0xbb01, 0x7bc0, 0x7a80, 0xba41,
-		0xbe01, 0x7ec0, 0x7f80, 0xbf41, 0x7d00, 0xbdc1, 0xbc81, 0x7c40,
-		0xb401, 0x74c0, 0x7580, 0xb541, 0x7700, 0xb7c1, 0xb681, 0x7640,
-		0x7200, 0xb2c1, 0xb381, 0x7340, 0xb101, 0x71c0, 0x7080, 0xb041,
-		0x5000, 0x90c1, 0x9181, 0x5140, 0x9301, 0x53c0, 0x5280, 0x9241,
-		0x9601, 0x56c0, 0x5780, 0x9741, 0x5500, 0x95c1, 0x9481, 0x5440,
-		0x9c01, 0x5cc0, 0x5d80, 0x9d41, 0x5f00, 0x9fc1, 0x9e81, 0x5e40,
-		0x5a00, 0x9ac1, 0x9b81, 0x5b40, 0x9901, 0x59c0, 0x5880, 0x9841,
-		0x8801, 0x48c0, 0x4980, 0x8941, 0x4b00, 0x8bc1, 0x8a81, 0x4a40,
-		0x4e00, 0x8ec1, 0x8f81, 0x4f40, 0x8d01, 0x4dc0, 0x4c80, 0x8c41,
-		0x4400, 0x84c1, 0x8581, 0x4540, 0x8701, 0x47c0, 0x4680, 0x8641,
-		0x8201, 0x42c0, 0x4380, 0x8341, 0x4100, 0x81c1, 0x8081, 0x4040
-	};
-
-	unsigned short crc = init;
-	for (unsigned int i = 0; i < size; ++i)
-		crc = (crc >> 8) ^ crc_ccitt_table[(crc ^ data[i]) & 0xff];
-
-	return crc ^ xorout;
-}
-
-
-/*
- * Polynomial: 0x04C11DB7
- * Init: 0xffffffff
- * XorOut: 0xffffffff
- * RefIn: True
- * RefOut: True
- */
 unsigned int
-checksum_crc32r (const unsigned char data[], unsigned int size)
+checksum_crc32 (const unsigned char data[], unsigned int size)
 {
 	static const unsigned int crc_table[] = {
 		0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
@ -321,56 +157,3 @@ checksum_crc32r (const unsigned char data[], unsigned int size)

 	return crc ^ 0xffffffff;
 }
-
-
-/*
- * Polynomial: 0x04C11DB7
- * Init: 0xffffffff
- * XorOut: 0xffffffff
- * RefIn: False
- * RefOut: False
- */
-unsigned int
-checksum_crc32 (const unsigned char data[], unsigned int size)
-{
-	static const unsigned int crc_table[] = {
-		0x00000000, 0x04C11DB7, 0x09823B6E, 0x0D4326D9, 0x130476DC, 0x17C56B6B, 0x1A864DB2, 0x1E475005,
-		0x2608EDB8, 0x22C9F00F, 0x2F8AD6D6, 0x2B4BCB61, 0x350C9B64, 0x31CD86D3, 0x3C8EA00A, 0x384FBDBD,
-		0x4C11DB70, 0x48D0C6C7, 0x4593E01E, 0x4152FDA9, 0x5F15ADAC, 0x5BD4B01B, 0x569796C2, 0x52568B75,
-		0x6A1936C8, 0x6ED82B7F, 0x639B0DA6, 0x675A1011, 0x791D4014, 0x7DDC5DA3, 0x709F7B7A, 0x745E66CD,
-		0x9823B6E0, 0x9CE2AB57, 0x91A18D8E, 0x95609039, 0x8B27C03C, 0x8FE6DD8B, 0x82A5FB52, 0x8664E6E5,
-		0xBE2B5B58, 0xBAEA46EF, 0xB7A96036, 0xB3687D81, 0xAD2F2D84, 0xA9EE3033, 0xA4AD16EA, 0xA06C0B5D,
-		0xD4326D90, 0xD0F37027, 0xDDB056FE, 0xD9714B49, 0xC7361B4C, 0xC3F706FB, 0xCEB42022, 0xCA753D95,
-		0xF23A8028, 0xF6FB9D9F, 0xFBB8BB46, 0xFF79A6F1, 0xE13EF6F4, 0xE5FFEB43, 0xE8BCCD9A, 0xEC7DD02D,
-		0x34867077, 0x30476DC0, 0x3D044B19, 0x39C556AE, 0x278206AB, 0x23431B1C, 0x2E003DC5, 0x2AC12072,
-		0x128E9DCF, 0x164F8078, 0x1B0CA6A1, 0x1FCDBB16, 0x018AEB13, 0x054BF6A4, 0x0808D07D, 0x0CC9CDCA,
-		0x7897AB07, 0x7C56B6B0, 0x71159069, 0x75D48DDE, 0x6B93DDDB, 0x6F52C06C, 0x6211E6B5, 0x66D0FB02,
-		0x5E9F46BF, 0x5A5E5B08, 0x571D7DD1, 0x53DC6066, 0x4D9B3063, 0x495A2DD4, 0x44190B0D, 0x40D816BA,
-		0xACA5C697, 0xA864DB20, 0xA527FDF9, 0xA1E6E04E, 0xBFA1B04B, 0xBB60ADFC, 0xB6238B25, 0xB2E29692,
-		0x8AAD2B2F, 0x8E6C3698, 0x832F1041, 0x87EE0DF6, 0x99A95DF3, 0x9D684044, 0x902B669D, 0x94EA7B2A,
-		0xE0B41DE7, 0xE4750050, 0xE9362689, 0xEDF73B3E, 0xF3B06B3B, 0xF771768C, 0xFA325055, 0xFEF34DE2,
-		0xC6BCF05F, 0xC27DEDE8, 0xCF3ECB31, 0xCBFFD686, 0xD5B88683, 0xD1799B34, 0xDC3ABDED, 0xD8FBA05A,
-		0x690CE0EE, 0x6DCDFD59, 0x608EDB80, 0x644FC637, 0x7A089632, 0x7EC98B85, 0x738AAD5C, 0x774BB0EB,
-		0x4F040D56, 0x4BC510E1, 0x46863638, 0x42472B8F, 0x5C007B8A, 0x58C1663D, 0x558240E4, 0x51435D53,
-		0x251D3B9E, 0x21DC2629, 0x2C9F00F0, 0x285E1D47, 0x36194D42, 0x32D850F5, 0x3F9B762C, 0x3B5A6B9B,
-		0x0315D626, 0x07D4CB91, 0x0A97ED48, 0x0E56F0FF, 0x1011A0FA, 0x14D0BD4D, 0x19939B94, 0x1D528623,
-		0xF12F560E, 0xF5EE4BB9, 0xF8AD6D60, 0xFC6C70D7, 0xE22B20D2, 0xE6EA3D65, 0xEBA91BBC, 0xEF68060B,
-		0xD727BBB6, 0xD3E6A601, 0xDEA580D8, 0xDA649D6F, 0xC423CD6A, 0xC0E2D0DD, 0xCDA1F604, 0xC960EBB3,
-		0xBD3E8D7E, 0xB9FF90C9, 0xB4BCB610, 0xB07DABA7, 0xAE3AFBA2, 0xAAFBE615, 0xA7B8C0CC, 0xA379DD7B,
-		0x9B3660C6, 0x9FF77D71, 0x92B45BA8, 0x9675461F, 0x8832161A, 0x8CF30BAD, 0x81B02D74, 0x857130C3,
-		0x5D8A9099, 0x594B8D2E, 0x5408ABF7, 0x50C9B640, 0x4E8EE645, 0x4A4FFBF2, 0x470CDD2B, 0x43CDC09C,
-		0x7B827D21, 0x7F436096, 0x7200464F, 0x76C15BF8, 0x68860BFD, 0x6C47164A, 0x61043093, 0x65C52D24,
-		0x119B4BE9, 0x155A565E, 0x18197087, 0x1CD86D30, 0x029F3D35, 0x065E2082, 0x0B1D065B, 0x0FDC1BEC,
-		0x3793A651, 0x3352BBE6, 0x3E119D3F, 0x3AD08088, 0x2497D08D, 0x2056CD3A, 0x2D15EBE3, 0x29D4F654,
-		0xC5A92679, 0xC1683BCE, 0xCC2B1D17, 0xC8EA00A0, 0xD6AD50A5, 0xD26C4D12, 0xDF2F6BCB, 0xDBEE767C,
-		0xE3A1CBC1, 0xE760D676, 0xEA23F0AF, 0xEEE2ED18, 0xF0A5BD1D, 0xF464A0AA, 0xF9278673, 0xFDE69BC4,
-		0x89B8FD09, 0x8D79E0BE, 0x803AC667, 0x84FBDBD0, 0x9ABC8BD5, 0x9E7D9662, 0x933EB0BB, 0x97FFAD0C,
-		0xAFB010B1, 0xAB710D06, 0xA6322BDF, 0xA2F33668, 0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4,
-	};
-
-	unsigned int crc = 0xffffffff;
-	for (unsigned int i = 0; i < size; ++i)
-		crc = crc_table[((crc >> 24) ^ data[i]) & 0xFF] ^ (crc << 8);
-
-	return crc ^ 0xffffffff;
-}
--- a/src/checksum.h
+++ b/src/checksum.h
@ -39,19 +39,7 @@ unsigned char
 checksum_xor_uint8 (const unsigned char data[], unsigned int size, unsigned char init);

 unsigned short
-checksum_crc16_ccitt (const unsigned char data[], unsigned int size, unsigned short init, unsigned short xorout);
-
-unsigned short
-checksum_crc16r_ccitt (const unsigned char data[], unsigned int size, unsigned short init, unsigned short xorout);
-
-unsigned short
-checksum_crc16_ansi (const unsigned char data[], unsigned int size, unsigned short init, unsigned short xorout);
-
-unsigned short
-checksum_crc16r_ansi (const unsigned char data[], unsigned int size, unsigned short init, unsigned short xorout);
-
-unsigned int
-checksum_crc32r (const unsigned char data[], unsigned int size);
+checksum_crc_ccitt_uint16 (const unsigned char data[], unsigned int size);

 unsigned int
 checksum_crc32 (const unsigned char data[], unsigned int size);
--- a/src/citizen_aqualand.c
+++ b/src/citizen_aqualand.c
@ -31,8 +31,6 @@

 #define ISINSTANCE(device) dc_device_isinstance((device), &citizen_aqualand_device_vtable)

-#define SZ_HEADER 32
-
 typedef struct citizen_aqualand_device_t {
 	dc_device_t base;
 	dc_iostream_t *iostream;
@ -202,12 +200,6 @@ citizen_aqualand_device_foreach (dc_device_t *abstract, dc_dive_callback_t callb
 	unsigned char *data = dc_buffer_get_data (buffer);
 	unsigned int   size = dc_buffer_get_size (buffer);

-	if (size < SZ_HEADER) {
-		ERROR (abstract->context, "Dive header is too small (%u).", size);
-		dc_buffer_free (buffer);
-		return DC_STATUS_DATAFORMAT;
-	}
-
 	if (callback && memcmp (data + 0x05, device->fingerprint, sizeof (device->fingerprint)) != 0) {
 		callback (data, size, data + 0x05, sizeof (device->fingerprint), userdata);
 	}
--- a/src/citizen_aqualand.h
+++ b/src/citizen_aqualand.h
@ -35,7 +35,7 @@ dc_status_t
 citizen_aqualand_device_open (dc_device_t **device, dc_context_t *context, dc_iostream_t *iostream);

 dc_status_t
-citizen_aqualand_parser_create (dc_parser_t **parser, dc_context_t *context, const unsigned char data[], size_t size);
+citizen_aqualand_parser_create (dc_parser_t **parser, dc_context_t *context);

 #ifdef __cplusplus
 }
--- a/src/citizen_aqualand_parser.c
+++ b/src/citizen_aqualand_parser.c
@ -36,6 +36,7 @@ typedef struct citizen_aqualand_parser_t {
 	dc_parser_t base;
 } citizen_aqualand_parser_t;

+static dc_status_t citizen_aqualand_parser_set_data (dc_parser_t *abstract, const unsigned char *data, unsigned int size);
 static dc_status_t citizen_aqualand_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetime);
 static dc_status_t citizen_aqualand_parser_get_field (dc_parser_t *abstract, dc_field_type_t type, unsigned int flags, void *value);
 static dc_status_t citizen_aqualand_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callback_t callback, void *userdata);
@ -43,9 +44,7 @@ static dc_status_t citizen_aqualand_parser_samples_foreach (dc_parser_t *abstrac
 static const dc_parser_vtable_t citizen_aqualand_parser_vtable = {
 	sizeof(citizen_aqualand_parser_t),
 	DC_FAMILY_CITIZEN_AQUALAND,
-	NULL, /* set_clock */
-	NULL, /* set_atmospheric */
-	NULL, /* set_density */
+	citizen_aqualand_parser_set_data, /* set_data */
 	citizen_aqualand_parser_get_datetime, /* datetime */
 	citizen_aqualand_parser_get_field, /* fields */
 	citizen_aqualand_parser_samples_foreach, /* samples_foreach */
@ -54,7 +53,7 @@ static const dc_parser_vtable_t citizen_aqualand_parser_vtable = {


 dc_status_t
-citizen_aqualand_parser_create (dc_parser_t **out, dc_context_t *context, const unsigned char data[], size_t size)
+citizen_aqualand_parser_create (dc_parser_t **out, dc_context_t *context)
 {
 	citizen_aqualand_parser_t *parser = NULL;

@ -62,7 +61,7 @@ citizen_aqualand_parser_create (dc_parser_t **out, dc_context_t *context, const
 		return DC_STATUS_INVALIDARGS;

 	// Allocate memory.
-	parser = (citizen_aqualand_parser_t *) dc_parser_allocate (context, &citizen_aqualand_parser_vtable, data, size);
+	parser = (citizen_aqualand_parser_t *) dc_parser_allocate (context, &citizen_aqualand_parser_vtable);
 	if (parser == NULL) {
 		ERROR (context, "Failed to allocate memory.");
 		return DC_STATUS_NOMEMORY;
@ -74,6 +73,13 @@ citizen_aqualand_parser_create (dc_parser_t **out, dc_context_t *context, const
 }


+static dc_status_t
+citizen_aqualand_parser_set_data (dc_parser_t *abstract, const unsigned char *data, unsigned int size)
+{
+	return DC_STATUS_SUCCESS;
+}
+
+
 static dc_status_t
 citizen_aqualand_parser_get_datetime (dc_parser_t *abstract, dc_datetime_t *datetime)
 {
@ -232,15 +238,15 @@ citizen_aqualand_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callba

 		// Time
 		time += interval;
-		sample.time = time * 1000;
-		if (callback) callback (DC_SAMPLE_TIME, &sample, userdata);
+		sample.time = time;
+		if (callback) callback (DC_SAMPLE_TIME, sample, userdata);

 		// Depth
 		if (metric)
 			sample.depth = depth / 10.0;
 		else
 			sample.depth = depth * FEET;
-		if (callback) callback (DC_SAMPLE_DEPTH, &sample, userdata);
+		if (callback) callback (DC_SAMPLE_DEPTH, sample, userdata);

 		// Temperature
 		if (time % 300 == 0) {
@ -251,7 +257,7 @@ citizen_aqualand_parser_samples_foreach (dc_parser_t *abstract, dc_sample_callba
 					sample.temperature = temperature / 10.0;
 				else
 					sample.temperature = (temperature - 32.0) * (5.0 / 9.0);
-				if (callback) callback (DC_SAMPLE_TEMPERATURE, &sample, userdata);
+				if (callback) callback (DC_SAMPLE_TEMPERATURE, sample, userdata);
 			}
 		}
 	}
--- a/src/cochran_commander.c
+++ b/src/cochran_commander.c
@ -30,6 +30,8 @@
 #include "ringbuffer.h"
 #include "rbstream.h"

+#define C_ARRAY_SIZE(array) (sizeof (array) / sizeof *(array))
+
 #define MAXRETRIES 2

 #define COCHRAN_MODEL_COMMANDER_TM 0
@ -39,8 +41,6 @@
 #define COCHRAN_MODEL_EMC_16 4
 #define COCHRAN_MODEL_EMC_20 5

-#define UNDEFINED 0xFFFFFFFF
-
 typedef enum cochran_endian_t {
 	ENDIAN_LE,
 	ENDIAN_BE,
@ -57,8 +57,8 @@ typedef struct cochran_data_t {
 	unsigned char *logbook;

 	unsigned short int dive_count;
-	unsigned int fp_dive_num;
-	unsigned int invalid_profile_dive_num;
+	int fp_dive_num;
+	int invalid_profile_dive_num;

 	unsigned int logbook_size;
 } cochran_data_t;
@ -621,17 +621,18 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d
 	// We track profile ringbuffer usage to determine which dives have profile data
 	int profile_capacity_remaining = device->layout->rb_profile_end - device->layout->rb_profile_begin;

-	unsigned int dive_count = 0;
-	data->fp_dive_num = UNDEFINED;
+	int dive_count = -1;
+	data->fp_dive_num = -1;

 	// Start at end of log
 	if (data->dive_count < device->layout->rb_logbook_entry_count)
 		dive_count = data->dive_count;
 	else
 		dive_count = device->layout->rb_logbook_entry_count;
+	dive_count--;

 	unsigned int sample_read_size = 0;
-	data->invalid_profile_dive_num = UNDEFINED;
+	data->invalid_profile_dive_num = -1;

 	// Remove the pre-dive events that occur after the last dive
 	unsigned int rb_head_ptr = 0;
@ -675,7 +676,7 @@ cochran_commander_find_fingerprint(cochran_commander_device_t *device, cochran_d

 	// Loop through dives to find FP, Accumulate profile data size,
 	// and find the last dive with invalid profile
-	for (unsigned int i = 0; i < dive_count; ++i) {
+	for (unsigned int i = 0; i <= dive_count; ++i) {
 		unsigned int idx = (device->layout->rb_logbook_entry_count + head_dive - (i + 1)) % device->layout->rb_logbook_entry_count;

 		unsigned char *log_entry = data->logbook + idx * device->layout->rb_logbook_entry_size;
@ -952,7 +953,7 @@ cochran_commander_device_foreach (dc_device_t *abstract, dc_dive_callback_t call
 	}

 	// Change tail to dive following the fingerprint dive.
-	if (data.fp_dive_num != UNDEFINED)
+	if (data.fp_dive_num > -1)
 		tail_dive = (data.fp_dive_num + 1) % layout->rb_logbook_entry_count;

 	// Number of dives to read
--- a/src/cochran_commander.h
+++ b/src/cochran_commander.h
@ -35,7 +35,7 @@ dc_status_t
 cochran_commander_device_open (dc_device_t **device, dc_context_t *context, dc_iostream_t *iostream);

 dc_status_t
-cochran_commander_parser_create (dc_parser_t **parser, dc_context_t *context, const unsigned char data[], size_t size, unsigned int model);
+cochran_commander_parser_create (dc_parser_t **parser, dc_context_t *context, unsigned int model);

 #ifdef __cplusplus
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dirk Hohndel	b5f53eeb1f	Merge git://github.com/libdivecomputer/libdivecomputer into NG-test	2018-04-19 07:59:50 -07:00
Linus Torvalds	5a0f603770	Shearwater: add extended information parsing This adds the string field interface to the Shearwater family of dive computers. That includes proper serial number formatting, but it also has a lot of new fields for battery information (both the dive computer itself and the transmitter) but also deco model information. Much of the deco model cases come from Anton Lundin in the original subsurface branch, and Dirk Hohndel added the battery type and serial number and firmware version data. And I ended up massaging it even in that original branch, so it blamed me for all these lines even back there. The sign-offs from Dirk and Anton are from the original commits. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00
Linus Torvalds	6e71b174e0	Suunto EON Steel/Core: add extended information parsing This adds the string field interface to the Suunto EON Steel and EON Core. This is actually a big deal, because it gets rid of all the ad-hoc string parsing, and actually just uses the strings that the EON Steel events and warnings natively use. It also reports the severity of the notification/warning/alarm, so that Subsurface can then use the proper icon. An event isn't just an event, there's a big difference between a warning and just a notification. It also fills in the tank information data for closed-circuit cylinder use. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00
Dirk Hohndel	b0d72cd74c	Suunto D9 family: add extended information parsing This adds the string field interface to the Suunto D9 family. It's really just the proper serial number handling. From Dirk's original commit: "We have the correct firmware in the devinfo, but that's the firmware the dive computer is on NOW, not necessarily the firmware it was using when recording the dive" so thus just serial number. Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00
Dirk Hohndel	72c99a6dcb	Oceanic Atom2: add extended string information parsing This adds the string field interface to the Oceanic Atom2 family, including the proper serial number handling. Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00
Dirk Hohndel	9a38a1ac6d	Heinrichs Weikamp OSTC: add extended information parsing This adds the string field interface to the HW OSTC family, including the proper serial number handling. The deco model information was done by Anton Lundin in the original subsurface branch, and the salinity, serial number, battery voltage and desat information was added by Dirk Hohndel. Jan Mulder added the battery percentage. [ The sign-offs have been taken from the original commits in that old subsurface branch, and I'm marking Dirk as the main author because on the whole most of the lines come from him - Linus ] Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Jan Mulder <jlmulder@xs4all.nl> Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00
Linus Torvalds	a6637442b7	Make dc_parser_new() pass in the serial number to +dc_parser_new_internal The libdivecomputer serial number handling is very very messy. There are multiple issues that make it messy: - it's not actually figured out at parse-time, it's figured out at download time and passed up through the DC_EVENT_DEVINFO as part of the devinfo structure. - it's passed around as an "unsigned in" in the devinfo structure, which is entirely useless to anybody but libdivecomputer, since a serial number isn't actually a number, but a string, and the format of the string depends on the dive computer. - it is not passed to the parser, so the parser can't do a better job at it later. But it turns out that the sane "create new parser" helper function does actually get it, as part of the "devinfo" that is passed to it. So as long as you use that sane interface, we can now pass it in to the actual parser creation, and then the dive computer parsers that want to do a reasonable job of actually generating a real serial number string can now save it off and do so. This just adds the infrastructure to make this possible. I'll do the dive computers one by one. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00
Linus Torvalds	0ae143e27f	Shearwater Petrel: make the hardware ID decoding a bit easier to read Dirk seems to have some documentation about the different ID's, plus it just makes sense to order the switch statement by number. This is partly based on Dirk's original commit to do the different model numbers, with various changes over time due to merge conflict resolution. Dirk's sign-off comes from Dirks commit in the original subsurface branch. Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00
Dirk Hohndel	2d3b25cf8e	Atomics Cobalt: use the new DC string fields Not a lot of fields, but give the serial number in the proper format, and other version information (Software version and bootloader version). And the Nofly time that the dive computer reports. Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00
Linus Torvalds	bd1999134f	Add subsurface-specific cylinder descriptor extension This extends the libdivecomputer notion of "dc_tankvolume_t" to not just have the tank volume type (imperial or metric), but be a "dc_tankinfo_t" that shows other information about the cylinder. The imperial-vs-metric data remains the same two values: 1 - metric 2 - imperial but instead of being an enumeration of volume types, it is extended to a bitmap of tank information, and the other bits currently are 4 - CC diluent cylinder 8 - CC O2 cylinder with possible future extensions (bailout gas, perhaps). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00
Linus Torvalds	927d272e0c	Add subsurface-specific DC field extension: descriptor/value strings The default libdivecomputer fields are good for structured data that has a well-defined format, like the cylinder information, or the temperature data. But it is entirely useless for miscellaneous divecomputer-specific information, where there is no standard way of representing the data across different kinds of dive computers. Examples of this include simple things like deco calculation algorithm (what kind of Buehlmann, gradient factor information or is it some vendor-specific mode?) and even something as trivial as a serial number. No, serial numbers aren't numbers. They are strings. Really. But this also includes much more complex data that is really specific to a particular dive computer or family: what the battery status is for the dive computer or the wireless transmitters it is connected to (sometimes it's a voltage, sometimes it's a percentage, sometimes it's just "good" or "marginal"). It also includes random incidental information like firmware version numbers (again, these are strings, not numbers, despite the name) or dive mode and personal adjustment information. So allow the dive computer to just give "extra information" in the form of an array of { key, value } string pairs. For my Perdix AI the information could be { "Serial", "370d1f24" } { "FW Version", "44" } { "Deco model", "GF 40/85" } { "Battery type", "3.6V Saft" } { "Battery at end", "3.4 V" } and for my EON Steel with three wireless transmitters connected it can look like this: { "Serial", "1742104730" } { "FW Version", "1.6.5" } { "HW Version", "70.3.0" } { "Battery at start", "Charge: 83%, Voltage: 4.012V" } { "Deco algorithm", "Suunto Fused RGBM" } { "Personal Adjustment", "P-2" } { "Battery at end", "Charge: 79%, Voltage: 3.977V" } { "Dive Mode", "Trimix" } { "Desaturation Time", "7:53" } { "Transmitter ID", "1519107801" } { "Transmitter Battery at start", "87 %" } { "Transmitter Battery at end", "87 %" } { "Transmitter ID", "1550110028" } { "Transmitter Battery at start", "100 %" } { "Transmitter Battery at end", "100 %" } { "Transmitter ID", "1719102387" } { "Transmitter Battery at start", "100 %" } { "Transmitter Battery at end", "100 %" } so this data is inherently unstructured and dependent on the dive computer, but quite relevant to the diver. Subsurface shows this in the "Extra Info" panel for each dive computer. Also teach the example output-xml code about the new string field extension. That example output-xml code was written by Anton Lundin in the old Subsurface branch, and signed-off-by Dirk. The sign-offs here are taken from that original work. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00
Linus Torvalds	820b3c0ff5	Add subsurface-specific event extension: event strings and severity We _really_ find the standard libdivecomputer event enumeration much too inflexible and not giving us enough useful information. This is particularly noticeable with the Suunto EON Steel/Core, where there are no fixed event enumerations, but instead the dive computer literally gives you event strings. Do the same thing in the libdivecomputer interface: allow an event of type SAMPLE_EVENT_STRING which instead of the useless "value" gives an actual string describing the event. Also, extend the "flags" field to have not just a NONE/BEGIN/END marker, but a severity level. The severity level is 3 bits, so 0-7, with the meaning being 0 - 'no severity info' 1 - state change (so 'surface' event or similar - don't even show it by default) 2 - notification (informational, eg "safety stop", "tank change") 3 - warning ("ascent speed") 4 - alarm (some actual dive violation). 5-7: future expansion? Think of 0 as "legacy - missing information", 1 as "internal DC thing", and 2-4 as (green-yellow-red). This makes it possible for the dive computer back-end to give the user actual useful information for events. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00
Linus Torvalds	ee802410e3	Add subsurface-specific build setup This changes the dc_version_suffix to show that this is the subsurface 'next generation' branch, and does minor tweaks to the build system: we add the 'build' subdirectory to the .gitignore branch because that's where we typically do our builds, and we tweak the default compiler warning flags to not be as annoying. No real semantic changes. This is partially based off patches in the original Subsurface-branch by Dirk Hohndel (configure.ac) and Jan Mulder (gitignore). The sign-offs for those come from those patches: Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Signed-off-by: Jan Mulder <jlmulder@xs4all.nl> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>	2018-04-17 12:28:33 -07:00