Recognize Windows form of device path.

wb2osz · wb2osz · commit 73d5d139b407 · 2021-04-10T20:46:13.000-04:00
diff --git a/src/config.c b/src/config.c
@@ -1893,6 +1893,16 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	          p_audio_config->achan[channel].octrl[ot].out_gpio_num = atoi(t);
 		  p_audio_config->achan[channel].octrl[ot].ptt_invert = 0;
 	        }
+#if __WIN32__
+	        else if (*t == '\\') {
+	          strlcpy (p_audio_config->achan[channel].octrl[ot].ptt_device, t, sizeof(p_audio_config->achan[channel].octrl[ot].ptt_device));
+		}
+		else {
+	          text_color_set(DW_COLOR_ERROR);
+	          dw_printf ("Config file line %d: Found \"%s\" when expecting GPIO number or device name like \\\\?\\hid#vid_0d8c&... .\n", line, t);
+	          continue;
+	        }
+#else
 	        else if (*t == '/') {
 	          strlcpy (p_audio_config->achan[channel].octrl[ot].ptt_device, t, sizeof(p_audio_config->achan[channel].octrl[ot].ptt_device));
 		}
@@ -1901,6 +1911,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
 	          dw_printf ("Config file line %d: Found \"%s\" when expecting GPIO number or device name like /dev/hidraw1.\n", line, t);
 	          continue;
 	        }
+#endif
 	      }
 	      if (p_audio_config->achan[channel].octrl[ot].out_gpio_num < 1 || p_audio_config->achan[channel].octrl[ot].out_gpio_num > 8) {
 	          text_color_set(DW_COLOR_ERROR);

Original file line number	Diff line number	Diff line change
`@@ -1893,6 +1893,16 @@ void config_init (char fname, struct audio_s p_audio_config,`
`1893`	`1893`	`p_audio_config->achan[channel].octrl[ot].out_gpio_num = atoi(t);`
`1894`	`1894`	`p_audio_config->achan[channel].octrl[ot].ptt_invert = 0;`
`1895`	`1895`	`}`
	`1896`	`+#if __WIN32__`
	`1897`	`+ else if (*t == '\\') {`
	`1898`	`+ strlcpy (p_audio_config->achan[channel].octrl[ot].ptt_device, t, sizeof(p_audio_config->achan[channel].octrl[ot].ptt_device));`
	`1899`	`+ }`
	`1900`	`+ else {`
	`1901`	`+ text_color_set(DW_COLOR_ERROR);`
	`1902`	`+ dw_printf ("Config file line %d: Found \"%s\" when expecting GPIO number or device name like \\\\?\\hid#vid_0d8c&... .\n", line, t);`
	`1903`	`+ continue;`
	`1904`	`+ }`
	`1905`	`+#else`
`1896`	`1906`	`else if (*t == '/') {`
`1897`	`1907`	`strlcpy (p_audio_config->achan[channel].octrl[ot].ptt_device, t, sizeof(p_audio_config->achan[channel].octrl[ot].ptt_device));`
`1898`	`1908`	`}`
`@@ -1901,6 +1911,7 @@ void config_init (char fname, struct audio_s p_audio_config,`
`1901`	`1911`	`dw_printf ("Config file line %d: Found \"%s\" when expecting GPIO number or device name like /dev/hidraw1.\n", line, t);`
`1902`	`1912`	`continue;`
`1903`	`1913`	`}`
	`1914`	`+#endif`
`1904`	`1915`	`}`
`1905`	`1916`	`if (p_audio_config->achan[channel].octrl[ot].out_gpio_num < 1 \|\| p_audio_config->achan[channel].octrl[ot].out_gpio_num > 8) {`
`1906`	`1917`	`text_color_set(DW_COLOR_ERROR);`