Linus Torvalds a1472a7247 Merge branch 'Subsurface-branch' of github.com:Subsurface-divelog/libdc into Subsurface-branch ...

Merge with Dirk's cleanups.

I had intentionally not updated my tree while I was pondering the
upstream merge with Jef's iostream changes, so I didn't have Dirk's
cleanups in my tree when I did that big merge.

This merge was trivial in comparison.

* 'Subsurface-branch' of github.com:Subsurface-divelog/libdc:
  Correctly determine git SHA if libdivecomputer is a git submodule
  Disable a couple of overly aggressive warnings
  Add configure flag to explicitly enable BLE support

2017-12-12 14:02:53 -08:00

..

aes.c

Workaround msvc lack of a stdint.h

2014-12-21 14:52:12 +01:00

aes.h

Workaround msvc lack of a stdint.h

2014-12-21 14:52:12 +01:00

array.c

Add support for Pre-21000 s/n Commander dive computers

2017-07-05 13:11:33 +02:00

array.h

Add support for Pre-21000 s/n Commander dive computers

2017-07-05 13:11:33 +02:00

atomics_cobalt_parser.c

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

atomics_cobalt.c

Add support for synchronizing the device clock

2017-08-18 23:17:33 +02:00

atomics_cobalt.h

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

bluetooth.c

Implement the serial communication functions as no-ops

2017-11-26 23:00:33 +01:00

bluetooth.h

Port the bluetooth code to the new I/O interface

2017-11-25 10:26:49 +01:00

buffer.c

Separate private and public headers.

2012-06-21 21:39:24 +02:00

checksum.c

Remove trailing whitespaces

2014-03-19 09:16:07 +01:00

checksum.h

Remove trailing whitespaces

2014-03-19 09:16:07 +01:00

citizen_aqualand_parser.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

citizen_aqualand.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

citizen_aqualand.h

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

cochran_commander_parser.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

cochran_commander.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

cochran_commander.h

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

common-private.h

Simplify the error handling in the close function.

2016-01-05 20:40:21 +01:00

common.c

Simplify the error handling in the close function.

2016-01-05 20:40:21 +01:00

context-private.h

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

context.c

Update the operations in 'custom_io' to consistent calling conventions

2017-06-27 13:38:45 -07:00

cressi_edy_parser.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

cressi_edy.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

cressi_edy.h

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

cressi_leonardo_parser.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

cressi_leonardo.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

cressi_leonardo.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

custom_io.c

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

custom.c

Add support for a custom I/O implementation

2017-11-26 10:40:34 +01:00

custom.h

Add support for a custom I/O implementation

2017-11-26 10:40:34 +01:00

datetime.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

descriptor.c

Add configure flag to explicitly enable BLE support

2017-12-04 13:42:25 -08:00

device-private.h

Add support for synchronizing the device clock

2017-08-18 23:17:33 +02:00

device.c

Merge tag 'v0.6.0' of git://git.libdivecomputer.org/libdivecomputer into Subsurface-branch

2017-12-04 10:18:23 -08:00

diverite_nitekq_parser.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

diverite_nitekq.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

diverite_nitekq.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

divesystem_idive_parser.c

Add support for semi-closed circuit diving

2017-11-30 09:03:46 +01:00

divesystem_idive.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

divesystem_idive.h

Remove unnecessary helper functions

2017-04-19 11:33:17 +02:00

hw_frog.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

hw_frog.h

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

hw_ostc3.c

Detect dives with invalid profile data

2017-11-30 09:03:46 +01:00

hw_ostc3.h

Merge git://git.libdivecomputer.org/libdivecomputer into Subsurface-branch

2017-04-29 16:37:40 -07:00

hw_ostc_parser.c

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

hw_ostc.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

hw_ostc.h

Merge git://git.libdivecomputer.org/libdivecomputer into Subsurface-branch

2017-04-29 16:37:40 -07:00

ihex.c

Fix a typo in the format string.

2014-03-14 09:44:10 +01:00

ihex.h

Add a parser for Intel HEX files.

2013-08-22 09:15:55 +02:00

iostream-private.h

Add a new abstract I/O interface

2017-11-25 10:26:49 +01:00

iostream.c

Add a new abstract I/O interface

2017-11-25 10:26:49 +01:00

irda.c

Implement the serial communication functions as no-ops

2017-11-26 23:00:33 +01:00

irda.h

Port the IrDA code to the new I/O interface

2017-11-25 10:26:49 +01:00

iterator-private.h

Add a generic iterator interface.

2012-06-21 21:42:37 +02:00

iterator.c

Add a generic iterator interface.

2012-06-21 21:42:37 +02:00

libdivecomputer.rc.in

Include the git commit SHA1 in the version number.

2012-12-27 22:00:35 +01:00

libdivecomputer.symbols

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

Makefile.am

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

mares_common.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

mares_common.h

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

mares_darwin_parser.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

mares_darwin.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

mares_darwin.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

mares_iconhd_parser.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

mares_iconhd.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

mares_iconhd.h

Remove unused parameters

2017-04-24 13:05:20 +02:00

mares_nemo_parser.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

mares_nemo.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

mares_nemo.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

mares_puck.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

mares_puck.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

oceanic_atom2_parser.c

Merge git://git.libdivecomputer.org/libdivecomputer into Subsurface-branch

2017-09-06 10:58:21 -07:00

oceanic_atom2.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

oceanic_atom2.h

Merge git://git.libdivecomputer.org/libdivecomputer into Subsurface-branch

2017-04-29 16:37:40 -07:00

oceanic_common.c

Fix some casts with constant pointers

2017-11-24 23:45:11 +01:00

oceanic_common.h

Add the serial number encoding to the layout.

2016-08-08 08:38:23 +02:00

oceanic_veo250_parser.c

Fix the Sherwood Insight temperature

2017-09-12 22:34:55 +02:00

oceanic_veo250.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

oceanic_veo250.h

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

oceanic_vtpro_parser.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

oceanic_vtpro.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

oceanic_vtpro.h

Remove unnecessary helper functions

2017-04-19 11:33:17 +02:00

parser-private.h

Use helper functions to allocate and free objects.

2016-01-05 20:40:21 +01:00

parser.c

Merge branch 'master' of git://git.libdivecomputer.org/libdivecomputer into Subsurface-branch

2017-07-10 14:00:47 -07:00

platform.h

Use the correct printf format for the size_t type

2017-09-28 22:02:53 +02:00

rbstream.c

Add a common ringbuffer reading algorithm

2017-02-16 20:34:09 +01:00

rbstream.h

Add a common ringbuffer reading algorithm

2017-02-16 20:34:09 +01:00

reefnet_sensus_parser.c

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

reefnet_sensus.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

reefnet_sensus.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

reefnet_sensuspro_parser.c

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

reefnet_sensuspro.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

reefnet_sensuspro.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

reefnet_sensusultra_parser.c

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

reefnet_sensusultra.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

reefnet_sensusultra.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

ringbuffer.c

Remove trailing whitespaces

2014-03-19 09:16:07 +01:00

ringbuffer.h

Remove trailing whitespaces

2014-03-19 09:16:07 +01:00

scubapro_g2.c

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

scubapro_g2.h

Support for the Scubapro Aladin Sport Matrix.

2017-10-29 07:15:14 -07:00

serial_posix.c

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

serial_win32.c

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

serial.h

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

shearwater_common.c

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

shearwater_common.h

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

shearwater_petrel.c

Merge tag 'v0.6.0' of git://git.libdivecomputer.org/libdivecomputer into Subsurface-branch

2017-12-04 10:18:23 -08:00

shearwater_petrel.h

Shearwater: correctly handle the different models

2017-07-07 18:00:54 -07:00

shearwater_predator_parser.c

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

shearwater_predator.c

Improve the progress events

2017-11-19 19:51:59 +01:00

shearwater_predator.h

Shearwater: correctly handle the different models

2017-07-07 18:00:54 -07:00

socket.c

Implement the serial communication functions as no-ops

2017-11-26 23:00:33 +01:00

socket.h

Implement the serial communication functions as no-ops

2017-11-26 23:00:33 +01:00

suunto_common2.c

Fix some casts with constant pointers

2017-11-24 23:45:11 +01:00

suunto_common2.h

Use helper functions to allocate and free objects.

2016-01-05 20:40:21 +01:00

suunto_common.c

Use helper functions to allocate and free objects.

2016-01-05 20:40:21 +01:00

suunto_common.h

Use helper functions to allocate and free objects.

2016-01-05 20:40:21 +01:00

suunto_d9_parser.c

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

suunto_d9.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

suunto_d9.h

Merge git://git.libdivecomputer.org/libdivecomputer into Subsurface-branch

2017-04-29 16:37:40 -07:00

suunto_eon_parser.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

suunto_eon.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

suunto_eon.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

suunto_eonsteel_parser.c

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

suunto_eonsteel.c

EON Steel: remove a few unused variables

2017-12-04 10:43:20 -08:00

suunto_eonsteel.h

Add support for new Suunto EON Core dive computer

2017-11-19 15:36:39 -10:00

suunto_solution_parser.c

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

suunto_solution.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

suunto_solution.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

suunto_vyper2.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

suunto_vyper2.h

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

suunto_vyper_parser.c

Add basic timezone support

2017-08-18 23:26:45 +02:00

suunto_vyper.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

suunto_vyper.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

usbhid.c

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

usbhid.h

Merge remote-tracking branch 'jef/master' into Subsurface-branch

2017-12-12 13:59:29 -08:00

uwatec_aladin.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

uwatec_aladin.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

uwatec_memomouse_parser.c

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00

uwatec_memomouse.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

uwatec_memomouse.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

uwatec_meridian.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

uwatec_meridian.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

uwatec_smart_parser.c

Add support for Scubapro Aladin Square

2017-11-16 15:24:28 -08:00

uwatec_smart.c

Port the IrDA code to the new I/O interface

2017-11-25 10:26:49 +01:00

uwatec_smart.h

Cleanup the extract dives functions

2017-04-22 09:11:41 +02:00

version.c

Include the git commit SHA1 in the version number.

2012-12-27 22:00:35 +01:00

zeagle_n2ition3.c

Port the serial code to the new I/O interface

2017-11-25 10:26:49 +01:00

zeagle_n2ition3.h

Remove deprecated functions from the public api

2017-04-18 08:41:10 +02:00