mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Rename ar7030p_utils.c PAGE_SIZE to 7030_PAGE_SIZE to avoid conflict with Android build

pull/574/head
Michael Black W9MDB 2021-02-28 06:16:17 +01:00
rodzic 317bf6626d
commit 2bc59544ed
1 zmienionych plików z 4 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
rigs/aor/ar7030p_utils.c
Wyświetl plik

@ -36,7 +36,7 @@
static enum PAGE_e curPage = NONE; /* Current memory page */ static enum PAGE_e curPage = NONE; /* Current memory page */
static unsigned int curAddr = 65535; /* Current page address */ static unsigned int curAddr = 65535; /* Current page address */
static enum LOCK_LVL_e curLock = LOCK_0; /* Current lock level */ static enum LOCK_LVL_e curLock = LOCK_0; /* Current lock level */
static const unsigned int PAGE_SIZE[] = static const unsigned int 7030_PAGE_SIZE[] =
{ {
256, 256, 512, 4096, 4096, 256, 256, 512, 4096, 4096,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -435,7 +435,7 @@ static int setAddr(RIG *rig, enum PAGE_e page, unsigned int addr)
if ((EEPROM3 >= page) || (ROM == page)) if ((EEPROM3 >= page) || (ROM == page))
{ {
if (PAGE_SIZE[page] > addr) if (7030_PAGE_SIZE[page] > addr)
{ {
if (curPage != page) if (curPage != page)
{ {
@ -1454,11 +1454,11 @@ int pageSize(const enum PAGE_e page)
if ((WORKING <= page) && (EEPROM3 >= page)) if ((WORKING <= page) && (EEPROM3 >= page))
{ {
rc = (int) PAGE_SIZE[ page ]; rc = (int) 7030_PAGE_SIZE[ page ];
} }
else if (ROM == page) else if (ROM == page)
{ {
rc = (int) PAGE_SIZE[ page ]; rc = (int) 7030_PAGE_SIZE[ page ];
} }
else else
{ {