Skip to content

Commit 2fec597

Browse files
wb2oszwb2osz
committed
Allow more flexible naming of GPIO pins. e.g. CubieBoard.
1 parent b6254da commit 2fec597

File tree

3 files changed

+97
-59
lines changed

3 files changed

+97
-59
lines changed

‎audio.h

+29-5
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ struct audio_s {
187187
#define OCTYPE_DCD 1
188188
#define OCTYPE_CON 2
189189

190-
#define NUM_OCTYPES 4 /* number of values above. WHY IS THIS NOT 3? */
190+
#define NUM_OCTYPES 3 /* number of values above. i.e. last value +1. */
191191

192192
struct {
193193

@@ -199,8 +199,19 @@ struct audio_s {
199199
ptt_line_t ptt_line; /* Control line when using serial port. PTT_LINE_RTS, PTT_LINE_DTR. */
200200
ptt_line_t ptt_line2; /* Optional second one: PTT_LINE_NONE when not used. */
201201

202-
int ptt_gpio; /* GPIO number. */
203-
202+
int out_gpio_num; /* GPIO number. Originally this was only for PTT. */
203+
/* It is now more general. */
204+
/* octrl array is indexed by PTT, DCD, or CONnected indicator. */
205+
206+
#define MAX_GPIO_NAME_LEN 16 // 12 would cover any case I've seen so this should be safe
207+
208+
char out_gpio_name[MAX_GPIO_NAME_LEN];
209+
/* orginally, gpio number NN was assumed to simply */
210+
/* have the name gpioNN but this turned out not to be */
211+
/* the case for CubieBoard where it was longer. */
212+
/* This is filled in by ptt_init so we don't have to */
213+
/* recalculate it each time we access it. */
214+
204215
int ptt_lpt_bit; /* Bit number for parallel printer port. */
205216
/* Bit 0 = pin 2, ..., bit 7 = pin 9. */
206217

@@ -214,13 +225,26 @@ struct audio_s {
214225

215226
} octrl[NUM_OCTYPES];
216227

228+
229+
/* Each channel can also have associated input lines. */
230+
/* So far, we just have one for transmit inhibit. */
231+
217232
#define ICTYPE_TXINH 0
218233

219-
#define NUM_ICTYPES 1
234+
#define NUM_ICTYPES 1 /* number of values above. i.e. last value +1. */
220235

221236
struct {
222237
ptt_method_t method; /* none, serial port, GPIO, LPT. */
223-
int gpio; /* GPIO number */
238+
239+
int in_gpio_num; /* GPIO number */
240+
241+
char in_gpio_name[MAX_GPIO_NAME_LEN];
242+
/* orginally, gpio number NN was assumed to simply */
243+
/* have the name gpioNN but this turned out not to be */
244+
/* the case for CubieBoard where it was longer. */
245+
/* This is filled in by ptt_init so we don't have to */
246+
/* recalculate it each time we access it. */
247+
224248
int invert; /* 1 = active low */
225249
} ictrl[NUM_ICTYPES];
226250

‎config.c

+12-6
Original file line numberDiff line numberDiff line change
@@ -748,7 +748,7 @@ void config_init (char *fname, struct audio_s *p_audio_config,
748748
p_audio_config->adev[0].defined = 1;
749749

750750
for (channel=0; channel<MAX_CHANS; channel++) {
751-
int ot;
751+
int ot, it;
752752

753753
p_audio_config->achan[channel].valid = 0; /* One or both channels will be */
754754
/* set to valid when corresponding */
@@ -773,12 +773,18 @@ void config_init (char *fname, struct audio_s *p_audio_config,
773773
strlcpy (p_audio_config->achan[channel].octrl[ot].ptt_device, "", sizeof(p_audio_config->achan[channel].octrl[ot].ptt_device));
774774
p_audio_config->achan[channel].octrl[ot].ptt_line = PTT_LINE_NONE;
775775
p_audio_config->achan[channel].octrl[ot].ptt_line2 = PTT_LINE_NONE;
776-
p_audio_config->achan[channel].octrl[ot].ptt_gpio = 0;
776+
p_audio_config->achan[channel].octrl[ot].out_gpio_num = 0;
777777
p_audio_config->achan[channel].octrl[ot].ptt_lpt_bit = 0;
778778
p_audio_config->achan[channel].octrl[ot].ptt_invert = 0;
779779
p_audio_config->achan[channel].octrl[ot].ptt_invert2 = 0;
780780
}
781781

782+
for (it = 0; it < NUM_ICTYPES; it++) {
783+
p_audio_config->achan[channel].ictrl[it].method = PTT_METHOD_NONE;
784+
p_audio_config->achan[channel].ictrl[it].in_gpio_num = 0;
785+
p_audio_config->achan[channel].ictrl[it].invert = 0;
786+
}
787+
782788
p_audio_config->achan[channel].dwait = DEFAULT_DWAIT;
783789
p_audio_config->achan[channel].slottime = DEFAULT_SLOTTIME;
784790
p_audio_config->achan[channel].persist = DEFAULT_PERSIST;
@@ -1644,11 +1650,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
16441650
}
16451651

16461652
if (*t == '-') {
1647-
p_audio_config->achan[channel].octrl[ot].ptt_gpio = atoi(t+1);
1653+
p_audio_config->achan[channel].octrl[ot].out_gpio_num = atoi(t+1);
16481654
p_audio_config->achan[channel].octrl[ot].ptt_invert = 1;
16491655
}
16501656
else {
1651-
p_audio_config->achan[channel].octrl[ot].ptt_gpio = atoi(t);
1657+
p_audio_config->achan[channel].octrl[ot].out_gpio_num = atoi(t);
16521658
p_audio_config->achan[channel].octrl[ot].ptt_invert = 0;
16531659
}
16541660
p_audio_config->achan[channel].octrl[ot].ptt_method = PTT_METHOD_GPIO;
@@ -1841,11 +1847,11 @@ void config_init (char *fname, struct audio_s *p_audio_config,
18411847
}
18421848

18431849
if (*t == '-') {
1844-
p_audio_config->achan[channel].ictrl[ICTYPE_TXINH].gpio = atoi(t+1);
1850+
p_audio_config->achan[channel].ictrl[ICTYPE_TXINH].in_gpio_num = atoi(t+1);
18451851
p_audio_config->achan[channel].ictrl[ICTYPE_TXINH].invert = 1;
18461852
}
18471853
else {
1848-
p_audio_config->achan[channel].ictrl[ICTYPE_TXINH].gpio = atoi(t);
1854+
p_audio_config->achan[channel].ictrl[ICTYPE_TXINH].in_gpio_num = atoi(t);
18491855
p_audio_config->achan[channel].ictrl[ICTYPE_TXINH].invert = 0;
18501856
}
18511857
p_audio_config->achan[channel].ictrl[ICTYPE_TXINH].method = PTT_METHOD_GPIO;

‎ptt.c

+56-48
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,8 @@ typedef int HANDLE;
162162
#endif
163163

164164

165+
static struct audio_s *save_audio_config_p; /* Save config information for later use. */
166+
165167
static int ptt_debug_level = 0;
166168

167169
void ptt_set_debug(int debug)
@@ -368,45 +370,45 @@ static void get_access_to_gpio (const char *path)
368370
* Purpose: Tell the GPIO subsystem to export a GPIO line for
369371
* us to use, and set the initial state of the GPIO.
370372
*
371-
* Inputs: gpio - GPIO line number to export.
373+
* Inputs: ch - Radio Channel.
374+
* ot - Output type.
372375
* invert: - Is the GPIO active low?
373376
* direction: - 0 for input, 1 for output
374377
*
375-
* Outputs: gpio_name - See below.
378+
* Outputs: out_gpio_name - in the audio configuration structure.
379+
* in_gpio_name
376380
*
377381
*------------------------------------------------------------------*/
378382

379383
#ifndef __WIN32__
380384

381-
#define MAX_GPIO_NUM 100 // 76 would handle any case I've seen.
382-
#define MAX_GPIO_NAME_LEN 16 // 12 would handle any case I've seen.
383-
384-
// Raspberry Pi was easy. GPIO 24 has the name gpio24.
385-
// Others, such as the Cubieboard, take a little more effort.
386-
// The name might be gpio24_ph11 meaning connector H, pin 11.
387-
// When we "export" GPIO number, we will store the corresponding device name
388-
// here for future use when we want to access it.
389-
// I never saw any references to anything above gpio75 so we will take the easy
390-
// way out and simply index into a fixed size array.
391-
392-
393-
static char gpio_name[MAX_GPIO_NUM][MAX_GPIO_NAME_LEN];
394385

395-
396-
void export_gpio(int gpio, int invert, int direction)
386+
void export_gpio(int ch, int ot, int invert, int direction)
397387
{
398388
HANDLE fd;
399389
const char gpio_export_path[] = "/sys/class/gpio/export";
400390
char gpio_direction_path[80];
391+
char gpio_value_path[80];
401392
char stemp[16];
393+
int gpio_num;
394+
char *gpio_name;
402395

396+
// Raspberry Pi was easy. GPIO 24 has the name gpio24.
397+
// Others, such as the Cubieboard, take a little more effort.
398+
// The name might be gpio24_ph11 meaning connector H, pin 11.
399+
// When we "export" GPIO number, we will store the corresponding
400+
// device name for future use when we want to access it.
403401

404-
if (gpio < 0 || gpio >= MAX_GPIO_NUM) {
405-
text_color_set(DW_COLOR_ERROR);
406-
dw_printf ("GPIO line number %d is invalid. Must be in range of 0 to %d.\n", gpio, MAX_GPIO_NUM - 1);
407-
exit (1);
402+
if (direction) {
403+
gpio_num = save_audio_config_p->achan[ch].octrl[ot].out_gpio_num;
404+
gpio_name = save_audio_config_p->achan[ch].octrl[ot].out_gpio_name;
405+
}
406+
else {
407+
gpio_num = save_audio_config_p->achan[ch].ictrl[ot].in_gpio_num;
408+
gpio_name = save_audio_config_p->achan[ch].ictrl[ot].in_gpio_name;
408409
}
409410

411+
410412
get_access_to_gpio (gpio_export_path);
411413

412414
fd = open(gpio_export_path, O_WRONLY);
@@ -417,7 +419,7 @@ void export_gpio(int gpio, int invert, int direction)
417419
exit (1);
418420
}
419421

420-
snprintf (stemp, sizeof(stemp), "%d", gpio);
422+
snprintf (stemp, sizeof(stemp), "%d", gpio_num);
421423
if (write (fd, stemp, strlen(stemp)) != strlen(stemp)) {
422424
int e = errno;
423425
/* Ignore EBUSY error which seems to mean */
@@ -473,7 +475,7 @@ void export_gpio(int gpio, int invert, int direction)
473475
text_color_set(DW_COLOR_ERROR);
474476
dw_printf ("ERROR! Could not get directory listing for /sys/class/gpio\n");
475477

476-
snprintf (gpio_name[gpio], sizeof(gpio_name[gpio]), "gpio%d", gpio);
478+
snprintf (gpio_name, MAX_GPIO_NAME_LEN, "gpio%d", gpio_num);
477479
num_files = 0;
478480
ok = 1;
479481
}
@@ -491,22 +493,22 @@ void export_gpio(int gpio, int invert, int direction)
491493
// Look for exact name gpioNN
492494

493495
char lookfor[16];
494-
snprintf (lookfor, sizeof(lookfor), "gpio%d", gpio);
496+
snprintf (lookfor, sizeof(lookfor), "gpio%d", gpio_num);
495497

496498
for (i = 0; i < num_files && ! ok; i++) {
497499
if (strcmp(lookfor, file_list[i]->d_name) == 0) {
498-
strlcpy (gpio_name[gpio], file_list[i]->d_name, sizeof(gpio_name[gpio]));
500+
strlcpy (gpio_name, file_list[i]->d_name, MAX_GPIO_NAME_LEN);
499501
ok = 1;
500502
}
501503
}
502504

503505
// If not found, Look for gpioNN_*
504506

505-
snprintf (lookfor, sizeof(lookfor), "gpio%d_", gpio);
507+
snprintf (lookfor, sizeof(lookfor), "gpio%d_", gpio_num);
506508

507509
for (i = 0; i < num_files && ! ok; i++) {
508510
if (strncmp(lookfor, file_list[i]->d_name, strlen(lookfor)) == 0) {
509-
strlcpy (gpio_name[gpio], file_list[i]->d_name, sizeof(gpio_name[gpio]));
511+
strlcpy (gpio_name, file_list[i]->d_name, MAX_GPIO_NAME_LEN);
510512
ok = 1;
511513
}
512514
}
@@ -526,21 +528,21 @@ void export_gpio(int gpio, int invert, int direction)
526528

527529
if (ptt_debug_level >= 2) {
528530
text_color_set(DW_COLOR_DEBUG);
529-
dw_printf ("Path for gpio number %d is /sys/class/gpio/%s\n", gpio, gpio_name[gpio]);
531+
dw_printf ("Path for gpio number %d is /sys/class/gpio/%s\n", gpio_num, gpio_name);
530532
}
531533
}
532534
else {
533535

534536
text_color_set(DW_COLOR_ERROR);
535-
dw_printf ("ERROR! Could not find Path for gpio number %d.n", gpio);
537+
dw_printf ("ERROR! Could not find Path for gpio number %d.n", gpio_num);
536538
exit (1);
537539
}
538540

539541
/*
540542
* Set output direction and initial state
541543
*/
542544

543-
snprintf (gpio_direction_path, sizeof(gpio_direction_path), "/sys/class/gpio/%s/direction", gpio_name[gpio]);
545+
snprintf (gpio_direction_path, sizeof(gpio_direction_path), "/sys/class/gpio/%s/direction", gpio_name);
544546
get_access_to_gpio (gpio_direction_path);
545547

546548
fd = open(gpio_direction_path, O_WRONLY);
@@ -572,6 +574,14 @@ void export_gpio(int gpio, int invert, int direction)
572574
exit (1);
573575
}
574576
close (fd);
577+
578+
/*
579+
* Make sure that we have access to 'value'.
580+
* Do it once here, rather than each time we want to use it.
581+
*/
582+
583+
snprintf (gpio_value_path, sizeof(gpio_value_path), "/sys/class/gpio/%s/value", gpio_name);
584+
get_access_to_gpio (gpio_value_path);
575585
}
576586

577587
#endif /* not __WIN32__ */
@@ -600,7 +610,7 @@ void export_gpio(int gpio, int invert, int direction)
600610
*
601611
* ptt_line RTS or DTR when using serial port.
602612
*
603-
* ptt_gpio GPIO number. Only used for Linux.
613+
* out_gpio_num GPIO number. Only used for Linux.
604614
* Valid only when ptt_method is PTT_METHOD_GPIO.
605615
*
606616
* ptt_lpt_bit Bit number for parallel printer port.
@@ -623,7 +633,6 @@ void export_gpio(int gpio, int invert, int direction)
623633

624634

625635

626-
static struct audio_s *save_audio_config_p; /* Save config information for later use. */
627636

628637
static HANDLE ptt_fd[MAX_CHANS][NUM_OCTYPES];
629638
/* Serial port handle or fd. */
@@ -674,7 +683,7 @@ void ptt_init (struct audio_s *audio_config_p)
674683
audio_config_p->achan[ch].octrl[ot].ptt_method,
675684
audio_config_p->achan[ch].octrl[ot].ptt_device,
676685
audio_config_p->achan[ch].octrl[ot].ptt_line,
677-
audio_config_p->achan[ch].octrl[ot].ptt_gpio,
686+
audio_config_p->achan[ch].octrl[ot].out_gpio_num,
678687
audio_config_p->achan[ch].octrl[ot].ptt_lpt_bit,
679688
audio_config_p->achan[ch].octrl[ot].ptt_invert);
680689
}
@@ -818,8 +827,6 @@ void ptt_init (struct audio_s *audio_config_p)
818827

