Merge branch 'master' of https://github.com/hmatuschek/qdmr

hmatuschek · Mar 19, 2021 · 81470c2 · 81470c2
2 parents a2d957c + 9e43e1c
commit 81470c2
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -5,11 +5,17 @@
 message(STATUS "Using xsltproc: ${XSLTPROC_EXECUTABLE}")
 configure_file("dmrconf.in.xml" "dmrconf.xml")
 
+if(UNIX AND NOT APPLE)
+  set(DOCBOOK2MAN_XSLT ${CMAKE_CURRENT_SOURCE_DIR}/docbook_man.debian.xsl)
+elseif(UNIX AND APPLE)
+  set(DOCBOOK2MAN_XSLT ${CMAKE_CURRENT_SOURCE_DIR}/docbook_man.macports.xsl)
+endif(UNIX AND APPLE)
+
 add_custom_command(
   OUTPUT dmrconf.1
   COMMAND ${XSLTPROC_EXECUTABLE}
           -o ${CMAKE_CURRENT_BINARY_DIR}/dmrconf.1
-          ${CMAKE_CURRENT_SOURCE_DIR}/docbook_man.xsl
+          ${DOCBOOK2MAN_XSLT}
           ${CMAKE_CURRENT_BINARY_DIR}/dmrconf.xml
   DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/dmrconf.xml
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

diff --git a/doc/docbook_man.debian.xsl b/doc/docbook_man.debian.xsl
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+  <xsl:strip-space elements="*"/>
+
+  <xsl:include href="file:///opt/local/share/xsl/docbook-xsl-nons/manpages/docbook.xsl"/>
+</xsl:stylesheet>
diff --git a/lib/d878uv_codeplug.hh b/lib/d878uv_codeplug.hh
@@ -82,6 +82,8 @@ class GPSSystem;
  *  <tr><td>02680000</td> <td>max. 0f4240</td> <td>10000 contacts, see @c contact_t.
  *    As each contact is 100b, they do not align with the 16b blocks being transferred to the device.
  *    Hence contacts are organized internally in groups of 4 contacts forming a "bank". </td></tr>
+ *  <tr><td>04340000</td> <td>max. 013880</td> <td>DMR ID to contact index map, see @c contact_map_t.
+ *    Sorted by ID, empty entries set to 0xffffffffffffffff.</td>
  *
  *  <tr><th colspan="3">Analog Contacts</th></tr>
  *  <tr><th>Start</th>    <th>Size</th>        <th>Content</th></tr>
@@ -168,11 +170,6 @@ class GPSSystem;
  *  <tr><td>02480200</td> <td>000010</td>      <td>FM broadcast VFO frequency. Encoded
  *    as 8-digit BCD little-endian in 100Hz. Filled with 0x00.</td></tr>
  *
- *  <tr><th colspan="3">ID -> Contact map</th></tr>
- *  <tr><th>Start</th>    <th>Size</th>        <th>Content</th></tr>
- *  <tr><td>04340000</td> <td>max. 013880</td> <td>DMR ID to contact index map, see @c contact_map_t.
- *    Sorted by ID, empty entries set to 0xffffffffffffffff.</td>
- *
  *  <tr><th colspan="3">Still unknown</th></tr>
  *  <tr><th>Start</th>    <th>Size</th>   <th>Content</th></tr>
  *  <tr><td>024C0000</td> <td>000020</td> <td>Unknown data.</td></tr>