PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 327a28050c into bfa7f4af93

This commit is contained in:
Florian (DF2ET) 2019-02-18 03:06:55 +00:00 committed by GitHub
parent bfa7f4af93 327a28050c
commit ff4a514052
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cm108.c
View File

@ -137,7 +137,7 @@ static int cm108_write (char *name, int iomask, int iodata);
// CM108B is 0012. // CM108B is 0012.
// CM119B is 0013. // CM119B is 0013.
// CM108AH is 0139 programmable by MSEL and MODE pin. // CM108AH is 0139 or 013c programmable by MSEL and MODE pin.
// CM119A is 013A programmable by MSEL and MODE pin. // CM119A is 013A programmable by MSEL and MODE pin.
// To make matters even more confusing, these can be overridden // To make matters even more confusing, these can be overridden
@ -148,6 +148,7 @@ static int cm108_write (char *name, int iomask, int iodata);
#define CMEDIA_PID1_MAX 0x000f #define CMEDIA_PID1_MAX 0x000f
#define CMEDIA_PID_CM108AH 0x0139 // CM108AH #define CMEDIA_PID_CM108AH 0x0139 // CM108AH
#define CMEDIA_PID_CM108AH_2 0x013c // CM108AH
#define CMEDIA_PID_CM108B 0x0012 // CM108B #define CMEDIA_PID_CM108B 0x0012 // CM108B
#define CMEDIA_PID_CM119A 0x013a // CM119A #define CMEDIA_PID_CM119A 0x013a // CM119A
#define CMEDIA_PID_CM119B 0x0013 // CM119B #define CMEDIA_PID_CM119B 0x0013 // CM119B
@ -166,7 +167,7 @@ static int cm108_write (char *name, int iomask, int iodata);
// Device VID PID Number of GPIO // Device VID PID Number of GPIO
// ------ --- --- -------------- // ------ --- --- --------------
// CM108 0d8c 0008-000f * 4 // CM108 0d8c 0008-000f * 4
// CM108AH 0d8c 0139 * 3 Has GPIO 1,3,4 but not 2 // CM108AH 0d8c 0139/013c * 3 Has GPIO 1,3,4 but not 2
// CM108B 0d8c 0012 3 Has GPIO 1,3,4 but not 2 // CM108B 0d8c 0012 3 Has GPIO 1,3,4 but not 2
// CM109 0d8c 0008-000f * 8 // CM109 0d8c 0008-000f * 8
// CM119 0d8c 0008-000f * 8 // CM119 0d8c 0008-000f * 8
@ -195,6 +196,7 @@ static int cm108_write (char *name, int iomask, int iodata);
#define GOOD_DEVICE(v,p) ( (v == CMEDIA_VID && ((p >= CMEDIA_PID1_MIN && p <= CMEDIA_PID1_MAX) \ #define GOOD_DEVICE(v,p) ( (v == CMEDIA_VID && ((p >= CMEDIA_PID1_MIN && p <= CMEDIA_PID1_MAX) \
|| p == CMEDIA_PID_CM108AH \ || p == CMEDIA_PID_CM108AH \
|| p == CMEDIA_PID_CM108AH_2 \
|| p == CMEDIA_PID_CM108B \ || p == CMEDIA_PID_CM108B \
|| p == CMEDIA_PID_CM119A \ || p == CMEDIA_PID_CM119A \
|| p == CMEDIA_PID_CM119B )) \ || p == CMEDIA_PID_CM119B )) \