819828
if (using_gpio) {
820829
get_access_to_gpio ("/sys/class/gpio/export");
821-
822-
823830
}
824831

825832
/*
@@ -829,15 +836,18 @@ void ptt_init (struct audio_s *audio_config_p)
829836

830837
for (ch = 0; ch < MAX_CHANS; ch++) {
831838
if (save_audio_config_p->achan[ch].valid) {
832-
int ot;
839+
840+
int ot; // output control type, PTT, DCD, CON, ...
841+
int it; // input control type
842+
833843
for (ot = 0; ot < NUM_OCTYPES; ot++) {
834844
if (audio_config_p->achan[ch].octrl[ot].ptt_method == PTT_METHOD_GPIO) {
835-
export_gpio(audio_config_p->achan[ch].octrl[ot].ptt_gpio, audio_config_p->achan[ch].octrl[ot].ptt_invert, 1);
845+
export_gpio(ch, ot, audio_config_p->achan[ch].octrl[ot].ptt_invert, 1);
836846
}
837847
}
838-
for (ot = 0; ot < NUM_ICTYPES; ot++) {
839-
if (audio_config_p->achan[ch].ictrl[ot].method == PTT_METHOD_GPIO) {
840-
export_gpio(audio_config_p->achan[ch].ictrl[ot].gpio, audio_config_p->achan[ch].ictrl[ot].invert, 0);
848+
for (it = 0; it < NUM_ICTYPES; it++) {
849+
if (audio_config_p->achan[ch].ictrl[it].method == PTT_METHOD_GPIO) {
850+
export_gpio(ch, it, audio_config_p->achan[ch].ictrl[it].invert, 0);
841851
}
842852
}
843853
}
@@ -1125,9 +1135,7 @@ void ptt_set (int ot, int chan, int ptt_signal)
11251135
char gpio_value_path[80];
11261136
char stemp[16];
11271137

1128-
snprintf (gpio_value_path, sizeof(gpio_value_path), "/sys/class/gpio/%s/value", gpio_name[save_audio_config_p->achan[chan].octrl[ot].ptt_gpio]);
1129-
1130-
get_access_to_gpio (gpio_value_path);
1138+
snprintf (gpio_value_path, sizeof(gpio_value_path), "/sys/class/gpio/%s/value", save_audio_config_p->achan[chan].octrl[ot].out_gpio_name);
11311139

11321140
fd = open(gpio_value_path, O_WRONLY);
11331141
if (fd < 0) {
@@ -1143,7 +1151,7 @@ void ptt_set (int ot, int chan, int ptt_signal)
11431151
if (write (fd, stemp, 1) != 1) {
11441152
int e = errno;
11451153
text_color_set(DW_COLOR_ERROR);
1146-
dw_printf ("Error setting GPIO %d for %s\n", save_audio_config_p->achan[chan].octrl[ot].ptt_gpio, otnames[ot]);
1154+
dw_printf ("Error setting GPIO %d for %s\n", save_audio_config_p->achan[chan].octrl[ot].out_gpio_num, otnames[ot]);
11471155
dw_printf ("%s\n", strerror(e));
11481156
}
11491157
close (fd);
@@ -1246,7 +1254,7 @@ int get_input (int it, int chan)
12461254
int fd;
12471255
char gpio_value_path[80];
12481256

1249-
snprintf (gpio_value_path, sizeof(gpio_value_path), "/sys/class/gpio/%s/value", gpio_name[save_audio_config_p->achan[chan].ictrl[it].gpio]);
1257+
snprintf (gpio_value_path, sizeof(gpio_value_path), "/sys/class/gpio/%s/value", save_audio_config_p->achan[chan].ictrl[it].in_gpio_name);
12501258

12511259
get_access_to_gpio (gpio_value_path);
12521260

@@ -1263,7 +1271,7 @@ int get_input (int it, int chan)
12631271
if (read (fd, vtemp, 1) != 1) {
12641272
int e = errno;
12651273
text_color_set(DW_COLOR_ERROR);
1266-
dw_printf ("Error getting GPIO %d value\n", save_audio_config_p->achan[chan].ictrl[it].gpio);
1274+
dw_printf ("Error getting GPIO %d value\n", save_audio_config_p->achan[chan].ictrl[it].in_gpio_num);
12671275
dw_printf ("%s\n", strerror(e));
12681276
}
12691277
close (fd);
@@ -1449,9 +1457,9 @@ main ()
14491457
my_audio_config.adev[0].num_channels = 1;
14501458
my_audio_config.valid[0] = 1;
14511459
my_audio_config.adev[0].octrl[OCTYPE_PTT].ptt_method = PTT_METHOD_GPIO;
1452-
my_audio_config.adev[0].octrl[OCTYPE_PTT].ptt_gpio = 25;
1460+
my_audio_config.adev[0].octrl[OCTYPE_PTT].out_gpio_num = 25;
14531461

1454-
dw_printf ("Try GPIO %d a few times...\n", my_audio_config.ptt_gpio[0]);
1462+
dw_printf ("Try GPIO %d a few times...\n", my_audio_config.out_gpio_num[0]);
14551463

14561464
ptt_init (&my_audio_config);
14571465

0 commit comments

Comments
 (0)