C-Netz: Updated base station list

src/cnetz/cnetz.c

@@ -411,7 +411,9 @@ int cnetz_create(const char *kanal, enum cnetz_chan_type chan_type, const char *
 #endif
 
 	PDEBUG(DCNETZ, DEBUG_NOTICE, "Created 'Kanal' #%s of type '%s' = %s\n", kanal, chan_type_short_name(chan_type), chan_type_long_name(chan_type));
-	PDEBUG(DNMT, DEBUG_NOTICE, " -> Using cell ID: Nat=%d FuVst=%d Rest=%d Name='%s'\n", si.fuz_nat, si.fuz_fuvst, si.fuz_rest, get_station_name(si.fuz_nat, si.fuz_fuvst, si.fuz_rest));
+	const char *name, *station;
+	name = get_station_name(si.fuz_nat, si.fuz_fuvst, si.fuz_rest, &station);
+	PDEBUG(DNMT, DEBUG_NOTICE, " -> Using cell ID: Nat=%d FuVst=%d Rest=%d Name='%s' (%s)\n", si.fuz_nat, si.fuz_fuvst, si.fuz_rest, name, station);
 
 	return 0;
 

src/cnetz/main.c

@@ -510,8 +510,6 @@ int main(int argc, char *argv[])
 			return -EINVAL;
 		}
 	}
-	/* set or complete name (in case of prefix was given) */
-	fuz_name = get_station_name(fuz_nat, fuz_fuvst, fuz_rest);
 
 	if (!num_kanal) {
 		printf("No channel (\"Kanal\") is specified, I suggest channel %d.\n\n", CNETZ_OGK_KANAL);

src/cnetz/stations.h

@@ -1,6 +1,6 @@
 
 void init_station(void);
 void station_list(void);
-const char *get_station_name(uint8_t nat, uint8_t fuvst, uint8_t rest);
+const char *get_station_name(uint8_t nat, uint8_t fuvst, uint8_t rest, const char **standort);
 const char *get_station_id(const char *name, uint8_t *nat, uint8_t *fuvst, uint8_t *rest);