Merge pull request #83 from mikeller/update_from_upstream_202506

Author: mikeller

contrib/android/Android.mk

@@ -39,6 +39,8 @@ LOCAL_SRC_FILES := \
 	src/divesoft_freedom_parser.c \
 	src/divesystem_idive.c \
 	src/divesystem_idive_parser.c \
+	src/halcyon_symbios.c \
+	src/halcyon_symbios_parser.c \
 	src/hdlc.c \
 	src/hw_frog.c \
 	src/hw_ostc3.c \

contrib/msvc/libdivecomputer.vcxproj

@@ -207,6 +207,8 @@
     <ClCompile Include="..\..\src\divesoft_freedom_parser.c" />
     <ClCompile Include="..\..\src\divesystem_idive.c" />
     <ClCompile Include="..\..\src\divesystem_idive_parser.c" />
+    <ClCompile Include="..\..\src\halcyon_symbios.c" />
+    <ClCompile Include="..\..\src\halcyon_symbios_parser.c" />
     <ClCompile Include="..\..\src\hdlc.c" />
     <ClCompile Include="..\..\src\hw_frog.c" />
     <ClCompile Include="..\..\src\hw_ostc.c" />
@@ -337,6 +339,7 @@
     <ClInclude Include="..\..\src\diverite_nitekq.h" />
     <ClInclude Include="..\..\src\divesoft_freedom.h" />
     <ClInclude Include="..\..\src\divesystem_idive.h" />
+    <ClInclude Include="..\..\src\halcyon_symbios.h" />
     <ClInclude Include="..\..\src\hdlc.h" />
     <ClInclude Include="..\..\src\hw_frog.h" />
     <ClInclude Include="..\..\src\hw_ostc.h" />

doc/man/Makefile.am

@@ -18,7 +18,7 @@ MANPAGES = \
 	dc_descriptor_get_product.3 \
 	dc_descriptor_get_vendor.3 \
 	dc_descriptor_get_transports.3 \
-	dc_descriptor_iterator.3 \
+	dc_descriptor_iterator_new.3 \
 	dc_device_close.3 \
 	dc_device_foreach.3 \
 	dc_device_open.3 \

doc/man/dc_bluetooth_iterator_new.3

@@ -44,7 +44,7 @@ opened with
 and a
 .Fa descriptor
 usually found by searching through
-.Xr dc_descriptor_iterator 3 .
+.Xr dc_descriptor_iterator_new 3 .
 .Pp
 On returning
 .Dv DC_STATUS_SUCCESS

doc/man/dc_descriptor_free.3

@@ -36,12 +36,12 @@
 Frees a descriptor usually returned with
 .Xr dc_iterator_next 3
 as created with
-.Xr dc_descriptor_iterator 3 .
+.Xr dc_descriptor_iterator_new 3 .
 It's safe to pass
 .Dv NULL
 to this function.
 .Sh SEE ALSO
-.Xr dc_descriptor_iterator 3 ,
+.Xr dc_descriptor_iterator_new 3 ,
 .Xr dc_iterator_free 3
 .Sh AUTHORS
 The

doc/man/dc_descriptor_get_model.3

@@ -31,7 +31,7 @@
 .In libdivecomputer/descriptor.h
 .Ft "unsigned int"
 .Fo dc_descriptor_get_model
-.Fa "dc_descriptor_t *descriptor"
+.Fa "const dc_descriptor_t *descriptor"
 .Fc
 .Sh DESCRIPTION
 Gets the model number of a dive computer descriptor or 0 if none was
@@ -40,7 +40,7 @@ defined for the computer.
 .Sh RETURN VALUES
 This returns the model number or 0 if none exists.
 .Sh SEE ALSO
-.Xr dc_descriptor_iterator 3
+.Xr dc_descriptor_iterator_new 3
 .Sh AUTHORS
 The
 .Lb libdivecomputer

doc/man/dc_descriptor_get_product.3

@@ -30,7 +30,7 @@
 .In libdivecomputer/descriptor.h
 .Ft "const char *"
 .Fo dc_descriptor_get_product
-.Fa "dc_descriptor_t *descriptor"
+.Fa "const dc_descriptor_t *descriptor"
 .Fc
 .Sh DESCRIPTION
 Gets the product

doc/man/dc_descriptor_get_transports.3

@@ -30,15 +30,15 @@
 .In libdivecomputer/descriptor.h
 .Ft "unsigned int"
 .Fo dc_descriptor_get_transports
-.Fa "dc_descriptor_t *descriptor"
+.Fa "const 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 .
+.Xr dc_descriptor_iterator_new 3 .
 .Sh RETURN VALUES
 Returns a union (bitwise OR) of the transports supported by the given
 .Fa descriptor .
@@ -59,7 +59,7 @@ if(transports & DC_TRANSPORT_USBHID) {
 }
 .Ed
 .Sh SEE ALSO
-.Xr dc_descriptor_iterator 3 .
+.Xr dc_descriptor_iterator_new 3 .
 .Sh AUTHORS
 The
 .Lb libdivecomputer

doc/man/dc_descriptor_get_vendor.3

@@ -30,7 +30,7 @@
 .In libdivecomputer/descriptor.h
 .Ft "const char *"
 .Fo dc_descriptor_get_vendor
-.Fa "dc_descriptor_t *descriptor"
+.Fa "const dc_descriptor_t *descriptor"
 .Fc
 .Sh DESCRIPTION
 Gets the vendor

doc/man/dc_descriptor_iterator.3 renamed to doc/man/dc_descriptor_iterator_new.3

@@ -22,15 +22,16 @@
 .Dt DC_DESCRIPTOR_ITERATOR 3
 .Os
 .Sh NAME
-.Nm dc_descriptor_iterator
+.Nm dc_descriptor_iterator_new
 .Nd get all supported dive computers
 .Sh LIBRARY
 .Lb libdivecomputer
 .Sh SYNOPSIS
 .In libdivecomputer/descriptor.h
 .Ft dc_status_t
-.Fo dc_descriptor_iterator
+.Fo dc_descriptor_iterator_new
 .Fa "dc_iterator_t **iterator"
+.Fa "dc_descriptor_t *descriptor"
 .Fc
 .Sh DESCRIPTION
 Gets all descriptors available to
@@ -56,7 +57,7 @@ The following iterates over all descriptors, printing the vendor, then
 frees the iterator.
 It does no error checking.
 .Bd -literal
-dc_descriptor_iterator(&iter));
+dc_descriptor_iterator_new(&iter, context));
 while (dc_iterator_next(iter, &desc) == DC_STATUS_SUCCESS) {
 	printf("%s\en", dc_descriptor_get_vendor(desc));
 	dc_descriptor_free(desc);