greg/dmrconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build id-to-contact map for d868uv.

Browse Source 
Image file for d868uv decreased by 768 bytes.
This commit is contained in:
Serge Vakulenko 2018-11-05 19:05:14 -08:00
parent 7c4fa196bf
commit 4e5cb83c61
3 changed files with 66 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
d868uv-map.h
View File

@ -576,5 +576,4 @@
{ 0x0299ee00, 0x140 }, // 187fc0 - Grouplist 248
{ 0x0299f000, 0x140 }, // 188100 - Grouplist 249
{ 0x0299f200, 0x140 }, // 188240 - Grouplist 250
{ 0x04280000, 0x300 }, // 188380 - Unknown index
{ 0, 0 },

78
d868uv.c
View File

@ -61,6 +61,7 @@
#define OFFSET_CONTACT_MAP 0x080140 // Bitmap of invalid contacts
#define OFFSET_CONTACTS 0x080640 // Contacts
#define OFFSET_GLISTS 0x174b00 // RX group lists
#define OFFSET_CONT_ID_LIST 0x188380 // Map of contact IDs to contacts
#define GET_SETTINGS() ((general_settings_t*) &radio_mem[OFFSET_SETTINGS])
#define GET_RADIOID() ((radioid_t*) &radio_mem[OFFSET_RADIOID])
@ -82,7 +83,7 @@
// Size of memory image.
// Essentialy a sum of all fragments defined ind868um-map.h.
//
#define MEMSZ 1607296
#define MEMSZ 1606528
//
// D868UV radio has a huge internal address space, more than 64 Mbytes.
@ -553,6 +554,19 @@ static void d868uv_download(radio_device_t *radio)
}
}
//
// Get contact by index.
//
static contact_t *get_contact(int i)
{
uint8_t *cmap = GET_CONTACT_MAP();
if ((cmap[i / 8] >> (i & 7)) & 1)
return 0;
return GET_CONTACT(i);
}
//
// Write memory image to the device.
//
@ -590,6 +604,54 @@ static void d868uv_upload(radio_device_t *radio, int cont_flag)
fprintf(stderr, "Should be %u; check d868uv-map.h!\n", file_offset);
exit(-1);
}
//
// Build and upload a map of IDs to contacts.
// The map has to be sorted by ID.
//
uint64_t map[8*NCONTACTS + 72];
int index, ncontacts = 0;
memset(map, 0xff, sizeof(map));
for (index=0; index<NCONTACTS; index++) {
contact_t *ct = get_contact(index);
if (!ct)
continue;
// A map entry consists of 8 bytes.
// Bit 0: set for groups.
// Bits 31-1: DMR ID of the contact.
// Bytes 4-7: contact index.
uint64_t item = ct->id[0] << 25 | ct->id[1] << 17 |
ct->id[2] << 9 | ct->id[3] << 1;
if (ct->type == CALL_GROUP)
item |= 1;
item |= (uint64_t) index << 32;
int k;
for (k=0; k<NCONTACTS; k++) {
if (map[k] == item) {
// The item is already in the list.
break;
}
if (map[k] == 0xffffffffffffffff) {
// Append to the end of the list.
map[k] = item;
ncontacts = k + 1;
break;
}
if ((uint32_t)map[k] > (uint32_t)item) {
// Insert item there and shift the rest.
uint64_t prev = map[k];
map[k] = item;
item = prev;
}
}
}
//printf("\n");
//print_hex((uint8_t*)map, ncontacts*8 + 8);
//printf("\n");
serial_write_region(OFFSET_CONT_ID_LIST, (uint8_t*)map, (ncontacts*8 + 8 + 63) / 64 * 64);
}
//
@ -700,19 +762,6 @@ static int have_contacts()
return 0;
}
//
// Get contact by index.
//
static contact_t *get_contact(int i)
{
uint8_t *cmap = GET_CONTACT_MAP();
if ((cmap[i / 8] >> (i & 7)) & 1)
return 0;
return GET_CONTACT(i);
}
//
// Print frequency (BCD value).
//
@ -1354,6 +1403,7 @@ static void d868uv_read_image(radio_device_t *radio, FILE *img)
}
switch (st.st_size) {
case MEMSZ:
case MEMSZ + 0x300: // TODO: delete
// IMG file.
if (fread(&radio_mem[0], 1, MEMSZ, img) != MEMSZ) {
fprintf(stderr, "Error reading image data.\n");

3
radio.c
View File

@ -200,7 +200,8 @@ void radio_read_image(const char *filename)
case 262709:
device = &radio_md380;
break;
case 1607296:
case 1606528:
case 1607296: // TODO: delete
device = &radio_d868uv;
break;
case 131072: