summaryrefslogtreecommitdiffstats
path: root/src/devices/pic/xml_data
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/pic/xml_data')
-rw-r--r--src/devices/pic/xml_data/10F200.xml22
-rw-r--r--src/devices/pic/xml_data/10F202.xml22
-rw-r--r--src/devices/pic/xml_data/10F204.xml22
-rw-r--r--src/devices/pic/xml_data/10F206.xml22
-rw-r--r--src/devices/pic/xml_data/10F220.xml26
-rw-r--r--src/devices/pic/xml_data/10F222.xml26
-rw-r--r--src/devices/pic/xml_data/12C508.xml22
-rw-r--r--src/devices/pic/xml_data/12C508A.xml22
-rw-r--r--src/devices/pic/xml_data/12C509.xml22
-rw-r--r--src/devices/pic/xml_data/12C509A.xml22
-rw-r--r--src/devices/pic/xml_data/12C671.xml26
-rw-r--r--src/devices/pic/xml_data/12C672.xml26
-rw-r--r--src/devices/pic/xml_data/12CE518.xml24
-rw-r--r--src/devices/pic/xml_data/12CE519.xml24
-rw-r--r--src/devices/pic/xml_data/12CE673.xml26
-rw-r--r--src/devices/pic/xml_data/12CE674.xml26
-rw-r--r--src/devices/pic/xml_data/12CR509A.xml22
-rw-r--r--src/devices/pic/xml_data/12F508.xml22
-rw-r--r--src/devices/pic/xml_data/12F509.xml22
-rw-r--r--src/devices/pic/xml_data/12F510.xml26
-rw-r--r--src/devices/pic/xml_data/12F519.xml30
-rw-r--r--src/devices/pic/xml_data/12F609.xml34
-rw-r--r--src/devices/pic/xml_data/12F615.xml34
-rw-r--r--src/devices/pic/xml_data/12F629.xml38
-rw-r--r--src/devices/pic/xml_data/12F635.xml46
-rw-r--r--src/devices/pic/xml_data/12F675.xml38
-rw-r--r--src/devices/pic/xml_data/12F683.xml42
-rw-r--r--src/devices/pic/xml_data/14000.xml30
-rw-r--r--src/devices/pic/xml_data/16C432.xml24
-rw-r--r--src/devices/pic/xml_data/16C433.xml26
-rw-r--r--src/devices/pic/xml_data/16C505.xml22
-rw-r--r--src/devices/pic/xml_data/16C52.xml10
-rw-r--r--src/devices/pic/xml_data/16C54.xml16
-rw-r--r--src/devices/pic/xml_data/16C54A.xml16
-rw-r--r--src/devices/pic/xml_data/16C54B.xml16
-rw-r--r--src/devices/pic/xml_data/16C54C.xml16
-rw-r--r--src/devices/pic/xml_data/16C55.xml16
-rw-r--r--src/devices/pic/xml_data/16C554.xml20
-rw-r--r--src/devices/pic/xml_data/16C557.xml20
-rw-r--r--src/devices/pic/xml_data/16C558.xml20
-rw-r--r--src/devices/pic/xml_data/16C55A.xml16
-rw-r--r--src/devices/pic/xml_data/16C56.xml16
-rw-r--r--src/devices/pic/xml_data/16C56A.xml16
-rw-r--r--src/devices/pic/xml_data/16C57.xml16
-rw-r--r--src/devices/pic/xml_data/16C57C.xml16
-rw-r--r--src/devices/pic/xml_data/16C58A.xml16
-rw-r--r--src/devices/pic/xml_data/16C58B.xml16
-rw-r--r--src/devices/pic/xml_data/16C61.xml20
-rw-r--r--src/devices/pic/xml_data/16C62.xml20
-rw-r--r--src/devices/pic/xml_data/16C620.xml24
-rw-r--r--src/devices/pic/xml_data/16C620A.xml24
-rw-r--r--src/devices/pic/xml_data/16C621.xml24
-rw-r--r--src/devices/pic/xml_data/16C621A.xml24
-rw-r--r--src/devices/pic/xml_data/16C622.xml24
-rw-r--r--src/devices/pic/xml_data/16C622A.xml24
-rw-r--r--src/devices/pic/xml_data/16C62A.xml24
-rw-r--r--src/devices/pic/xml_data/16C62B.xml24
-rw-r--r--src/devices/pic/xml_data/16C63.xml24
-rw-r--r--src/devices/pic/xml_data/16C63A.xml24
-rw-r--r--src/devices/pic/xml_data/16C64.xml20
-rw-r--r--src/devices/pic/xml_data/16C641.xml28
-rw-r--r--src/devices/pic/xml_data/16C642.xml28
-rw-r--r--src/devices/pic/xml_data/16C64A.xml24
-rw-r--r--src/devices/pic/xml_data/16C65.xml20
-rw-r--r--src/devices/pic/xml_data/16C65A.xml24
-rw-r--r--src/devices/pic/xml_data/16C65B.xml24
-rw-r--r--src/devices/pic/xml_data/16C66.xml24
-rw-r--r--src/devices/pic/xml_data/16C661.xml28
-rw-r--r--src/devices/pic/xml_data/16C662.xml28
-rw-r--r--src/devices/pic/xml_data/16C67.xml24
-rw-r--r--src/devices/pic/xml_data/16C71.xml20
-rw-r--r--src/devices/pic/xml_data/16C710.xml24
-rw-r--r--src/devices/pic/xml_data/16C711.xml24
-rw-r--r--src/devices/pic/xml_data/16C712.xml24
-rw-r--r--src/devices/pic/xml_data/16C715.xml28
-rw-r--r--src/devices/pic/xml_data/16C716.xml24
-rw-r--r--src/devices/pic/xml_data/16C717.xml32
-rw-r--r--src/devices/pic/xml_data/16C72.xml24
-rw-r--r--src/devices/pic/xml_data/16C72A.xml24
-rw-r--r--src/devices/pic/xml_data/16C73.xml20
-rw-r--r--src/devices/pic/xml_data/16C73A.xml24
-rw-r--r--src/devices/pic/xml_data/16C73B.xml24
-rw-r--r--src/devices/pic/xml_data/16C74.xml20
-rw-r--r--src/devices/pic/xml_data/16C745.xml20
-rw-r--r--src/devices/pic/xml_data/16C74A.xml24
-rw-r--r--src/devices/pic/xml_data/16C74B.xml24
-rw-r--r--src/devices/pic/xml_data/16C76.xml24
-rw-r--r--src/devices/pic/xml_data/16C765.xml20
-rw-r--r--src/devices/pic/xml_data/16C77.xml24
-rw-r--r--src/devices/pic/xml_data/16C770.xml32
-rw-r--r--src/devices/pic/xml_data/16C771.xml32
-rw-r--r--src/devices/pic/xml_data/16C773.xml28
-rw-r--r--src/devices/pic/xml_data/16C774.xml28
-rw-r--r--src/devices/pic/xml_data/16C781.xml32
-rw-r--r--src/devices/pic/xml_data/16C782.xml32
-rw-r--r--src/devices/pic/xml_data/16C84.xml20
-rw-r--r--src/devices/pic/xml_data/16C923.xml20
-rw-r--r--src/devices/pic/xml_data/16C924.xml20
-rw-r--r--src/devices/pic/xml_data/16C925.xml24
-rw-r--r--src/devices/pic/xml_data/16C926.xml24
-rw-r--r--src/devices/pic/xml_data/16CE623.xml24
-rw-r--r--src/devices/pic/xml_data/16CE624.xml24
-rw-r--r--src/devices/pic/xml_data/16CE625.xml24
-rw-r--r--src/devices/pic/xml_data/16CR54.xml_broken16
-rw-r--r--src/devices/pic/xml_data/16CR54A.xml16
-rw-r--r--src/devices/pic/xml_data/16CR54B.xml16
-rw-r--r--src/devices/pic/xml_data/16CR54C.xml16
-rw-r--r--src/devices/pic/xml_data/16CR56A.xml16
-rw-r--r--src/devices/pic/xml_data/16CR57B.xml16
-rw-r--r--src/devices/pic/xml_data/16CR57C.xml16
-rw-r--r--src/devices/pic/xml_data/16CR58A.xml16
-rw-r--r--src/devices/pic/xml_data/16CR58B.xml16
-rw-r--r--src/devices/pic/xml_data/16CR62.xml24
-rw-r--r--src/devices/pic/xml_data/16CR620A.xml24
-rw-r--r--src/devices/pic/xml_data/16CR63.xml24
-rw-r--r--src/devices/pic/xml_data/16CR64.xml24
-rw-r--r--src/devices/pic/xml_data/16CR65.xml24
-rw-r--r--src/devices/pic/xml_data/16CR72.xml24
-rw-r--r--src/devices/pic/xml_data/16CR73.xml24
-rw-r--r--src/devices/pic/xml_data/16CR74.xml24
-rw-r--r--src/devices/pic/xml_data/16CR76.xml24
-rw-r--r--src/devices/pic/xml_data/16CR77.xml24
-rw-r--r--src/devices/pic/xml_data/16CR83.xml24
-rw-r--r--src/devices/pic/xml_data/16CR84.xml24
-rw-r--r--src/devices/pic/xml_data/16F505.xml22
-rw-r--r--src/devices/pic/xml_data/16F506.xml26
-rw-r--r--src/devices/pic/xml_data/16F54.xml16
-rw-r--r--src/devices/pic/xml_data/16F57.xml16
-rw-r--r--src/devices/pic/xml_data/16F59.xml16
-rw-r--r--src/devices/pic/xml_data/16F610.xml34
-rw-r--r--src/devices/pic/xml_data/16F616.xml34
-rw-r--r--src/devices/pic/xml_data/16F627.xml36
-rw-r--r--src/devices/pic/xml_data/16F627A.xml36
-rw-r--r--src/devices/pic/xml_data/16F628.xml36
-rw-r--r--src/devices/pic/xml_data/16F628A.xml36
-rw-r--r--src/devices/pic/xml_data/16F630.xml38
-rw-r--r--src/devices/pic/xml_data/16F631.xml42
-rw-r--r--src/devices/pic/xml_data/16F636.xml46
-rw-r--r--src/devices/pic/xml_data/16F639.xml46
-rw-r--r--src/devices/pic/xml_data/16F648A.xml36
-rw-r--r--src/devices/pic/xml_data/16F676.xml38
-rw-r--r--src/devices/pic/xml_data/16F677.xml42
-rw-r--r--src/devices/pic/xml_data/16F684.xml42
-rw-r--r--src/devices/pic/xml_data/16F685.xml42
-rw-r--r--src/devices/pic/xml_data/16F687.xml42
-rw-r--r--src/devices/pic/xml_data/16F688.xml42
-rw-r--r--src/devices/pic/xml_data/16F689.xml42
-rw-r--r--src/devices/pic/xml_data/16F690.xml42
-rw-r--r--src/devices/pic/xml_data/16F716.xml28
-rw-r--r--src/devices/pic/xml_data/16F72.xml24
-rw-r--r--src/devices/pic/xml_data/16F73.xml24
-rw-r--r--src/devices/pic/xml_data/16F737.xml54
-rw-r--r--src/devices/pic/xml_data/16F74.xml24
-rw-r--r--src/devices/pic/xml_data/16F747.xml54
-rw-r--r--src/devices/pic/xml_data/16F76.xml24
-rw-r--r--src/devices/pic/xml_data/16F767.xml54
-rw-r--r--src/devices/pic/xml_data/16F77.xml24
-rw-r--r--src/devices/pic/xml_data/16F777.xml54
-rw-r--r--src/devices/pic/xml_data/16F785.xml42
-rw-r--r--src/devices/pic/xml_data/16F818.xml48
-rw-r--r--src/devices/pic/xml_data/16F819.xml48
-rw-r--r--src/devices/pic/xml_data/16F83.xml20
-rw-r--r--src/devices/pic/xml_data/16F84.xml20
-rw-r--r--src/devices/pic/xml_data/16F84A.xml20
-rw-r--r--src/devices/pic/xml_data/16F87.xml58
-rw-r--r--src/devices/pic/xml_data/16F870.xml40
-rw-r--r--src/devices/pic/xml_data/16F871.xml40
-rw-r--r--src/devices/pic/xml_data/16F872.xml40
-rw-r--r--src/devices/pic/xml_data/16F873.xml40
-rw-r--r--src/devices/pic/xml_data/16F873A.xml40
-rw-r--r--src/devices/pic/xml_data/16F874.xml40
-rw-r--r--src/devices/pic/xml_data/16F874A.xml40
-rw-r--r--src/devices/pic/xml_data/16F876.xml40
-rw-r--r--src/devices/pic/xml_data/16F876A.xml40
-rw-r--r--src/devices/pic/xml_data/16F877.xml40
-rw-r--r--src/devices/pic/xml_data/16F877A.xml40
-rw-r--r--src/devices/pic/xml_data/16F88.xml58
-rw-r--r--src/devices/pic/xml_data/16F882.xml60
-rw-r--r--src/devices/pic/xml_data/16F883.xml60
-rw-r--r--src/devices/pic/xml_data/16F884.xml60
-rw-r--r--src/devices/pic/xml_data/16F886.xml60
-rw-r--r--src/devices/pic/xml_data/16F887.xml60
-rw-r--r--src/devices/pic/xml_data/16F913.xml46
-rw-r--r--src/devices/pic/xml_data/16F914.xml46
-rw-r--r--src/devices/pic/xml_data/16F916.xml46
-rw-r--r--src/devices/pic/xml_data/16F917.xml46
-rw-r--r--src/devices/pic/xml_data/16F946.xml46
-rw-r--r--src/devices/pic/xml_data/16HV540.xml16
-rw-r--r--src/devices/pic/xml_data/17C42.xml14
-rw-r--r--src/devices/pic/xml_data/17C42A.xml14
-rw-r--r--src/devices/pic/xml_data/17C43.xml14
-rw-r--r--src/devices/pic/xml_data/17C44.xml14
-rw-r--r--src/devices/pic/xml_data/17C752.xml18
-rw-r--r--src/devices/pic/xml_data/17C756.xml18
-rw-r--r--src/devices/pic/xml_data/17C756A.xml18
-rw-r--r--src/devices/pic/xml_data/17C762.xml18
-rw-r--r--src/devices/pic/xml_data/17C766.xml18
-rw-r--r--src/devices/pic/xml_data/17CR42.xml14
-rw-r--r--src/devices/pic/xml_data/17CR43.xml14
-rw-r--r--src/devices/pic/xml_data/18C242.xml58
-rw-r--r--src/devices/pic/xml_data/18C252.xml58
-rw-r--r--src/devices/pic/xml_data/18C442.xml58
-rw-r--r--src/devices/pic/xml_data/18C452.xml58
-rw-r--r--src/devices/pic/xml_data/18C601.xml44
-rw-r--r--src/devices/pic/xml_data/18C658.xml54
-rw-r--r--src/devices/pic/xml_data/18C801.xml44
-rw-r--r--src/devices/pic/xml_data/18C858.xml54
-rw-r--r--src/devices/pic/xml_data/18F1220.xml126
-rw-r--r--src/devices/pic/xml_data/18F1230.xml150
-rw-r--r--src/devices/pic/xml_data/18F1320.xml126
-rw-r--r--src/devices/pic/xml_data/18F1330.xml150
-rw-r--r--src/devices/pic/xml_data/18F2220.xml134
-rw-r--r--src/devices/pic/xml_data/18F2221.xml146
-rw-r--r--src/devices/pic/xml_data/18F2320.xml158
-rw-r--r--src/devices/pic/xml_data/18F2321.xml146
-rw-r--r--src/devices/pic/xml_data/18F2331.xml146
-rw-r--r--src/devices/pic/xml_data/18F2410.xml134
-rw-r--r--src/devices/pic/xml_data/18F242.xml122
-rw-r--r--src/devices/pic/xml_data/18F2420.xml142
-rw-r--r--src/devices/pic/xml_data/18F2423.xml142
-rw-r--r--src/devices/pic/xml_data/18F2431.xml146
-rw-r--r--src/devices/pic/xml_data/18F2439.xml114
-rw-r--r--src/devices/pic/xml_data/18F2450.xml150
-rw-r--r--src/devices/pic/xml_data/18F2455.xml170
-rw-r--r--src/devices/pic/xml_data/18F248.xml118
-rw-r--r--src/devices/pic/xml_data/18F2480.xml142
-rw-r--r--src/devices/pic/xml_data/18F24J10.xml60
-rw-r--r--src/devices/pic/xml_data/18F2510.xml158
-rw-r--r--src/devices/pic/xml_data/18F2515.xml146
-rw-r--r--src/devices/pic/xml_data/18F252.xml146
-rw-r--r--src/devices/pic/xml_data/18F2520.xml166
-rw-r--r--src/devices/pic/xml_data/18F2523.xml166
-rw-r--r--src/devices/pic/xml_data/18F2525.xml154
-rw-r--r--src/devices/pic/xml_data/18F2539.xml126
-rw-r--r--src/devices/pic/xml_data/18F2550.xml174
-rw-r--r--src/devices/pic/xml_data/18F258.xml142
-rw-r--r--src/devices/pic/xml_data/18F2580.xml166
-rw-r--r--src/devices/pic/xml_data/18F2585.xml154
-rw-r--r--src/devices/pic/xml_data/18F25J10.xml60
-rw-r--r--src/devices/pic/xml_data/18F2610.xml158
-rw-r--r--src/devices/pic/xml_data/18F2620.xml158
-rw-r--r--src/devices/pic/xml_data/18F2680.xml166
-rw-r--r--src/devices/pic/xml_data/18F2682.xml178
-rw-r--r--src/devices/pic/xml_data/18F2685.xml190
-rw-r--r--src/devices/pic/xml_data/18F4220.xml134
-rw-r--r--src/devices/pic/xml_data/18F4221.xml150
-rw-r--r--src/devices/pic/xml_data/18F4320.xml158
-rw-r--r--src/devices/pic/xml_data/18F4321.xml150
-rw-r--r--src/devices/pic/xml_data/18F4331.xml162
-rw-r--r--src/devices/pic/xml_data/18F4410.xml134
-rw-r--r--src/devices/pic/xml_data/18F442.xml122
-rw-r--r--src/devices/pic/xml_data/18F4420.xml142
-rw-r--r--src/devices/pic/xml_data/18F4423.xml142
-rw-r--r--src/devices/pic/xml_data/18F4431.xml186
-rw-r--r--src/devices/pic/xml_data/18F4439.xml114
-rw-r--r--src/devices/pic/xml_data/18F4450.xml154
-rw-r--r--src/devices/pic/xml_data/18F4455.xml174
-rw-r--r--src/devices/pic/xml_data/18F448.xml118
-rw-r--r--src/devices/pic/xml_data/18F4480.xml142
-rw-r--r--src/devices/pic/xml_data/18F44J10.xml60
-rw-r--r--src/devices/pic/xml_data/18F4510.xml158
-rw-r--r--src/devices/pic/xml_data/18F4515.xml146
-rw-r--r--src/devices/pic/xml_data/18F452.xml146
-rw-r--r--src/devices/pic/xml_data/18F4520.xml166
-rw-r--r--src/devices/pic/xml_data/18F4523.xml166
-rw-r--r--src/devices/pic/xml_data/18F4525.xml154
-rw-r--r--src/devices/pic/xml_data/18F4539.xml126
-rw-r--r--src/devices/pic/xml_data/18F4550.xml178
-rw-r--r--src/devices/pic/xml_data/18F458.xml142
-rw-r--r--src/devices/pic/xml_data/18F4580.xml166
-rw-r--r--src/devices/pic/xml_data/18F4585.xml154
-rw-r--r--src/devices/pic/xml_data/18F45J10.xml60
-rw-r--r--src/devices/pic/xml_data/18F4610.xml158
-rw-r--r--src/devices/pic/xml_data/18F4620.xml158
-rw-r--r--src/devices/pic/xml_data/18F4680.xml166
-rw-r--r--src/devices/pic/xml_data/18F4682.xml178
-rw-r--r--src/devices/pic/xml_data/18F4685.xml190
-rw-r--r--src/devices/pic/xml_data/18F6310.xml106
-rw-r--r--src/devices/pic/xml_data/18F6390.xml106
-rw-r--r--src/devices/pic/xml_data/18F6393.xml106
-rw-r--r--src/devices/pic/xml_data/18F63J11.xml60
-rw-r--r--src/devices/pic/xml_data/18F63J90.xml60
-rw-r--r--src/devices/pic/xml_data/18F6410.xml106
-rw-r--r--src/devices/pic/xml_data/18F6490.xml106
-rw-r--r--src/devices/pic/xml_data/18F6493.xml106
-rw-r--r--src/devices/pic/xml_data/18F64J11.xml60
-rw-r--r--src/devices/pic/xml_data/18F64J90.xml60
-rw-r--r--src/devices/pic/xml_data/18F6520.xml146
-rw-r--r--src/devices/pic/xml_data/18F6525.xml138
-rw-r--r--src/devices/pic/xml_data/18F6527.xml154
-rw-r--r--src/devices/pic/xml_data/18F6585.xml138
-rw-r--r--src/devices/pic/xml_data/18F65J10.xml60
-rw-r--r--src/devices/pic/xml_data/18F65J11.xml60
-rw-r--r--src/devices/pic/xml_data/18F65J15.xml60
-rw-r--r--src/devices/pic/xml_data/18F65J50.xml68
-rw-r--r--src/devices/pic/xml_data/18F65J90.xml60
-rw-r--r--src/devices/pic/xml_data/18F6620.xml146
-rw-r--r--src/devices/pic/xml_data/18F6621.xml150
-rw-r--r--src/devices/pic/xml_data/18F6622.xml166
-rw-r--r--src/devices/pic/xml_data/18F6627.xml190
-rw-r--r--src/devices/pic/xml_data/18F6680.xml150
-rw-r--r--src/devices/pic/xml_data/18F66J10.xml60
-rw-r--r--src/devices/pic/xml_data/18F66J11.xml64
-rw-r--r--src/devices/pic/xml_data/18F66J15.xml60
-rw-r--r--src/devices/pic/xml_data/18F66J16.xml64
-rw-r--r--src/devices/pic/xml_data/18F66J50.xml68
-rw-r--r--src/devices/pic/xml_data/18F66J55.xml68
-rw-r--r--src/devices/pic/xml_data/18F66J60.xml60
-rw-r--r--src/devices/pic/xml_data/18F66J65.xml60
-rw-r--r--src/devices/pic/xml_data/18F6720.xml194
-rw-r--r--src/devices/pic/xml_data/18F6722.xml214
-rw-r--r--src/devices/pic/xml_data/18F67J10.xml60
-rw-r--r--src/devices/pic/xml_data/18F67J11.xml64
-rw-r--r--src/devices/pic/xml_data/18F67J50.xml68
-rw-r--r--src/devices/pic/xml_data/18F67J60.xml60
-rw-r--r--src/devices/pic/xml_data/18F8310.xml106
-rw-r--r--src/devices/pic/xml_data/18F8390.xml106
-rw-r--r--src/devices/pic/xml_data/18F8393.xml94
-rw-r--r--src/devices/pic/xml_data/18F83J11.xml80
-rw-r--r--src/devices/pic/xml_data/18F83J90.xml80
-rw-r--r--src/devices/pic/xml_data/18F8410.xml94
-rw-r--r--src/devices/pic/xml_data/18F8490.xml94
-rw-r--r--src/devices/pic/xml_data/18F8493.xml94
-rw-r--r--src/devices/pic/xml_data/18F84J11.xml80
-rw-r--r--src/devices/pic/xml_data/18F84J90.xml80
-rw-r--r--src/devices/pic/xml_data/18F8520.xml154
-rw-r--r--src/devices/pic/xml_data/18F8525.xml150
-rw-r--r--src/devices/pic/xml_data/18F8527.xml174
-rw-r--r--src/devices/pic/xml_data/18F8585.xml150
-rw-r--r--src/devices/pic/xml_data/18F85J10.xml80
-rw-r--r--src/devices/pic/xml_data/18F85J11.xml80
-rw-r--r--src/devices/pic/xml_data/18F85J15.xml80
-rw-r--r--src/devices/pic/xml_data/18F85J50.xml92
-rw-r--r--src/devices/pic/xml_data/18F85J90.xml80
-rw-r--r--src/devices/pic/xml_data/18F8620.xml154
-rw-r--r--src/devices/pic/xml_data/18F8621.xml162
-rw-r--r--src/devices/pic/xml_data/18F8622.xml186
-rw-r--r--src/devices/pic/xml_data/18F8627.xml210
-rw-r--r--src/devices/pic/xml_data/18F8680.xml162
-rw-r--r--src/devices/pic/xml_data/18F86J10.xml80
-rw-r--r--src/devices/pic/xml_data/18F86J11.xml88
-rw-r--r--src/devices/pic/xml_data/18F86J15.xml80
-rw-r--r--src/devices/pic/xml_data/18F86J16.xml88
-rw-r--r--src/devices/pic/xml_data/18F86J50.xml92
-rw-r--r--src/devices/pic/xml_data/18F86J55.xml92
-rw-r--r--src/devices/pic/xml_data/18F86J60.xml68
-rw-r--r--src/devices/pic/xml_data/18F86J65.xml68
-rw-r--r--src/devices/pic/xml_data/18F8720.xml202
-rw-r--r--src/devices/pic/xml_data/18F8722.xml234
-rw-r--r--src/devices/pic/xml_data/18F87J10.xml80
-rw-r--r--src/devices/pic/xml_data/18F87J11.xml88
-rw-r--r--src/devices/pic/xml_data/18F87J50.xml92
-rw-r--r--src/devices/pic/xml_data/18F87J60.xml68
-rw-r--r--src/devices/pic/xml_data/18F96J60.xml84
-rw-r--r--src/devices/pic/xml_data/18F96J65.xml84
-rw-r--r--src/devices/pic/xml_data/18F97J60.xml84
-rw-r--r--src/devices/pic/xml_data/24FJ128GA006.xml62
-rw-r--r--src/devices/pic/xml_data/24FJ128GA008.xml62
-rw-r--r--src/devices/pic/xml_data/24FJ128GA010.xml62
-rw-r--r--src/devices/pic/xml_data/24FJ64GA002.xml70
-rw-r--r--src/devices/pic/xml_data/24FJ64GA004.xml70
-rw-r--r--src/devices/pic/xml_data/24FJ64GA006.xml62
-rw-r--r--src/devices/pic/xml_data/24FJ64GA008.xml62
-rw-r--r--src/devices/pic/xml_data/24FJ64GA010.xml62
-rw-r--r--src/devices/pic/xml_data/24FJ96GA006.xml62
-rw-r--r--src/devices/pic/xml_data/24FJ96GA008.xml62
-rw-r--r--src/devices/pic/xml_data/24FJ96GA010.xml62
-rw-r--r--src/devices/pic/xml_data/24HJ128GP206.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ128GP210.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ128GP306.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ128GP310.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ128GP506.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ128GP510.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ12GP201.xml102
-rw-r--r--src/devices/pic/xml_data/24HJ12GP202.xml102
-rw-r--r--src/devices/pic/xml_data/24HJ16GP304.xml102
-rw-r--r--src/devices/pic/xml_data/24HJ256GP206.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ256GP210.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ256GP610.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ32GP202.xml102
-rw-r--r--src/devices/pic/xml_data/24HJ32GP204.xml102
-rw-r--r--src/devices/pic/xml_data/24HJ64GP206.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ64GP210.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ64GP506.xml118
-rw-r--r--src/devices/pic/xml_data/24HJ64GP510.xml118
-rw-r--r--src/devices/pic/xml_data/30F1010.xml86
-rw-r--r--src/devices/pic/xml_data/30F2010.xml88
-rw-r--r--src/devices/pic/xml_data/30F2011.xml72
-rw-r--r--src/devices/pic/xml_data/30F2012.xml72
-rw-r--r--src/devices/pic/xml_data/30F2020.xml86
-rw-r--r--src/devices/pic/xml_data/30F2023.xml86
-rw-r--r--src/devices/pic/xml_data/30F3010.xml84
-rw-r--r--src/devices/pic/xml_data/30F3011.xml84
-rw-r--r--src/devices/pic/xml_data/30F3012.xml72
-rw-r--r--src/devices/pic/xml_data/30F3013.xml72
-rw-r--r--src/devices/pic/xml_data/30F3014.xml72
-rw-r--r--src/devices/pic/xml_data/30F4011.xml88
-rw-r--r--src/devices/pic/xml_data/30F4012.xml88
-rw-r--r--src/devices/pic/xml_data/30F4013.xml72
-rw-r--r--src/devices/pic/xml_data/30F5011.xml116
-rw-r--r--src/devices/pic/xml_data/30F5013.xml116
-rw-r--r--src/devices/pic/xml_data/30F5015.xml84
-rw-r--r--src/devices/pic/xml_data/30F5016.xml84
-rw-r--r--src/devices/pic/xml_data/30F6010.xml88
-rw-r--r--src/devices/pic/xml_data/30F6010A.xml124
-rw-r--r--src/devices/pic/xml_data/30F6011.xml76
-rw-r--r--src/devices/pic/xml_data/30F6011A.xml112
-rw-r--r--src/devices/pic/xml_data/30F6012.xml76
-rw-r--r--src/devices/pic/xml_data/30F6012A.xml112
-rw-r--r--src/devices/pic/xml_data/30F6013.xml76
-rw-r--r--src/devices/pic/xml_data/30F6013A.xml112
-rw-r--r--src/devices/pic/xml_data/30F6014.xml76
-rw-r--r--src/devices/pic/xml_data/30F6014A.xml112
-rw-r--r--src/devices/pic/xml_data/30F6015.xml124
-rw-r--r--src/devices/pic/xml_data/pic.xsd12
-rw-r--r--src/devices/pic/xml_data/registers/registers.xml306
416 files changed, 15041 insertions, 15041 deletions
diff --git a/src/devices/pic/xml_data/10F200.xml b/src/devices/pic/xml_data/10F200.xml
index 11ce1ff..eb3c1f1 100644
--- a/src/devices/pic/xml_data/10F200.xml
+++ b/src/devices/pic/xml_data/10F200.xml
@@ -27,29 +27,29 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x0FE" />
- <memory name="calibration" start="0x0FF" end="0x0FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x100" end="0x103" rmask="0x00F" />
+ <memory name="calibration" start="0x0FF" end="0x0FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x100" end="0x103" rtqmask="0x00F" />
<memory name="config" start="0x1FF" end="0x1FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x104" end="0x104" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" >
+ <tqmask name="FOSC" value="0x003" >
<value value="default" name="invalid" />
<value value="0x003" name="INTRC" cname="_IntRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:0FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/10F202.xml b/src/devices/pic/xml_data/10F202.xml
index 25ce72a..f7c420e 100644
--- a/src/devices/pic/xml_data/10F202.xml
+++ b/src/devices/pic/xml_data/10F202.xml
@@ -27,29 +27,29 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FE" />
- <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x204" end="0x204" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" >
+ <tqmask name="FOSC" value="0x003" >
<value value="default" name="invalid" />
<value value="0x003" name="INTRC" cname="_IntRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:1FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/10F204.xml b/src/devices/pic/xml_data/10F204.xml
index e2d2e6d..40631ef 100644
--- a/src/devices/pic/xml_data/10F204.xml
+++ b/src/devices/pic/xml_data/10F204.xml
@@ -27,29 +27,29 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x0FE" />
- <memory name="calibration" start="0x0FF" end="0x0FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x100" end="0x103" rmask="0x00F" />
+ <memory name="calibration" start="0x0FF" end="0x0FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x100" end="0x103" rtqmask="0x00F" />
<memory name="config" start="0x1FF" end="0x1FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x104" end="0x104" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" >
+ <tqmask name="FOSC" value="0x003" >
<value value="default" name="invalid" />
<value value="0x003" name="INTRC" cname="_IntRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:0FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/10F206.xml b/src/devices/pic/xml_data/10F206.xml
index 4e66268..c5030eb 100644
--- a/src/devices/pic/xml_data/10F206.xml
+++ b/src/devices/pic/xml_data/10F206.xml
@@ -27,29 +27,29 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FE" />
- <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x204" end="0x204" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" cmask="0x01C" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" ctqmask="0x01C" >
+ <tqmask name="FOSC" value="0x003" >
<value value="default" name="invalid" />
<value value="0x003" name="INTRC" cname="_IntRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:1FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/10F220.xml b/src/devices/pic/xml_data/10F220.xml
index 694d161..99e7019 100644
--- a/src/devices/pic/xml_data/10F220.xml
+++ b/src/devices/pic/xml_data/10F220.xml
@@ -28,33 +28,33 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x0FE" />
- <memory name="calibration" start="0x0FF" end="0x0FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x100" end="0x103" rmask="0x00F" />
+ <memory name="calibration" start="0x0FF" end="0x0FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x100" end="0x103" rtqmask="0x00F" />
<memory name="config" start="0x1FF" end="0x1FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x104" end="0x104" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" >
- <mask name="IOSCFS" value="0x001" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" >
+ <tqmask name="IOSCFS" value="0x001" >
<value value="0x000" name="4MHZ" cname="_IOFSCS_4MHZ" ecnames="_IOSCFS_4MHZ" />
<value value="0x001" name="8MHZ" cname="_IOFSCS_8MHZ" ecnames="_IOSCFS_8MHZ" />
- </mask>
- <mask name="MCPU" value="0x002" >
+ </tqmask>
+ <tqmask name="MCPU" value="0x002" >
<value value="0x000" name="On" cname="_MCPU_ON" />
<value value="0x002" name="Off" cname="_MCPU_OFF" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:0FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/10F222.xml b/src/devices/pic/xml_data/10F222.xml
index 4cba906..3597849 100644
--- a/src/devices/pic/xml_data/10F222.xml
+++ b/src/devices/pic/xml_data/10F222.xml
@@ -28,33 +28,33 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FE" />
- <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x204" end="0x204" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x01F" >
- <mask name="IOSCFS" value="0x001" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x01F" >
+ <tqmask name="IOSCFS" value="0x001" >
<value value="0x000" name="4MHZ" cname="_IOFSCS_4MHZ" ecnames="_IOSCFS_4MHZ" />
<value value="0x001" name="8MHZ" cname="_IOFSCS_8MHZ" ecnames="_IOSCFS_8MHZ" />
- </mask>
- <mask name="MCPU" value="0x002" >
+ </tqmask>
+ <tqmask name="MCPU" value="0x002" >
<value value="0x000" name="On" cname="_MCPU_ON" />
<value value="0x002" name="Off" cname="_MCPU_OFF" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:1FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C508.xml b/src/devices/pic/xml_data/12C508.xml
index cb39eae..2639704 100644
--- a/src/devices/pic/xml_data/12C508.xml
+++ b/src/devices/pic/xml_data/12C508.xml
@@ -30,30 +30,30 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FE" />
- <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="INTRC" cname="_IntRC_OSC" />
<value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:1FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C508A.xml b/src/devices/pic/xml_data/12C508A.xml
index f1ffb3f..a5c9497 100644
--- a/src/devices/pic/xml_data/12C508A.xml
+++ b/src/devices/pic/xml_data/12C508A.xml
@@ -27,30 +27,30 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FE" />
- <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="INTRC" cname="_IntRC_OSC" />
<value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:1FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C509.xml b/src/devices/pic/xml_data/12C509.xml
index dbe885b..7b10e99 100644
--- a/src/devices/pic/xml_data/12C509.xml
+++ b/src/devices/pic/xml_data/12C509.xml
@@ -30,30 +30,30 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FE" />
- <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="INTRC" cname="_IntRC_OSC" />
<value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:3FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C509A.xml b/src/devices/pic/xml_data/12C509A.xml
index 240783f..0c41121 100644
--- a/src/devices/pic/xml_data/12C509A.xml
+++ b/src/devices/pic/xml_data/12C509A.xml
@@ -27,30 +27,30 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FE" />
- <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="INTRC" cname="_IntRC_OSC" />
<value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:3FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C671.xml b/src/devices/pic/xml_data/12C671.xml
index f675723..bcb6217 100644
--- a/src/devices/pic/xml_data/12C671.xml
+++ b/src/devices/pic/xml_data/12C671.xml
@@ -35,13 +35,13 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FE" />
- <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -50,24 +50,24 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0080" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0080" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0080" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x3F60" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F60" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1520" name="200:3FE" cname="_CP_75" />
<value value="default" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12C672.xml b/src/devices/pic/xml_data/12C672.xml
index 80511f1..17e100c 100644
--- a/src/devices/pic/xml_data/12C672.xml
+++ b/src/devices/pic/xml_data/12C672.xml
@@ -36,13 +36,13 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FE" />
- <memory name="calibration" start="0x07FF" end="0x07FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="calibration" start="0x07FF" end="0x07FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -51,25 +51,25 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0080" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0080" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0080" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x3F60" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F60" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1520" name="200:7FE" cname="_CP_75" />
<value value="0x2A40" name="400:7FE" cname="_CP_50" />
<value value="default" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12CE518.xml b/src/devices/pic/xml_data/12CE518.xml
index e27cbb3..619dadc 100644
--- a/src/devices/pic/xml_data/12CE518.xml
+++ b/src/devices/pic/xml_data/12CE518.xml
@@ -27,31 +27,31 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FE" />
- <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
- <memory name="eeprom" start="0x000" end="0x00F" rmask="0xFF" hexfile_offset="?" />
+ <memory name="eeprom" start="0x000" end="0x00F" rtqmask="0xFF" hexfile_offset="?" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="INTRC" cname="_IntRC_OSC" />
<value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:1FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12CE519.xml b/src/devices/pic/xml_data/12CE519.xml
index 210e186..483a926 100644
--- a/src/devices/pic/xml_data/12CE519.xml
+++ b/src/devices/pic/xml_data/12CE519.xml
@@ -27,31 +27,31 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FE" />
- <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
- <memory name="eeprom" start="0x000" end="0x00F" rmask="0xFF" hexfile_offset="?" />
+ <memory name="eeprom" start="0x000" end="0x00F" rtqmask="0xFF" hexfile_offset="?" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="INTRC" cname="_IntRC_OSC" />
<value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:3FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12CE673.xml b/src/devices/pic/xml_data/12CE673.xml
index 3007c29..4d8ea34 100644
--- a/src/devices/pic/xml_data/12CE673.xml
+++ b/src/devices/pic/xml_data/12CE673.xml
@@ -35,14 +35,14 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FE" />
- <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x000F" hexfile_offset="?" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" icnames="_CP_50" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -51,24 +51,24 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0080" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0080" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0080" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x3F60" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F60" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1520" name="200:3FE" cname="_CP_75" />
<value value="default" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12CE674.xml b/src/devices/pic/xml_data/12CE674.xml
index 7670f3f..2f9198a 100644
--- a/src/devices/pic/xml_data/12CE674.xml
+++ b/src/devices/pic/xml_data/12CE674.xml
@@ -36,14 +36,14 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FE" />
- <memory name="calibration" start="0x07FF" end="0x07FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="calibration" start="0x07FF" end="0x07FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x000F" hexfile_offset="?" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -52,25 +52,25 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0080" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0080" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0080" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x3F60" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F60" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1520" name="200:7FE" cname="_CP_75" />
<value value="0x2A40" name="400:7FE" cname="_CP_50" />
<value value="default" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12CR509A.xml b/src/devices/pic/xml_data/12CR509A.xml
index 9a795da..80d4d36 100644
--- a/src/devices/pic/xml_data/12CR509A.xml
+++ b/src/devices/pic/xml_data/12CR509A.xml
@@ -27,30 +27,30 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FE" />
- <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="INTRC" cname="_IntRC_OSC" />
<value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:3FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F508.xml b/src/devices/pic/xml_data/12F508.xml
index 19fd956..4bd60df 100644
--- a/src/devices/pic/xml_data/12F508.xml
+++ b/src/devices/pic/xml_data/12F508.xml
@@ -29,31 +29,31 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FE" />
- <memory name="calibration" start="0x1FF" end="0x1FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="calibration" start="0x1FF" end="0x1FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0x3FF" end="0x3FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x204" end="0x204" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="INTRC" cname="_IntRC_OSC" />
<value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:1FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F509.xml b/src/devices/pic/xml_data/12F509.xml
index 8f3ae12..449e009 100644
--- a/src/devices/pic/xml_data/12F509.xml
+++ b/src/devices/pic/xml_data/12F509.xml
@@ -29,31 +29,31 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FE" />
- <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x404" end="0x404" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x01F" bvalue="0x01F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x01F" bvalue="0x01F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="INTRC" cname="_IntRC_OSC" />
<value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:3FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F510.xml b/src/devices/pic/xml_data/12F510.xml
index 15a2d81..ce2ab4a 100644
--- a/src/devices/pic/xml_data/12F510.xml
+++ b/src/devices/pic/xml_data/12F510.xml
@@ -28,35 +28,35 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FE" />
- <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x404" end="0x404" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x03F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x03F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="INTRC" cname="_IntRC_OSC" />
<value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:3FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="IOSCFS" value="0x020" >
+ </tqmask>
+ <tqmask name="IOSCFS" value="0x020" >
<value value="0x000" name="4MHZ" cname="_IOSCFS_OFF" />
<value value="0x020" name="8MHZ" cname="_IOSCFS_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F519.xml b/src/devices/pic/xml_data/12F519.xml
index 600618c..02dd3d1 100644
--- a/src/devices/pic/xml_data/12F519.xml
+++ b/src/devices/pic/xml_data/12F519.xml
@@ -31,40 +31,40 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FE" />
- <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
+ <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
<memory name="eeprom" start="0x400" end="0x43F" />
- <memory name="user_ids" start="0x440" end="0x443" rmask="0x00F" />
+ <memory name="user_ids" start="0x440" end="0x443" rtqmask="0x00F" />
<memory name="config" start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x444" end="0x444" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x07F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x07F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="INTRC" cname="_IntRC_OSC" />
<value value="0x003" name="EXTRC" cname="_ExtRC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:3FE" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x010" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x010" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x010" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="IOSCFS" value="0x020" >
+ </tqmask>
+ <tqmask name="IOSCFS" value="0x020" >
<value value="0x000" name="4MHZ" cname="_IOSCFS_OFF" />
<value value="0x020" name="8MHZ" cname="_IOSCFS_ON" />
- </mask>
- <mask name="CPD" value="0x040" >
+ </tqmask>
+ <tqmask name="CPD" value="0x040" >
<value value="0x000" name="All" cname="_CPDF_ON" />
<value value="0x040" name="Off" cname="_CPDF_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F609.xml b/src/devices/pic/xml_data/12F609.xml
index d3409ee..07f4b1f 100644
--- a/src/devices/pic/xml_data/12F609.xml
+++ b/src/devices/pic/xml_data/12F609.xml
@@ -39,15 +39,15 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -56,32 +56,32 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="IOSCFS" value="0x0080" >
+ </tqmask>
+ <tqmask name="IOSCFS" value="0x0080" >
<value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" />
<value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="default" name="Off" cname="_BOR_OFF" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F615.xml b/src/devices/pic/xml_data/12F615.xml
index d59445e..e90d419 100644
--- a/src/devices/pic/xml_data/12F615.xml
+++ b/src/devices/pic/xml_data/12F615.xml
@@ -39,15 +39,15 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -56,32 +56,32 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="IOSCFS" value="0x0080" >
+ </tqmask>
+ <tqmask name="IOSCFS" value="0x0080" >
<value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" />
<value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="default" name="Off" cname="_BOR_OFF" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F629.xml b/src/devices/pic/xml_data/12F629.xml
index 53c0cf4..9c4553a 100644
--- a/src/devices/pic/xml_data/12F629.xml
+++ b/src/devices/pic/xml_data/12F629.xml
@@ -36,16 +36,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FE" />
- <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -54,37 +54,37 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x0080" >
+ </tqmask>
+ <tqmask name="CP" value="0x0080" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0080" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BG" value="0x3000">
+ </tqmask>
+ <tqmask name="BG" value="0x3000">
<value value="0x0000" name="Lowest" />
<value value="0x1000" name="Mid/Low" />
<value value="0x2000" name="Mid/High" />
<value value="0x3000" name="Highest" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F635.xml b/src/devices/pic/xml_data/12F635.xml
index f06c3b6..3bf332d 100644
--- a/src/devices/pic/xml_data/12F635.xml
+++ b/src/devices/pic/xml_data/12F635.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x1FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x1FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,45 +48,45 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="WUREN" value="0x1000" >
+ </tqmask>
+ <tqmask name="WUREN" value="0x1000" >
<value value="0x0000" name="On" cname="_WUREN_ON" />
<value value="0x1000" name="Off" cname="_WUREN_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F675.xml b/src/devices/pic/xml_data/12F675.xml
index 6e0f054..e226b4f 100644
--- a/src/devices/pic/xml_data/12F675.xml
+++ b/src/devices/pic/xml_data/12F675.xml
@@ -36,16 +36,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FE" />
- <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -54,37 +54,37 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x0080" >
+ </tqmask>
+ <tqmask name="CP" value="0x0080" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0080" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BG" value="0x3000">
+ </tqmask>
+ <tqmask name="BG" value="0x3000">
<value value="0x0000" name="Lowest" />
<value value="0x1000" name="Mid/Low" />
<value value="0x2000" name="Mid/High" />
<value value="0x3000" name="Highest" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/12F683.xml b/src/devices/pic/xml_data/12F683.xml
index 1c23260..d80b5c1 100644
--- a/src/devices/pic/xml_data/12F683.xml
+++ b/src/devices/pic/xml_data/12F683.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,41 +48,41 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/14000.xml b/src/devices/pic/xml_data/14000.xml
index 8cf2db6..9ee23ed 100644
--- a/src/devices/pic/xml_data/14000.xml
+++ b/src/devices/pic/xml_data/14000.xml
@@ -28,40 +28,40 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FBF" />
- <memory name="calibration" start="0x0FC0" end="0x0FFF" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x0FC0" end="0x0FFF" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FBD" pmask="0x0042" >
- <mask name="FOSC" value="0x0001" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FBD" ptqmask="0x0042" >
+ <tqmask name="FOSC" value="0x0001" >
<value value="0x0000" name="HS" cname="_FOSC_HS" />
<value value="0x0001" name="INTRC" cname="_FOSC_RC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="TRIM" value="0x0042" >
+ </tqmask>
+ <tqmask name="TRIM" value="0x0042" >
<value value="0x0000" name="00" />
<value value="0x0002" name="01" />
<value value="0x0040" name="10" />
<value value="0x0042" name="11" />
- </mask>
- <mask name="CP" value="0x1E30" >
+ </tqmask>
+ <tqmask name="CP" value="0x1E30" >
<value value="0x0000" name="All" cname="_CPP_ON _CPU_ON" />
<value value="0x1E30" name="Off" cname="_CPP_OFF _CPU_OFF" />
<value value="default" name="invalid" />
- </mask>
- <mask name="CPC" value="0x2180" >
+ </tqmask>
+ <tqmask name="CPC" value="0x2180" >
<value value="0x0000" name="All" cname="_CPC_ON" />
<value value="0x2180" name="Off" cname="_CPC_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C432.xml b/src/devices/pic/xml_data/16C432.xml
index e112d5c..bed76d2 100644
--- a/src/devices/pic/xml_data/16C432.xml
+++ b/src/devices/pic/xml_data/16C432.xml
@@ -29,36 +29,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C433.xml b/src/devices/pic/xml_data/16C433.xml
index cf07aaa..6dad096 100644
--- a/src/devices/pic/xml_data/16C433.xml
+++ b/src/devices/pic/xml_data/16C433.xml
@@ -29,13 +29,13 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FE" />
- <memory name="calibration" start="0x07FF" end="0x07FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x07FF" end="0x07FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -44,26 +44,26 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRC_OSC" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0080" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0080" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0080" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x3F60" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F60" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1520" name="200:7FE" cname="_CP_75" />
<value value="0x2A40" name="400:7FE" cname="_CP_50" />
<value value="0x3F60" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C505.xml b/src/devices/pic/xml_data/16C505.xml
index 2cbe2c9..6fa7f11 100644
--- a/src/devices/pic/xml_data/16C505.xml
+++ b/src/devices/pic/xml_data/16C505.xml
@@ -35,13 +35,13 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FE" />
- <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0xFFF" >
- <mask name="FOSC" value="0x007" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x007" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
@@ -50,20 +50,20 @@
<value value="0x005" name="INTRC_CLKOUT" cname="_IntRC_OSC_CLKOUTEN" />
<value value="0x006" name="EXTRC_IO" cname="_ExtRC_OSC_RB4EN" />
<value value="0x007" name="EXTRC_CLKOUT" cname="_ExtRC_OSC_CLKOUTEN" />
- </mask>
- <mask name="WDT" value="0x008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x008" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="MCLRE" value="0x020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x020" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0xFD0" >
+ </tqmask>
+ <tqmask name="CP" value="0xFD0" >
<value value="0x000" name="040:3FE" cname="_CP_ON" />
<value value="0xFD0" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C52.xml b/src/devices/pic/xml_data/16C52.xml
index 6ef7753..f9c1a59 100644
--- a/src/devices/pic/xml_data/16C52.xml
+++ b/src/devices/pic/xml_data/16C52.xml
@@ -30,16 +30,16 @@
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x008" bvalue="0x00B" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x008" bvalue="0x00B" >
+ <tqmask name="FOSC" value="0x003" >
<value value="default" name="invalid" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="All" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C54.xml b/src/devices/pic/xml_data/16C54.xml
index 06455ee..2620238 100644
--- a/src/devices/pic/xml_data/16C54.xml
+++ b/src/devices/pic/xml_data/16C54.xml
@@ -36,25 +36,25 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="All" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C54A.xml b/src/devices/pic/xml_data/16C54A.xml
index c264f10..ae365d8 100644
--- a/src/devices/pic/xml_data/16C54A.xml
+++ b/src/devices/pic/xml_data/16C54A.xml
@@ -45,26 +45,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="All" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C54B.xml b/src/devices/pic/xml_data/16C54B.xml
index d20ae0e..da0ae9a 100644
--- a/src/devices/pic/xml_data/16C54B.xml
+++ b/src/devices/pic/xml_data/16C54B.xml
@@ -40,26 +40,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:1FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C54C.xml b/src/devices/pic/xml_data/16C54C.xml
index 0d1907b..629d54e 100644
--- a/src/devices/pic/xml_data/16C54C.xml
+++ b/src/devices/pic/xml_data/16C54C.xml
@@ -40,26 +40,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:1FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C55.xml b/src/devices/pic/xml_data/16C55.xml
index 0d93443..30d2d4e 100644
--- a/src/devices/pic/xml_data/16C55.xml
+++ b/src/devices/pic/xml_data/16C55.xml
@@ -36,25 +36,25 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="All" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C554.xml b/src/devices/pic/xml_data/16C554.xml
index 1723220..42bb60f 100644
--- a/src/devices/pic/xml_data/16C554.xml
+++ b/src/devices/pic/xml_data/16C554.xml
@@ -38,30 +38,30 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x01FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FBC" bvalue="0x3F3F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FBC" bvalue="0x3F3F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C557.xml b/src/devices/pic/xml_data/16C557.xml
index 3a9ddab..0d37913 100644
--- a/src/devices/pic/xml_data/16C557.xml
+++ b/src/devices/pic/xml_data/16C557.xml
@@ -43,32 +43,32 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FBC" bvalue="0x3F3F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FBC" bvalue="0x3F3F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C558.xml b/src/devices/pic/xml_data/16C558.xml
index 484efee..36cd4e8 100644
--- a/src/devices/pic/xml_data/16C558.xml
+++ b/src/devices/pic/xml_data/16C558.xml
@@ -40,32 +40,32 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FBC" bvalue="0x3F3F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FBC" bvalue="0x3F3F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C55A.xml b/src/devices/pic/xml_data/16C55A.xml
index 27b9eac..6bcc1be 100644
--- a/src/devices/pic/xml_data/16C55A.xml
+++ b/src/devices/pic/xml_data/16C55A.xml
@@ -40,26 +40,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:1FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C56.xml b/src/devices/pic/xml_data/16C56.xml
index a8ec195..cddfd3e 100644
--- a/src/devices/pic/xml_data/16C56.xml
+++ b/src/devices/pic/xml_data/16C56.xml
@@ -36,25 +36,25 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FF" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="All" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C56A.xml b/src/devices/pic/xml_data/16C56A.xml
index 0543765..6e29f70 100644
--- a/src/devices/pic/xml_data/16C56A.xml
+++ b/src/devices/pic/xml_data/16C56A.xml
@@ -40,26 +40,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FF" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:3FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C57.xml b/src/devices/pic/xml_data/16C57.xml
index 4aef05a..4791ee9 100644
--- a/src/devices/pic/xml_data/16C57.xml
+++ b/src/devices/pic/xml_data/16C57.xml
@@ -36,25 +36,25 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x7FF" />
- <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+ <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="All" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C57C.xml b/src/devices/pic/xml_data/16C57C.xml
index 4d5f180..4477c00 100644
--- a/src/devices/pic/xml_data/16C57C.xml
+++ b/src/devices/pic/xml_data/16C57C.xml
@@ -40,26 +40,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x7FF" />
- <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+ <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:7FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C58A.xml b/src/devices/pic/xml_data/16C58A.xml
index a12abb6..e4798ce 100644
--- a/src/devices/pic/xml_data/16C58A.xml
+++ b/src/devices/pic/xml_data/16C58A.xml
@@ -45,25 +45,25 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x7FF" />
- <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+ <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x00C" bvalue="0x00F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0x00C" bvalue="0x00F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="All" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C58B.xml b/src/devices/pic/xml_data/16C58B.xml
index 04f56ce..48e910e 100644
--- a/src/devices/pic/xml_data/16C58B.xml
+++ b/src/devices/pic/xml_data/16C58B.xml
@@ -40,26 +40,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x7FF" />
- <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+ <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:7FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C61.xml b/src/devices/pic/xml_data/16C61.xml
index 0b62c88..6812ee7 100644
--- a/src/devices/pic/xml_data/16C61.xml
+++ b/src/devices/pic/xml_data/16C61.xml
@@ -34,29 +34,29 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x001F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x001F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="Off" cname="_PWRTE_OFF" />
<value value="0x0008" name="On" cname="_PWRTE_ON" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C62.xml b/src/devices/pic/xml_data/16C62.xml
index 8eebe47..e1a3764 100644
--- a/src/devices/pic/xml_data/16C62.xml
+++ b/src/devices/pic/xml_data/16C62.xml
@@ -33,31 +33,31 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="Off" cname="_PWRTE_OFF" />
<value value="0x0008" name="On" cname="_PWRTE_ON" />
- </mask>
- <mask name="CP" value="0x0030" >
+ </tqmask>
+ <tqmask name="CP" value="0x0030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="200:7FF" cname="_CP_75" />
<value value="0x0020" name="400:7FF" cname="_CP_50" />
<value value="0x0030" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C620.xml b/src/devices/pic/xml_data/16C620.xml
index 8a676af..522beaa 100644
--- a/src/devices/pic/xml_data/16C620.xml
+++ b/src/devices/pic/xml_data/16C620.xml
@@ -35,34 +35,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x01FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C620A.xml b/src/devices/pic/xml_data/16C620A.xml
index 9770da4..a36b1c6 100644
--- a/src/devices/pic/xml_data/16C620A.xml
+++ b/src/devices/pic/xml_data/16C620A.xml
@@ -39,34 +39,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x01FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C621.xml b/src/devices/pic/xml_data/16C621.xml
index 401ee06..745ba82 100644
--- a/src/devices/pic/xml_data/16C621.xml
+++ b/src/devices/pic/xml_data/16C621.xml
@@ -36,35 +36,35 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:3FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C621A.xml b/src/devices/pic/xml_data/16C621A.xml
index 97e136e..3e48bd4 100644
--- a/src/devices/pic/xml_data/16C621A.xml
+++ b/src/devices/pic/xml_data/16C621A.xml
@@ -40,35 +40,35 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:3FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C622.xml b/src/devices/pic/xml_data/16C622.xml
index f1675bc..9617071 100644
--- a/src/devices/pic/xml_data/16C622.xml
+++ b/src/devices/pic/xml_data/16C622.xml
@@ -37,36 +37,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C622A.xml b/src/devices/pic/xml_data/16C622A.xml
index 04e0d9b..26b691e 100644
--- a/src/devices/pic/xml_data/16C622A.xml
+++ b/src/devices/pic/xml_data/16C622A.xml
@@ -41,36 +41,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C62A.xml b/src/devices/pic/xml_data/16C62A.xml
index 71bf13f..00c16ea 100644
--- a/src/devices/pic/xml_data/16C62A.xml
+++ b/src/devices/pic/xml_data/16C62A.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C62B.xml b/src/devices/pic/xml_data/16C62B.xml
index 6550cbb..749c9c8 100644
--- a/src/devices/pic/xml_data/16C62B.xml
+++ b/src/devices/pic/xml_data/16C62B.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C63.xml b/src/devices/pic/xml_data/16C63.xml
index 7d21001..16432ee 100644
--- a/src/devices/pic/xml_data/16C63.xml
+++ b/src/devices/pic/xml_data/16C63.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C63A.xml b/src/devices/pic/xml_data/16C63A.xml
index 2a3eac3..6499148 100644
--- a/src/devices/pic/xml_data/16C63A.xml
+++ b/src/devices/pic/xml_data/16C63A.xml
@@ -34,36 +34,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C64.xml b/src/devices/pic/xml_data/16C64.xml
index 2bd6f77..fa3998d 100644
--- a/src/devices/pic/xml_data/16C64.xml
+++ b/src/devices/pic/xml_data/16C64.xml
@@ -33,31 +33,31 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="Off" cname="_PWRTE_OFF" />
<value value="0x0008" name="On" cname="_PWRTE_ON" />
- </mask>
- <mask name="CP" value="0x0030" >
+ </tqmask>
+ <tqmask name="CP" value="0x0030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="200:7FF" cname="_CP_75" />
<value value="0x0020" name="400:7FF" cname="_CP_50" />
<value value="0x0030" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C641.xml b/src/devices/pic/xml_data/16C641.xml
index 2a819ff..74e5fd5 100644
--- a/src/devices/pic/xml_data/16C641.xml
+++ b/src/devices/pic/xml_data/16C641.xml
@@ -28,40 +28,40 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="MPEEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="MPEEN" value="0x0080" >
<value value="0x0000" name="Off" cname="_MPEEN_OFF" />
<value value="0x0080" name="On" cname="_MPEEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:7FF" cname="_CP_50" />
<value value="0x2A20" name="200:7FF" cname="_CP_75" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C642.xml b/src/devices/pic/xml_data/16C642.xml
index c5847a9..e9bc07a 100644
--- a/src/devices/pic/xml_data/16C642.xml
+++ b/src/devices/pic/xml_data/16C642.xml
@@ -33,40 +33,40 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="MPEEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="MPEEN" value="0x0080" >
<value value="0x0000" name="Off" cname="_MPEEN_OFF" />
<value value="0x0080" name="On" cname="_MPEEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C64A.xml b/src/devices/pic/xml_data/16C64A.xml
index c5331e6..274da63 100644
--- a/src/devices/pic/xml_data/16C64A.xml
+++ b/src/devices/pic/xml_data/16C64A.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C65.xml b/src/devices/pic/xml_data/16C65.xml
index 1d5de06..13ff265 100644
--- a/src/devices/pic/xml_data/16C65.xml
+++ b/src/devices/pic/xml_data/16C65.xml
@@ -33,31 +33,31 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="Off" cname="_PWRTE_OFF" />
<value value="0x0008" name="On" cname="_PWRTE_ON" />
- </mask>
- <mask name="CP" value="0x0030" >
+ </tqmask>
+ <tqmask name="CP" value="0x0030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="400:FFF" cname="_CP_75" />
<value value="0x0020" name="800:FFF" cname="_CP_50" />
<value value="0x0030" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C65A.xml b/src/devices/pic/xml_data/16C65A.xml
index 4220f2d..32d4280 100644
--- a/src/devices/pic/xml_data/16C65A.xml
+++ b/src/devices/pic/xml_data/16C65A.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C65B.xml b/src/devices/pic/xml_data/16C65B.xml
index c5eae8a..6463d62 100644
--- a/src/devices/pic/xml_data/16C65B.xml
+++ b/src/devices/pic/xml_data/16C65B.xml
@@ -34,36 +34,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C66.xml b/src/devices/pic/xml_data/16C66.xml
index bfa3307..08f25d5 100644
--- a/src/devices/pic/xml_data/16C66.xml
+++ b/src/devices/pic/xml_data/16C66.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="0800:1FFF" cname="_CP_75" />
<value value="0x2A20" name="1000:1FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C661.xml b/src/devices/pic/xml_data/16C661.xml
index 612f636..36f2bd0 100644
--- a/src/devices/pic/xml_data/16C661.xml
+++ b/src/devices/pic/xml_data/16C661.xml
@@ -28,40 +28,40 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="MPEEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="MPEEN" value="0x0080" >
<value value="0x0000" name="Off" cname="_MPEEN_OFF" />
<value value="0x0080" name="On" cname="_MPEEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C662.xml b/src/devices/pic/xml_data/16C662.xml
index a09c5c5..ffd6fdc 100644
--- a/src/devices/pic/xml_data/16C662.xml
+++ b/src/devices/pic/xml_data/16C662.xml
@@ -33,40 +33,40 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="MPEEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="MPEEN" value="0x0080" >
<value value="0x0000" name="Off" cname="_MPEEN_OFF" />
<value value="0x0080" name="On" cname="_MPEEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C67.xml b/src/devices/pic/xml_data/16C67.xml
index 43c1aa1..26cbb43 100644
--- a/src/devices/pic/xml_data/16C67.xml
+++ b/src/devices/pic/xml_data/16C67.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="0800:1FFF" cname="_CP_75" />
<value value="0x2A20" name="1000:1FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C71.xml b/src/devices/pic/xml_data/16C71.xml
index d23acc3..e453bfa 100644
--- a/src/devices/pic/xml_data/16C71.xml
+++ b/src/devices/pic/xml_data/16C71.xml
@@ -31,29 +31,29 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x001F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x001F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="Off" cname="_PWRTE_OFF" />
<value value="0x0008" name="On" cname="_PWRTE_ON" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C710.xml b/src/devices/pic/xml_data/16C710.xml
index d6a90c2..62b36a3 100644
--- a/src/devices/pic/xml_data/16C710.xml
+++ b/src/devices/pic/xml_data/16C710.xml
@@ -34,34 +34,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x01FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3FB0" >
+ </tqmask>
+ <tqmask name="CP" value="0x3FB0" >
<value value="0x0000" name="040:1FF" cname="_CP_ON" />
<value value="0x3FB0" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C711.xml b/src/devices/pic/xml_data/16C711.xml
index 29518e3..b57c9f5 100644
--- a/src/devices/pic/xml_data/16C711.xml
+++ b/src/devices/pic/xml_data/16C711.xml
@@ -34,34 +34,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3FB0" >
+ </tqmask>
+ <tqmask name="CP" value="0x3FB0" >
<value value="0x0000" name="040:3FF" cname="_CP_ON" />
<value value="0x3FB0" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C712.xml b/src/devices/pic/xml_data/16C712.xml
index 6979deb..400aa43 100644
--- a/src/devices/pic/xml_data/16C712.xml
+++ b/src/devices/pic/xml_data/16C712.xml
@@ -29,35 +29,35 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2A20" name="200:3FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C715.xml b/src/devices/pic/xml_data/16C715.xml
index 501018f..8df94d0 100644
--- a/src/devices/pic/xml_data/16C715.xml
+++ b/src/devices/pic/xml_data/16C715.xml
@@ -33,40 +33,40 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="MPEEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="MPEEN" value="0x0080" >
<value value="0x0000" name="Off" cname="_MPEEN_OFF" />
<value value="0x0080" name="On" cname="_MPEEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C716.xml b/src/devices/pic/xml_data/16C716.xml
index f34e760..6885b77 100644
--- a/src/devices/pic/xml_data/16C716.xml
+++ b/src/devices/pic/xml_data/16C716.xml
@@ -32,36 +32,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C717.xml b/src/devices/pic/xml_data/16C717.xml
index 19c6f6a..9045ec7 100644
--- a/src/devices/pic/xml_data/16C717.xml
+++ b/src/devices/pic/xml_data/16C717.xml
@@ -36,13 +36,13 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -51,34 +51,34 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="ER_IO" cname="_ER_OSC_NOCLKOUT" />
<value value="0x0007" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C00" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C00" >
<value value="0x0000" name="4.5" cname="_VBOR_45" />
<value value="0x0400" name="4.2" cname="_VBOR_42" />
<value value="0x0800" name="2.7" cname="_VBOR_27" />
<value value="0x0C00" name="2.5" cname="_VBOR_25" />
- </mask>
- <mask name="CP" value="0x3300" >
+ </tqmask>
+ <tqmask name="CP" value="0x3300" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x3300" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C72.xml b/src/devices/pic/xml_data/16C72.xml
index e6b88a2..ac7d9b7 100644
--- a/src/devices/pic/xml_data/16C72.xml
+++ b/src/devices/pic/xml_data/16C72.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C72A.xml b/src/devices/pic/xml_data/16C72A.xml
index cabb079..7eb3705 100644
--- a/src/devices/pic/xml_data/16C72A.xml
+++ b/src/devices/pic/xml_data/16C72A.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C73.xml b/src/devices/pic/xml_data/16C73.xml
index 78b69fa..37f92de 100644
--- a/src/devices/pic/xml_data/16C73.xml
+++ b/src/devices/pic/xml_data/16C73.xml
@@ -33,31 +33,31 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="Off" cname="_PWRTE_OFF" />
<value value="0x0008" name="On" cname="_PWRTE_ON" />
- </mask>
- <mask name="CP" value="0x0030" >
+ </tqmask>
+ <tqmask name="CP" value="0x0030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="400:FFF" cname="_CP_75" />
<value value="0x0020" name="800:FFF" cname="_CP_50" />
<value value="0x0030" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C73A.xml b/src/devices/pic/xml_data/16C73A.xml
index df9a672..ee67734 100644
--- a/src/devices/pic/xml_data/16C73A.xml
+++ b/src/devices/pic/xml_data/16C73A.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C73B.xml b/src/devices/pic/xml_data/16C73B.xml
index b2418f1..35694d2 100644
--- a/src/devices/pic/xml_data/16C73B.xml
+++ b/src/devices/pic/xml_data/16C73B.xml
@@ -34,36 +34,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C74.xml b/src/devices/pic/xml_data/16C74.xml
index 091501d..9f5747e 100644
--- a/src/devices/pic/xml_data/16C74.xml
+++ b/src/devices/pic/xml_data/16C74.xml
@@ -33,31 +33,31 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x003F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x003F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="Off" cname="_PWRTE_OFF" />
<value value="0x0008" name="On" cname="_PWRTE_ON" />
- </mask>
- <mask name="CP" value="0x0030" >
+ </tqmask>
+ <tqmask name="CP" value="0x0030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="400:FFF" cname="_CP_75" />
<value value="0x0020" name="800:FFF" cname="_CP_50" />
<value value="0x0030" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C745.xml b/src/devices/pic/xml_data/16C745.xml
index 1a4ab42..daf0552 100644
--- a/src/devices/pic/xml_data/16C745.xml
+++ b/src/devices/pic/xml_data/16C745.xml
@@ -29,32 +29,32 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="HS" cname="_HS_OSC" />
<value value="0x0001" name="EC_CLKOUT" cname="_EC_OSC" />
<value value="0x0002" name="H4" cname="_H4_OSC" />
<value value="0x0003" name="E4_CLKOUT" cname="_E4_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="0800:1FFF" cname="_CP_75" />
<value value="0x2A20" name="1000:1FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C74A.xml b/src/devices/pic/xml_data/16C74A.xml
index 0d784c9..d859fc2 100644
--- a/src/devices/pic/xml_data/16C74A.xml
+++ b/src/devices/pic/xml_data/16C74A.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C74B.xml b/src/devices/pic/xml_data/16C74B.xml
index ce7274f..325fda9 100644
--- a/src/devices/pic/xml_data/16C74B.xml
+++ b/src/devices/pic/xml_data/16C74B.xml
@@ -34,36 +34,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C76.xml b/src/devices/pic/xml_data/16C76.xml
index c5819a2..7c6ed42 100644
--- a/src/devices/pic/xml_data/16C76.xml
+++ b/src/devices/pic/xml_data/16C76.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="0800:1FFF" cname="_CP_75" />
<value value="0x2A20" name="1000:1FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C765.xml b/src/devices/pic/xml_data/16C765.xml
index c441e17..360985e 100644
--- a/src/devices/pic/xml_data/16C765.xml
+++ b/src/devices/pic/xml_data/16C765.xml
@@ -29,32 +29,32 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="HS" cname="_HS_OSC" />
<value value="0x0001" name="EC_CLKOUT" cname="_EC_OSC" />
<value value="0x0002" name="H4" cname="_H4_OSC" />
<value value="0x0003" name="E4_CLKOUT" cname="_E4_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="0800:1FFF" cname="_CP_75" />
<value value="0x2A20" name="1000:1FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C77.xml b/src/devices/pic/xml_data/16C77.xml
index f863d24..60d0a72 100644
--- a/src/devices/pic/xml_data/16C77.xml
+++ b/src/devices/pic/xml_data/16C77.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="0800:1FFF" cname="_CP_75" />
<value value="0x2A20" name="1000:1FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C770.xml b/src/devices/pic/xml_data/16C770.xml
index de1d9e9..cb00a24 100644
--- a/src/devices/pic/xml_data/16C770.xml
+++ b/src/devices/pic/xml_data/16C770.xml
@@ -36,13 +36,13 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -51,34 +51,34 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="ER_IO" cname="_ER_OSC_NOCLKOUT" />
<value value="0x0007" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C00" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C00" >
<value value="0x0000" name="4.5" cname="_VBOR_45" />
<value value="0x0400" name="4.2" cname="_VBOR_42" />
<value value="0x0800" name="2.7" cname="_VBOR_27" />
<value value="0x0C00" name="2.5" cname="_VBOR_25" />
- </mask>
- <mask name="CP" value="0x3300" >
+ </tqmask>
+ <tqmask name="CP" value="0x3300" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x3300" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C771.xml b/src/devices/pic/xml_data/16C771.xml
index 4bf7fcd..6f59244 100644
--- a/src/devices/pic/xml_data/16C771.xml
+++ b/src/devices/pic/xml_data/16C771.xml
@@ -36,13 +36,13 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -51,34 +51,34 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="ER_IO" cname="_ER_OSC_NOCLKOUT" />
<value value="0x0007" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C00" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C00" >
<value value="0x0000" name="4.5" cname="_VBOR_45" />
<value value="0x0400" name="4.2" cname="_VBOR_42" />
<value value="0x0800" name="2.7" cname="_VBOR_27" />
<value value="0x0C00" name="2.5" cname="_VBOR_25" />
- </mask>
- <mask name="CP" value="0x3300" >
+ </tqmask>
+ <tqmask name="CP" value="0x3300" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x3300" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C773.xml b/src/devices/pic/xml_data/16C773.xml
index 1b74ed5..d5d4e06 100644
--- a/src/devices/pic/xml_data/16C773.xml
+++ b/src/devices/pic/xml_data/16C773.xml
@@ -33,42 +33,42 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C00" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C00" >
<value value="0x0000" name="4.5" cname="_VBOR_45" />
<value value="0x0400" name="4.2" cname="_VBOR_42" />
<value value="0x0800" name="2.7" cname="_VBOR_27" />
<value value="0x0C00" name="2.5" cname="_VBOR_25" />
- </mask>
- <mask name="CP" value="0x3330" >
+ </tqmask>
+ <tqmask name="CP" value="0x3330" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1110" name="400:FFF" cname="_CP_75" />
<value value="0x2220" name="800:FFF" cname="_CP_50" />
<value value="0x3330" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C774.xml b/src/devices/pic/xml_data/16C774.xml
index 1d577ee..7915805 100644
--- a/src/devices/pic/xml_data/16C774.xml
+++ b/src/devices/pic/xml_data/16C774.xml
@@ -33,42 +33,42 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C00" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C00" >
<value value="0x0000" name="4.5" cname="_VBOR_45" />
<value value="0x0400" name="4.2" cname="_VBOR_42" />
<value value="0x0800" name="2.7" cname="_VBOR_27" />
<value value="0x0C00" name="2.5" cname="_VBOR_25" />
- </mask>
- <mask name="CP" value="0x3330" >
+ </tqmask>
+ <tqmask name="CP" value="0x3330" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1110" name="400:FFF" cname="_CP_75" />
<value value="0x2220" name="800:FFF" cname="_CP_50" />
<value value="0x3330" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C781.xml b/src/devices/pic/xml_data/16C781.xml
index 2861a67..7533b24 100644
--- a/src/devices/pic/xml_data/16C781.xml
+++ b/src/devices/pic/xml_data/16C781.xml
@@ -32,13 +32,13 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -47,34 +47,34 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="ER_IO" cname="_ER_OSC_NOCLKOUT" />
<value value="0x0007" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C00" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C00" >
<value value="0x0000" name="4.5" cname="_VBOR_45" />
<value value="0x0400" name="4.2" cname="_VBOR_42" />
<value value="0x0800" name="2.7" cname="_VBOR_27" />
<value value="0x0C00" name="2.5" cname="_VBOR_25" />
- </mask>
- <mask name="CP" value="0x3300" >
+ </tqmask>
+ <tqmask name="CP" value="0x3300" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x3300" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C782.xml b/src/devices/pic/xml_data/16C782.xml
index 6192a30..2b863ed 100644
--- a/src/devices/pic/xml_data/16C782.xml
+++ b/src/devices/pic/xml_data/16C782.xml
@@ -32,13 +32,13 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -47,34 +47,34 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="ER_IO" cname="_ER_OSC_NOCLKOUT" />
<value value="0x0007" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C00" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C00" >
<value value="0x0000" name="4.5" cname="_VBOR_45" />
<value value="0x0400" name="4.2" cname="_VBOR_42" />
<value value="0x0800" name="2.7" cname="_VBOR_27" />
<value value="0x0C00" name="2.5" cname="_VBOR_25" />
- </mask>
- <mask name="CP" value="0x3300" >
+ </tqmask>
+ <tqmask name="CP" value="0x3300" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x3300" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C84.xml b/src/devices/pic/xml_data/16C84.xml
index 595bcd9..708ba95 100644
--- a/src/devices/pic/xml_data/16C84.xml
+++ b/src/devices/pic/xml_data/16C84.xml
@@ -25,30 +25,30 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x001F" cmask="0x0018" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x001F" ctqmask="0x0018" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="Off" cname="_PWRTE_OFF" />
<value value="0x0008" name="On" cname="_PWRTE_ON" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C923.xml b/src/devices/pic/xml_data/16C923.xml
index a670a59..3e438d2 100644
--- a/src/devices/pic/xml_data/16C923.xml
+++ b/src/devices/pic/xml_data/16C923.xml
@@ -33,32 +33,32 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C924.xml b/src/devices/pic/xml_data/16C924.xml
index 614ff48..a9096d1 100644
--- a/src/devices/pic/xml_data/16C924.xml
+++ b/src/devices/pic/xml_data/16C924.xml
@@ -33,32 +33,32 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F3F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F3F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C925.xml b/src/devices/pic/xml_data/16C925.xml
index b9c703d..c7a494f 100644
--- a/src/devices/pic/xml_data/16C925.xml
+++ b/src/devices/pic/xml_data/16C925.xml
@@ -25,36 +25,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x0030" >
+ </tqmask>
+ <tqmask name="CP" value="0x0030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="000:EFF" cname="_CP_75" />
<value value="0x0020" name="000:7FF" cname="_CP_50" />
<value value="0x0030" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16C926.xml b/src/devices/pic/xml_data/16C926.xml
index 4120d43..8a71ca5 100644
--- a/src/devices/pic/xml_data/16C926.xml
+++ b/src/devices/pic/xml_data/16C926.xml
@@ -25,36 +25,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x007F" cmask="0x3F3F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x007F" ctqmask="0x3F3F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x0030" >
+ </tqmask>
+ <tqmask name="CP" value="0x0030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="0000:1EFF" cname="_CP_75" />
<value value="0x0020" name="0000:0FFF" cname="_CP_50" />
<value value="0x0030" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CE623.xml b/src/devices/pic/xml_data/16CE623.xml
index 18e6848..00dbeee 100644
--- a/src/devices/pic/xml_data/16CE623.xml
+++ b/src/devices/pic/xml_data/16CE623.xml
@@ -35,35 +35,35 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x01FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="?" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CE624.xml b/src/devices/pic/xml_data/16CE624.xml
index 4f205a7..f480f85 100644
--- a/src/devices/pic/xml_data/16CE624.xml
+++ b/src/devices/pic/xml_data/16CE624.xml
@@ -36,36 +36,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="?" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:3FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CE625.xml b/src/devices/pic/xml_data/16CE625.xml
index d7aa576..9d156e9 100644
--- a/src/devices/pic/xml_data/16CE625.xml
+++ b/src/devices/pic/xml_data/16CE625.xml
@@ -37,36 +37,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR54.xml_broken b/src/devices/pic/xml_data/16CR54.xml_broken
index cef44cb..e78487e 100644
--- a/src/devices/pic/xml_data/16CR54.xml_broken
+++ b/src/devices/pic/xml_data/16CR54.xml_broken
@@ -18,25 +18,25 @@
<!--* Memory ***************************************************************-->
<memory name="program" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0x00C" cmask="0x008" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0x00C" ctqmask="0x008" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="All" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR54A.xml b/src/devices/pic/xml_data/16CR54A.xml
index c3a5d2a..cbe7ef1 100644
--- a/src/devices/pic/xml_data/16CR54A.xml
+++ b/src/devices/pic/xml_data/16CR54A.xml
@@ -37,26 +37,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="All" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR54B.xml b/src/devices/pic/xml_data/16CR54B.xml
index 43456d8..d561ca9 100644
--- a/src/devices/pic/xml_data/16CR54B.xml
+++ b/src/devices/pic/xml_data/16CR54B.xml
@@ -40,26 +40,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:1FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR54C.xml b/src/devices/pic/xml_data/16CR54C.xml
index 3667ce3..c5d9876 100644
--- a/src/devices/pic/xml_data/16CR54C.xml
+++ b/src/devices/pic/xml_data/16CR54C.xml
@@ -40,26 +40,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:1FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR56A.xml b/src/devices/pic/xml_data/16CR56A.xml
index 0b28931..92ed41d 100644
--- a/src/devices/pic/xml_data/16CR56A.xml
+++ b/src/devices/pic/xml_data/16CR56A.xml
@@ -40,26 +40,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FF" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:3FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR57B.xml b/src/devices/pic/xml_data/16CR57B.xml
index caba4c3..d4f218a 100644
--- a/src/devices/pic/xml_data/16CR57B.xml
+++ b/src/devices/pic/xml_data/16CR57B.xml
@@ -37,26 +37,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x7FF" />
- <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+ <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:7FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR57C.xml b/src/devices/pic/xml_data/16CR57C.xml
index 379f1bc..1bee66c 100644
--- a/src/devices/pic/xml_data/16CR57C.xml
+++ b/src/devices/pic/xml_data/16CR57C.xml
@@ -40,26 +40,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x7FF" />
- <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+ <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:7FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR58A.xml b/src/devices/pic/xml_data/16CR58A.xml
index 3841400..8834988 100644
--- a/src/devices/pic/xml_data/16CR58A.xml
+++ b/src/devices/pic/xml_data/16CR58A.xml
@@ -37,26 +37,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x7FF" />
- <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+ <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:7FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR58B.xml b/src/devices/pic/xml_data/16CR58B.xml
index b450e31..17b9c83 100644
--- a/src/devices/pic/xml_data/16CR58B.xml
+++ b/src/devices/pic/xml_data/16CR58B.xml
@@ -40,26 +40,26 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x7FF" />
- <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+ <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFC" bvalue="0xFFF" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFC" bvalue="0xFFF" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0xFF8" >
+ </tqmask>
+ <tqmask name="CP" value="0xFF8" >
<value value="0x000" name="040:7FF" cname="_CP_ON" />
<value value="0xFF8" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR62.xml b/src/devices/pic/xml_data/16CR62.xml
index 0b27a3c..5e18732 100644
--- a/src/devices/pic/xml_data/16CR62.xml
+++ b/src/devices/pic/xml_data/16CR62.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR620A.xml b/src/devices/pic/xml_data/16CR620A.xml
index a2e6db3..891e699 100644
--- a/src/devices/pic/xml_data/16CR620A.xml
+++ b/src/devices/pic/xml_data/16CR620A.xml
@@ -35,34 +35,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x01FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR63.xml b/src/devices/pic/xml_data/16CR63.xml
index 08d6f3f..0279f84 100644
--- a/src/devices/pic/xml_data/16CR63.xml
+++ b/src/devices/pic/xml_data/16CR63.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR64.xml b/src/devices/pic/xml_data/16CR64.xml
index e155a97..4ade4a5 100644
--- a/src/devices/pic/xml_data/16CR64.xml
+++ b/src/devices/pic/xml_data/16CR64.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR65.xml b/src/devices/pic/xml_data/16CR65.xml
index df4d3f4..b83c4e2 100644
--- a/src/devices/pic/xml_data/16CR65.xml
+++ b/src/devices/pic/xml_data/16CR65.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="400:FFF" cname="_CP_75" />
<value value="0x2A20" name="800:FFF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR72.xml b/src/devices/pic/xml_data/16CR72.xml
index efaa9f8..18ba26f 100644
--- a/src/devices/pic/xml_data/16CR72.xml
+++ b/src/devices/pic/xml_data/16CR72.xml
@@ -33,36 +33,36 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3F7F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3F7F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="CP" value="0x3F30" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F30" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1510" name="200:7FF" cname="_CP_75" />
<value value="0x2A20" name="400:7FF" cname="_CP_50" />
<value value="0x3F30" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR73.xml b/src/devices/pic/xml_data/16CR73.xml
index 6513255..c368a1b 100644
--- a/src/devices/pic/xml_data/16CR73.xml
+++ b/src/devices/pic/xml_data/16CR73.xml
@@ -31,34 +31,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR74.xml b/src/devices/pic/xml_data/16CR74.xml
index 6fec92e..c724d90 100644
--- a/src/devices/pic/xml_data/16CR74.xml
+++ b/src/devices/pic/xml_data/16CR74.xml
@@ -31,34 +31,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR76.xml b/src/devices/pic/xml_data/16CR76.xml
index dd9916a..00576fb 100644
--- a/src/devices/pic/xml_data/16CR76.xml
+++ b/src/devices/pic/xml_data/16CR76.xml
@@ -31,34 +31,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR77.xml b/src/devices/pic/xml_data/16CR77.xml
index 661ebf0..04c6f68 100644
--- a/src/devices/pic/xml_data/16CR77.xml
+++ b/src/devices/pic/xml_data/16CR77.xml
@@ -31,34 +31,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR83.xml b/src/devices/pic/xml_data/16CR83.xml
index 01c4166..24f9ed0 100644
--- a/src/devices/pic/xml_data/16CR83.xml
+++ b/src/devices/pic/xml_data/16CR83.xml
@@ -31,35 +31,35 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x01FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_DP_ON" />
<value value="0x0080" name="Off" cname="_DP_OFF" />
- </mask>
- <mask name="CP" value="0x3F70" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F70" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x3F70" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16CR84.xml b/src/devices/pic/xml_data/16CR84.xml
index 5d93205..a22db42 100644
--- a/src/devices/pic/xml_data/16CR84.xml
+++ b/src/devices/pic/xml_data/16CR84.xml
@@ -31,35 +31,35 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_DP_ON" />
<value value="0x0080" name="Off" cname="_DP_OFF" />
- </mask>
- <mask name="CP" value="0x3F70" >
+ </tqmask>
+ <tqmask name="CP" value="0x3F70" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x3F70" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F505.xml b/src/devices/pic/xml_data/16F505.xml
index bbc2607..250adf4 100644
--- a/src/devices/pic/xml_data/16F505.xml
+++ b/src/devices/pic/xml_data/16F505.xml
@@ -29,14 +29,14 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FE" />
- <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x404" end="0x404" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x03F" >
- <mask name="FOSC" value="0x007" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x03F" >
+ <tqmask name="FOSC" value="0x007" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
@@ -45,19 +45,19 @@
<value value="0x005" name="INTRC_CLKOUT" cname="_IntRC_OSC_CLKOUTEN" />
<value value="0x006" name="EXTRC_IO" cname="_ExtRC_OSC_RB4EN" />
<value value="0x007" name="EXTRC_CLKOUT" cname="_ExtRC_OSC_CLKOUTEN" />
- </mask>
- <mask name="WDT" value="0x008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x008" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x010" >
+ </tqmask>
+ <tqmask name="CP" value="0x010" >
<value value="0x000" name="040:3FE" cname="_CP_ON" />
<value value="0x010" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x020" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x020" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F506.xml b/src/devices/pic/xml_data/16F506.xml
index 4fa7a47..a472914 100644
--- a/src/devices/pic/xml_data/16F506.xml
+++ b/src/devices/pic/xml_data/16F506.xml
@@ -30,14 +30,14 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x3FE" />
- <memory name="calibration" start="0x3FF" end="0x3FF" cal_opmask="0xF00" cal_opcode="0xC00" />
- <memory name="user_ids" start="0x400" end="0x403" rmask="0x00F" />
+ <memory name="calibration" start="0x3FF" end="0x3FF" cal_optqmask="0xF00" cal_opcode="0xC00" />
+ <memory name="user_ids" start="0x400" end="0x403" rtqmask="0x00F" />
<memory name="config" start="0x7FF" end="0x7FF" hexfile_offset="0xFFF" />
<memory name="calibration_backup" start="0x404" end="0x404" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x07F" >
- <mask name="FOSC" value="0x007" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x07F" >
+ <tqmask name="FOSC" value="0x007" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
@@ -46,23 +46,23 @@
<value value="0x005" name="INTRC_CLKOUT" cname="_IntRC_OSC_CLKOUTEN" />
<value value="0x006" name="EXTRC_IO" cname="_ExtRC_OSC_RB4EN" />
<value value="0x007" name="EXTRC_CLKOUT" cname="_ExtRC_OSC_CLKOUTEN" />
- </mask>
- <mask name="WDT" value="0x008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x008" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x010" >
+ </tqmask>
+ <tqmask name="CP" value="0x010" >
<value value="0x000" name="040:3FE" cname="_CP_ON" />
<value value="0x010" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="MCLRE" value="0x020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x020" >
<value value="0x000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="IOSCFS" value="0x040" >
+ </tqmask>
+ <tqmask name="IOSCFS" value="0x040" >
<value value="0x000" name="4MHZ" cname="_IOSCFS_OFF" />
<value value="0x040" name="8MHZ" cname="_IOSCFS_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F54.xml b/src/devices/pic/xml_data/16F54.xml
index 4b55624..c5abd78 100644
--- a/src/devices/pic/xml_data/16F54.xml
+++ b/src/devices/pic/xml_data/16F54.xml
@@ -29,25 +29,25 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:1FF" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F57.xml b/src/devices/pic/xml_data/16F57.xml
index e84e053..26afb61 100644
--- a/src/devices/pic/xml_data/16F57.xml
+++ b/src/devices/pic/xml_data/16F57.xml
@@ -29,25 +29,25 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x7FF" />
- <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+ <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:7FF" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F59.xml b/src/devices/pic/xml_data/16F59.xml
index b29659a..4ecfae8 100644
--- a/src/devices/pic/xml_data/16F59.xml
+++ b/src/devices/pic/xml_data/16F59.xml
@@ -29,25 +29,25 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x7FF" />
- <memory name="user_ids" start="0x800" end="0x803" rmask="0x00F" />
+ <memory name="user_ids" start="0x800" end="0x803" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="040:7FF" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F610.xml b/src/devices/pic/xml_data/16F610.xml
index 46795b1..acf84ca 100644
--- a/src/devices/pic/xml_data/16F610.xml
+++ b/src/devices/pic/xml_data/16F610.xml
@@ -38,15 +38,15 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -55,32 +55,32 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="IOSCFS" value="0x0080" >
+ </tqmask>
+ <tqmask name="IOSCFS" value="0x0080" >
<value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" />
<value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="default" name="Off" cname="_BOR_OFF" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F616.xml b/src/devices/pic/xml_data/16F616.xml
index 9f8ca55..890aac4 100644
--- a/src/devices/pic/xml_data/16F616.xml
+++ b/src/devices/pic/xml_data/16F616.xml
@@ -39,15 +39,15 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x03FF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x03FF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -56,32 +56,32 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="IOSCFS" value="0x0080" >
+ </tqmask>
+ <tqmask name="IOSCFS" value="0x0080" >
<value value="0x0000" name="4MHZ" cname="_IOSCFS_4MHZ" />
<value value="0x0080" name="8MHZ" cname="_IOSCFS_8MHZ" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="default" name="Off" cname="_BOR_OFF" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F627.xml b/src/devices/pic/xml_data/16F627.xml
index 7ce03a5..2656e1a 100644
--- a/src/devices/pic/xml_data/16F627.xml
+++ b/src/devices/pic/xml_data/16F627.xml
@@ -46,22 +46,22 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3DFF" icnames="_CP_50" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3DFF" icnames="_CP_50" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -70,29 +70,29 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0012" name="ER_IO" cname="_ER_OSC_NOCLKOUT" />
<value value="0x0013" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_DATA_CP_ON" />
<value value="0x0100" name="Off" cname="_DATA_CP_OFF" />
- </mask>
- <mask name="CP" value="0x3C00" >
+ </tqmask>
+ <tqmask name="CP" value="0x3C00" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1400" name="200:3FF" cname="_CP_75" />
<value value="0x3C00" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F627A.xml b/src/devices/pic/xml_data/16F627A.xml
index de43d7a..3992f2a 100644
--- a/src/devices/pic/xml_data/16F627A.xml
+++ b/src/devices/pic/xml_data/16F627A.xml
@@ -37,23 +37,23 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x21FF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x21FF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -62,27 +62,27 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTOSC_OSC_CLKOUT" ecnames="_INTRC_OSC_CLKOUT" />
<value value="0x0012" name="ER_IO" cname="_RC_OSC_NOCLKOUT" ecnames="_ER_OSC_NOCLKOUT" />
<value value="0x0013" name="ER_CLKOUT" cname="_RC_OSC_CLKOUT" ecnames="_ER_OSC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BOREN_ON" ecnames="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_DATA_CP_ON" />
<value value="0x0100" name="Off" cname="_DATA_CP_OFF" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F628.xml b/src/devices/pic/xml_data/16F628.xml
index fed16fa..1261707 100644
--- a/src/devices/pic/xml_data/16F628.xml
+++ b/src/devices/pic/xml_data/16F628.xml
@@ -47,22 +47,22 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3DFF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3DFF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -71,30 +71,30 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0012" name="ER_IO" cname="_ER_OSC_NOCLKOUT" />
<value value="0x0013" name="ER_CLKOUT" cname="_ER_OSC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_DATA_CP_ON" />
<value value="0x0100" name="Off" cname="_DATA_CP_OFF" />
- </mask>
- <mask name="CP" value="0x3C00" >
+ </tqmask>
+ <tqmask name="CP" value="0x3C00" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1400" name="200:7FF" cname="_CP_75" />
<value value="0x2800" name="400:7FF" cname="_CP_50" />
<value value="0x3C00" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F628A.xml b/src/devices/pic/xml_data/16F628A.xml
index 8c5a4cc..8a194f9 100644
--- a/src/devices/pic/xml_data/16F628A.xml
+++ b/src/devices/pic/xml_data/16F628A.xml
@@ -37,23 +37,23 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x21FF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x21FF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -62,27 +62,27 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTOSC_OSC_CLKOUT" ecnames="_INTRC_OSC_CLKOUT" />
<value value="0x0012" name="ER_IO" cname="_RC_OSC_NOCLKOUT" ecnames="_ER_OSC_NOCLKOUT" />
<value value="0x0013" name="ER_CLKOUT" cname="_RC_OSC_CLKOUT" ecnames="_ER_OSC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BOREN_ON" ecnames="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_DATA_CP_ON" />
<value value="0x0100" name="Off" cname="_DATA_CP_OFF" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F630.xml b/src/devices/pic/xml_data/16F630.xml
index a82ffdb..2096457 100644
--- a/src/devices/pic/xml_data/16F630.xml
+++ b/src/devices/pic/xml_data/16F630.xml
@@ -36,16 +36,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FE" />
- <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -54,37 +54,37 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN" />
- </mask>
- <mask name="CP" value="0x0080" >
+ </tqmask>
+ <tqmask name="CP" value="0x0080" >
<value value="0x0000" name="All" cname="_CP" />
<value value="0x0080" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BG" value="0x3000">
+ </tqmask>
+ <tqmask name="BG" value="0x3000">
<value value="0x0000" name="Lowest" />
<value value="0x1000" name="Mid/Low" />
<value value="0x2000" name="Mid/High" />
<value value="0x3000" name="Highest" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F631.xml b/src/devices/pic/xml_data/16F631.xml
index e6a5274..9a0bb10 100644
--- a/src/devices/pic/xml_data/16F631.xml
+++ b/src/devices/pic/xml_data/16F631.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,41 +48,41 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F636.xml b/src/devices/pic/xml_data/16F636.xml
index e47314e..d996191 100644
--- a/src/devices/pic/xml_data/16F636.xml
+++ b/src/devices/pic/xml_data/16F636.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x1FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x1FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,45 +48,45 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="WUREN" value="0x1000" >
+ </tqmask>
+ <tqmask name="WUREN" value="0x1000" >
<value value="0x0000" name="On" cname="_WUREN_ON" />
<value value="0x1000" name="Off" cname="_WUREN_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F639.xml b/src/devices/pic/xml_data/16F639.xml
index 7affb7b..6cb669e 100644
--- a/src/devices/pic/xml_data/16F639.xml
+++ b/src/devices/pic/xml_data/16F639.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x1FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x1FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,45 +48,45 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="WUREN" value="0x1000" >
+ </tqmask>
+ <tqmask name="WUREN" value="0x1000" >
<value value="0x0000" name="On" cname="_WUREN_ON" />
<value value="0x1000" name="Off" cname="_WUREN_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F648A.xml b/src/devices/pic/xml_data/16F648A.xml
index 17b4f83..6ece38e 100644
--- a/src/devices/pic/xml_data/16F648A.xml
+++ b/src/devices/pic/xml_data/16F648A.xml
@@ -37,23 +37,23 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x21FF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x21FF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -62,27 +62,27 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTOSC_OSC_CLKOUT" ecnames="_INTRC_OSC_CLKOUT" />
<value value="0x0012" name="ER_IO" cname="_RC_OSC_NOCLKOUT" ecnames="_ER_OSC_NOCLKOUT" />
<value value="0x0013" name="ER_CLKOUT" cname="_RC_OSC_CLKOUT" ecnames="_ER_OSC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BOREN_ON" ecnames="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_DATA_CP_ON" />
<value value="0x0100" name="Off" cname="_DATA_CP_OFF" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F676.xml b/src/devices/pic/xml_data/16F676.xml
index b608d48..6dc78bc 100644
--- a/src/devices/pic/xml_data/16F676.xml
+++ b/src/devices/pic/xml_data/16F676.xml
@@ -36,16 +36,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FE" />
- <memory name="calibration" start="0x03FF" end="0x03FF" cal_opmask="0x3C00" cal_opcode="0x3400" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x03FF" end="0x03FF" cal_optqmask="0x3C00" cal_opcode="0x3400" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x31FF" bvalue="0x31FF" pmask="0x3000" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x31FF" bvalue="0x31FF" ptqmask="0x3000" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -54,37 +54,37 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN" />
- </mask>
- <mask name="CP" value="0x0080" >
+ </tqmask>
+ <tqmask name="CP" value="0x0080" >
<value value="0x0000" name="All" cname="_CP" />
<value value="0x0080" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BG" value="0x3000">
+ </tqmask>
+ <tqmask name="BG" value="0x3000">
<value value="0x0000" name="Lowest" />
<value value="0x1000" name="Mid/Low" />
<value value="0x2000" name="Mid/High" />
<value value="0x3000" name="Highest" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F677.xml b/src/devices/pic/xml_data/16F677.xml
index d27b2eb..f819715 100644
--- a/src/devices/pic/xml_data/16F677.xml
+++ b/src/devices/pic/xml_data/16F677.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,41 +48,41 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F684.xml b/src/devices/pic/xml_data/16F684.xml
index f330925..c620fc1 100644
--- a/src/devices/pic/xml_data/16F684.xml
+++ b/src/devices/pic/xml_data/16F684.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,41 +48,41 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F685.xml b/src/devices/pic/xml_data/16F685.xml
index aa35aa3..a0c5713 100644
--- a/src/devices/pic/xml_data/16F685.xml
+++ b/src/devices/pic/xml_data/16F685.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,41 +48,41 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F687.xml b/src/devices/pic/xml_data/16F687.xml
index 2e58780..093f879 100644
--- a/src/devices/pic/xml_data/16F687.xml
+++ b/src/devices/pic/xml_data/16F687.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,41 +48,41 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F688.xml b/src/devices/pic/xml_data/16F688.xml
index 2692159..bde2461 100644
--- a/src/devices/pic/xml_data/16F688.xml
+++ b/src/devices/pic/xml_data/16F688.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,41 +48,41 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F689.xml b/src/devices/pic/xml_data/16F689.xml
index f22fdcd..af0651f 100644
--- a/src/devices/pic/xml_data/16F689.xml
+++ b/src/devices/pic/xml_data/16F689.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,41 +48,41 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F690.xml b/src/devices/pic/xml_data/16F690.xml
index 7a51bac..f606062 100644
--- a/src/devices/pic/xml_data/16F690.xml
+++ b/src/devices/pic/xml_data/16F690.xml
@@ -30,16 +30,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="calibration" start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2008" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -48,41 +48,41 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F716.xml b/src/devices/pic/xml_data/16F716.xml
index 8ebaa00..d0cc586 100644
--- a/src/devices/pic/xml_data/16F716.xml
+++ b/src/devices/pic/xml_data/16F716.xml
@@ -36,39 +36,39 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x20CF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x20CF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BOREN_OFF" ecnames="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BOREN_ON" ecnames="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0080" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0080" >
<value value="0x0000" name="2.5" cname="_VBOR_25" />
<value value="0x0080" name="4.0" cname="_VBOR_40" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ON" ecnames="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F72.xml b/src/devices/pic/xml_data/16F72.xml
index d49b2cd..a8c789d 100644
--- a/src/devices/pic/xml_data/16F72.xml
+++ b/src/devices/pic/xml_data/16F72.xml
@@ -34,34 +34,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F73.xml b/src/devices/pic/xml_data/16F73.xml
index 157cb74..8659896 100644
--- a/src/devices/pic/xml_data/16F73.xml
+++ b/src/devices/pic/xml_data/16F73.xml
@@ -25,34 +25,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F737.xml b/src/devices/pic/xml_data/16F737.xml
index 0184aa9..c17c0f8 100644
--- a/src/devices/pic/xml_data/16F737.xml
+++ b/src/devices/pic/xml_data/16F737.xml
@@ -34,22 +34,22 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2008" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -58,48 +58,48 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
<value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" />
<value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLR_OFF" />
<value value="0x0020" name="External" cname="_MCLR_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BOREN_0" />
<value value="0x0040" name="On" cname="_BOREN_1" />
- </mask>
- <mask name="BORV" value="0x0180" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0180" >
<value value="0x0000" name="4.5" cname="_VBOR_4_5" />
<value value="0x0080" name="4.2" cname="_VBOR_4_2" />
<value value="0x0100" name="2.7" cname="_VBOR_2_7" />
<value value="0x0180" name="2.0" cname="_VBOR_2_0" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CCP2MX" value="0x1000" >
+ </tqmask>
+ <tqmask name="CCP2MX" value="0x1000" >
<value value="0x0000" name="RB3" cname="_CCP2_RB3" />
<value value="0x1000" name="RC1" cname="_CCP2_RC1" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" >
- <mask name="FCMEN" value="0x0001" >
+ <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" >
+ <tqmask name="FCMEN" value="0x0001" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0001" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x0002" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0002" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0002" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="BORSEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BORSEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BORSEN_0" />
<value value="0x0040" name="On" cname="_BORSEN_1" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F74.xml b/src/devices/pic/xml_data/16F74.xml
index fc2b312..7bfc1b3 100644
--- a/src/devices/pic/xml_data/16F74.xml
+++ b/src/devices/pic/xml_data/16F74.xml
@@ -25,34 +25,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F747.xml b/src/devices/pic/xml_data/16F747.xml
index ec03640..1200a6c 100644
--- a/src/devices/pic/xml_data/16F747.xml
+++ b/src/devices/pic/xml_data/16F747.xml
@@ -34,22 +34,22 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2008" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -58,48 +58,48 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
<value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" />
<value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLR_OFF" />
<value value="0x0020" name="External" cname="_MCLR_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BOREN_0" />
<value value="0x0040" name="On" cname="_BOREN_1" />
- </mask>
- <mask name="BORV" value="0x0180" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0180" >
<value value="0x0000" name="4.5" cname="_VBOR_4_5" />
<value value="0x0080" name="4.2" cname="_VBOR_4_2" />
<value value="0x0100" name="2.7" cname="_VBOR_2_7" />
<value value="0x0180" name="2.0" cname="_VBOR_2_0" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CCP2MX" value="0x1000" >
+ </tqmask>
+ <tqmask name="CCP2MX" value="0x1000" >
<value value="0x0000" name="RB3" cname="_CCP2_RB3" />
<value value="0x1000" name="RC1" cname="_CCP2_RC1" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" >
- <mask name="FCMEN" value="0x0001" >
+ <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" >
+ <tqmask name="FCMEN" value="0x0001" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0001" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x0002" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0002" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0002" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="BORSEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BORSEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BORSEN_0" />
<value value="0x0040" name="On" cname="_BORSEN_1" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F76.xml b/src/devices/pic/xml_data/16F76.xml
index 3b6fcf3..8fde14a 100644
--- a/src/devices/pic/xml_data/16F76.xml
+++ b/src/devices/pic/xml_data/16F76.xml
@@ -25,34 +25,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F767.xml b/src/devices/pic/xml_data/16F767.xml
index 77ed134..0dc2c9f 100644
--- a/src/devices/pic/xml_data/16F767.xml
+++ b/src/devices/pic/xml_data/16F767.xml
@@ -34,22 +34,22 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2008" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -58,48 +58,48 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
<value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" />
<value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLR_OFF" />
<value value="0x0020" name="External" cname="_MCLR_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BOREN_0" />
<value value="0x0040" name="On" cname="_BOREN_1" />
- </mask>
- <mask name="BORV" value="0x0180" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0180" >
<value value="0x0000" name="4.5" cname="_VBOR_4_5" />
<value value="0x0080" name="4.2" cname="_VBOR_4_2" />
<value value="0x0100" name="2.7" cname="_VBOR_2_7" />
<value value="0x0180" name="2.0" cname="_VBOR_2_0" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CCP2MX" value="0x1000" >
+ </tqmask>
+ <tqmask name="CCP2MX" value="0x1000" >
<value value="0x0000" name="RB3" cname="_CCP2_RB3" />
<value value="0x1000" name="RC1" cname="_CCP2_RC1" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" >
- <mask name="FCMEN" value="0x0001" >
+ <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" >
+ <tqmask name="FCMEN" value="0x0001" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0001" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x0002" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0002" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0002" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="BORSEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BORSEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BORSEN_0" />
<value value="0x0040" name="On" cname="_BORSEN_1" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F77.xml b/src/devices/pic/xml_data/16F77.xml
index e02e2cb..b17a20a 100644
--- a/src/devices/pic/xml_data/16F77.xml
+++ b/src/devices/pic/xml_data/16F77.xml
@@ -25,34 +25,34 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x000F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x000F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x005F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x005F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" ecnames="_WDTEN_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" ecnames="_WDTEN_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" ecnames="_PWRTEN_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" ecnames="_PWRTEN_OFF" />
- </mask>
- <mask name="CP" value="0x0010" >
+ </tqmask>
+ <tqmask name="CP" value="0x0010" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x0010" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" ecnames="_BOREN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" ecnames="_BOREN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F777.xml b/src/devices/pic/xml_data/16F777.xml
index 71899b2..54f6eb3 100644
--- a/src/devices/pic/xml_data/16F777.xml
+++ b/src/devices/pic/xml_data/16F777.xml
@@ -34,22 +34,22 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2008" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x39FF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x39FF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -58,48 +58,48 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
<value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" />
<value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLR_OFF" />
<value value="0x0020" name="External" cname="_MCLR_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BOREN_0" />
<value value="0x0040" name="On" cname="_BOREN_1" />
- </mask>
- <mask name="BORV" value="0x0180" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0180" >
<value value="0x0000" name="4.5" cname="_VBOR_4_5" />
<value value="0x0080" name="4.2" cname="_VBOR_4_2" />
<value value="0x0100" name="2.7" cname="_VBOR_2_7" />
<value value="0x0180" name="2.0" cname="_VBOR_2_0" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CCP2MX" value="0x1000" >
+ </tqmask>
+ <tqmask name="CCP2MX" value="0x1000" >
<value value="0x0000" name="RB3" cname="_CCP2_RB3" />
<value value="0x1000" name="RC1" cname="_CCP2_RC1" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0043" >
- <mask name="FCMEN" value="0x0001" >
+ <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0043" >
+ <tqmask name="FCMEN" value="0x0001" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0001" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x0002" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0002" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0002" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="BORSEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BORSEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BORSEN_0" />
<value value="0x0040" name="On" cname="_BORSEN_1" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F785.xml b/src/devices/pic/xml_data/16F785.xml
index 80c9091..29fd083 100644
--- a/src/devices/pic/xml_data/16F785.xml
+++ b/src/devices/pic/xml_data/16F785.xml
@@ -38,16 +38,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x0FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -56,41 +56,41 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" ecnames="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBOREN" ecnames="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" ecnames="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" ecnames="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F818.xml b/src/devices/pic/xml_data/16F818.xml
index 0ff73b5..86d9f5b 100644
--- a/src/devices/pic/xml_data/16F818.xml
+++ b/src/devices/pic/xml_data/16F818.xml
@@ -35,23 +35,23 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -60,41 +60,41 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
<value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" />
<value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLR_OFF" />
<value value="0x0020" name="External" cname="_MCLR_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="invalid" />
<value value="0x0200" name="000:3FF" cname="_WRT_ENABLE_1024" />
<value value="0x0400" name="000:1FF" cname="_WRT_ENABLE_512" />
<value value="0x0600" name="Off" cname="_WRT_ENABLE_OFF" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CCP1MX" value="0x1000" >
+ </tqmask>
+ <tqmask name="CCP1MX" value="0x1000" >
<value value="0x0000" name="RB3" cname="_CCP1_RB3" />
<value value="0x1000" name="RB2" cname="_CCP1_RB2" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F819.xml b/src/devices/pic/xml_data/16F819.xml
index e7ee0a6..76d1de1 100644
--- a/src/devices/pic/xml_data/16F819.xml
+++ b/src/devices/pic/xml_data/16F819.xml
@@ -35,23 +35,23 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -60,41 +60,41 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
<value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" />
<value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLR_OFF" />
<value value="0x0020" name="External" cname="_MCLR_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="000:5FF" cname="_WRT_ENABLE_1536" />
<value value="0x0200" name="000:3FF" cname="_WRT_ENABLE_1024" />
<value value="0x0400" name="000:1FF" cname="_WRT_ENABLE_512" />
<value value="0x0600" name="Off" cname="_WRT_ENABLE_OFF" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CCP1MX" value="0x1000" >
+ </tqmask>
+ <tqmask name="CCP1MX" value="0x1000" >
<value value="0x0000" name="RB3" cname="_CCP1_RB3" />
<value value="0x1000" name="RB2" cname="_CCP1_RB2" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F83.xml b/src/devices/pic/xml_data/16F83.xml
index 25b80a3..ff9af73 100644
--- a/src/devices/pic/xml_data/16F83.xml
+++ b/src/devices/pic/xml_data/16F83.xml
@@ -31,31 +31,31 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x01FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x3FF0" >
+ </tqmask>
+ <tqmask name="CP" value="0x3FF0" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x3FF0" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F84.xml b/src/devices/pic/xml_data/16F84.xml
index 62c1f8d..88cd1ae 100644
--- a/src/devices/pic/xml_data/16F84.xml
+++ b/src/devices/pic/xml_data/16F84.xml
@@ -31,31 +31,31 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x3FF0" >
+ </tqmask>
+ <tqmask name="CP" value="0x3FF0" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x3FF0" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F84A.xml b/src/devices/pic/xml_data/16F84A.xml
index ffffba1..a179de1 100644
--- a/src/devices/pic/xml_data/16F84A.xml
+++ b/src/devices/pic/xml_data/16F84A.xml
@@ -32,32 +32,32 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x03FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="CP" value="0x3FF0" >
+ </tqmask>
+ <tqmask name="CP" value="0x3FF0" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x3FF0" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F87.xml b/src/devices/pic/xml_data/16F87.xml
index 835b481..987ef0c 100644
--- a/src/devices/pic/xml_data/16F87.xml
+++ b/src/devices/pic/xml_data/16F87.xml
@@ -34,23 +34,23 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2008" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -59,52 +59,52 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
<value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" />
<value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLR_OFF" />
<value value="0x0020" name="External" cname="_MCLR_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="All" cname="_WRT_PROTECT_ALL" />
<value value="0x0200" name="000:7FF" cname="_WRT_PROTECT_2048" />
<value value="0x0400" name="000:0FF" cname="_WRT_PROTECT_256" />
<value value="0x0600" name="Off" cname="_WRT_PROTECT_OFF" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CCP1MX" value="0x1000" >
+ </tqmask>
+ <tqmask name="CCP1MX" value="0x1000" >
<value value="0x0000" name="RB3" cname="_CCP1_RB3" />
<value value="0x1000" name="RB0" cname="_CCP1_RB0" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0003" >
- <mask name="FCMEN" value="0x0001" >
+ <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0003" >
+ <tqmask name="FCMEN" value="0x0001" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0001" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x0002" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0002" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0002" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F870.xml b/src/devices/pic/xml_data/16F870.xml
index ec66b54..005a948 100644
--- a/src/devices/pic/xml_data/16F870.xml
+++ b/src/devices/pic/xml_data/16F870.xml
@@ -36,53 +36,53 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0200" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0200" >
<value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
<value value="0x0200" name="All" cname="_WRT_ENABLE_ON" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CP" value="0x3030" >
+ </tqmask>
+ <tqmask name="CP" value="0x3030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x3030" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F871.xml b/src/devices/pic/xml_data/16F871.xml
index 8b918ca..ddfd932 100644
--- a/src/devices/pic/xml_data/16F871.xml
+++ b/src/devices/pic/xml_data/16F871.xml
@@ -36,53 +36,53 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0200" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0200" >
<value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
<value value="0x0200" name="All" cname="_WRT_ENABLE_ON" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CP" value="0x3030" >
+ </tqmask>
+ <tqmask name="CP" value="0x3030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x3030" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F872.xml b/src/devices/pic/xml_data/16F872.xml
index 7702922..da5fe20 100644
--- a/src/devices/pic/xml_data/16F872.xml
+++ b/src/devices/pic/xml_data/16F872.xml
@@ -36,53 +36,53 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x003F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0200" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0200" >
<value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
<value value="0x0200" name="All" cname="_WRT_ENABLE_ON" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CP" value="0x3030" >
+ </tqmask>
+ <tqmask name="CP" value="0x3030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x3030" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F873.xml b/src/devices/pic/xml_data/16F873.xml
index 4bbb1cb..b010152 100644
--- a/src/devices/pic/xml_data/16F873.xml
+++ b/src/devices/pic/xml_data/16F873.xml
@@ -41,55 +41,55 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0200" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0200" >
<value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
<value value="0x0200" name="All" cname="_WRT_ENABLE_ON" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CP" value="0x3030" >
+ </tqmask>
+ <tqmask name="CP" value="0x3030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1010" name="0800:0FFF" cname="_CP_HALF" />
<value value="0x2020" name="0F00:0FFF" cname="_CP_UPPER_256" />
<value value="0x3030" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F873A.xml b/src/devices/pic/xml_data/16F873A.xml
index ee26828..e9dd61a 100644
--- a/src/devices/pic/xml_data/16F873A.xml
+++ b/src/devices/pic/xml_data/16F873A.xml
@@ -35,54 +35,54 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="0000:07FF" cname="_WRT_HALF" />
<value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" />
<value value="0x0400" name="0000:00FF" cname="_WRT_256" />
<value value="0x0600" name="Off" cname="_WRT_OFF" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F874.xml b/src/devices/pic/xml_data/16F874.xml
index fe20128..7135150 100644
--- a/src/devices/pic/xml_data/16F874.xml
+++ b/src/devices/pic/xml_data/16F874.xml
@@ -41,55 +41,55 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0200" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0200" >
<value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
<value value="0x0200" name="All" cname="_WRT_ENABLE_ON" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CP" value="0x3030" >
+ </tqmask>
+ <tqmask name="CP" value="0x3030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1010" name="0800:0FFF" cname="_CP_HALF" />
<value value="0x2020" name="0F00:0FFF" cname="_CP_UPPER_256" />
<value value="0x3030" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F874A.xml b/src/devices/pic/xml_data/16F874A.xml
index c89b407..c827c6e 100644
--- a/src/devices/pic/xml_data/16F874A.xml
+++ b/src/devices/pic/xml_data/16F874A.xml
@@ -35,54 +35,54 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="0000:07FF" cname="_WRT_HALF" />
<value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" />
<value value="0x0400" name="0000:00FF" cname="_WRT_256" />
<value value="0x0600" name="Off" cname="_WRT_OFF" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F876.xml b/src/devices/pic/xml_data/16F876.xml
index 19264e8..cf59664 100644
--- a/src/devices/pic/xml_data/16F876.xml
+++ b/src/devices/pic/xml_data/16F876.xml
@@ -41,55 +41,55 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0200" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0200" >
<value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
<value value="0x0200" name="All" cname="_WRT_ENABLE_ON" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CP" value="0x3030" >
+ </tqmask>
+ <tqmask name="CP" value="0x3030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1010" name="1000:1FFF" cname="_CP_HALF" />
<value value="0x2020" name="1F00:1FFF" cname="_CP_UPPER_256" />
<value value="0x3030" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F876A.xml b/src/devices/pic/xml_data/16F876A.xml
index f1c23ce..11b3214 100644
--- a/src/devices/pic/xml_data/16F876A.xml
+++ b/src/devices/pic/xml_data/16F876A.xml
@@ -35,54 +35,54 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF">
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF">
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="0000:0FFF" cname="_WRT_HALF" />
<value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" />
<value value="0x0400" name="0000:00FF" cname="_WRT_256" />
<value value="0x0600" name="Off" cname="_WRT_OFF" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F877.xml b/src/devices/pic/xml_data/16F877.xml
index f83da05..d9e65fc 100644
--- a/src/devices/pic/xml_data/16F877.xml
+++ b/src/devices/pic/xml_data/16F877.xml
@@ -41,55 +41,55 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3BFF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x3BFF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0200" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0200" >
<value value="0x0000" name="Off" cname="_WRT_ENABLE_OFF" />
<value value="0x0200" name="All" cname="_WRT_ENABLE_ON" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CP" value="0x3030" >
+ </tqmask>
+ <tqmask name="CP" value="0x3030" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x1010" name="1000:1FFF" cname="_CP_HALF" />
<value value="0x2020" name="1F00:1FFF" cname="_CP_UPPER_256" />
<value value="0x3030" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F877A.xml b/src/devices/pic/xml_data/16F877A.xml
index 3a16d77..b47b113 100644
--- a/src/devices/pic/xml_data/16F877A.xml
+++ b/src/devices/pic/xml_data/16F877A.xml
@@ -35,54 +35,54 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x2FCF" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0x3FFF" bvalue="0x2FCF" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
<value value="0x0003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x0004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="0000:0FFF" cname="_WRT_HALF" />
<value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" />
<value value="0x0400" name="0000:00FF" cname="_WRT_256" />
<value value="0x0600" name="Off" cname="_WRT_OFF" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F88.xml b/src/devices/pic/xml_data/16F88.xml
index b2325c3..09fd755 100644
--- a/src/devices/pic/xml_data/16F88.xml
+++ b/src/devices/pic/xml_data/16F88.xml
@@ -32,23 +32,23 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2008" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="WDT" value="0x0004" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="WDT" value="0x0004" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0008" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0008" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0008" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="FOSC" value="0x0013" >
+ </tqmask>
+ <tqmask name="FOSC" value="0x0013" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -57,52 +57,52 @@
<value value="0x0011" name="INTRC_CLKOUT" cname="_INTRC_CLKOUT" />
<value value="0x0012" name="EXTRC_IO" cname="_EXTRC_IO" />
<value value="0x0013" name="EXTRC_CLKOUT" cname="_EXTRC_CLKOUT" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLR_OFF" />
<value value="0x0020" name="External" cname="_MCLR_ON" />
- </mask>
- <mask name="BODEN" value="0x0040" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0040" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x0040" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="LVP" value="0x0080" >
+ </tqmask>
+ <tqmask name="LVP" value="0x0080" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x0080" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="CPD" value="0x0100" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0100" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0100" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="All" cname="_WRT_PROTECT_ALL" />
<value value="0x0200" name="000:7FF" cname="_WRT_PROTECT_2048" />
<value value="0x0400" name="000:0FF" cname="_WRT_PROTECT_256" />
<value value="0x0600" name="Off" cname="_WRT_PROTECT_OFF" />
- </mask>
- <mask name="DEBUG" value="0x0800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0800" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x0800" name="Off" cname="_DEBUG_OFF" />
- </mask>
- <mask name="CCP1MX" value="0x1000" >
+ </tqmask>
+ <tqmask name="CCP1MX" value="0x1000" >
<value value="0x0000" name="RB3" cname="_CCP1_RB3" />
<value value="0x1000" name="RB0" cname="_CCP1_RB0" />
- </mask>
- <mask name="CP" value="0x2000" >
+ </tqmask>
+ <tqmask name="CP" value="0x2000" >
<value value="0x0000" name="All" cname="_CP_ALL" />
<value value="0x2000" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0003" >
- <mask name="FCMEN" value="0x0001" >
+ <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0003" >
+ <tqmask name="FCMEN" value="0x0001" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0001" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x0002" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0002" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0002" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F882.xml b/src/devices/pic/xml_data/16F882.xml
index db2c723..79cec09 100644
--- a/src/devices/pic/xml_data/16F882.xml
+++ b/src/devices/pic/xml_data/16F882.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x07FF" />
- <memory name="calibration" start="0x2009" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2009" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2008" />
<memory name="eeprom" start="0x0000" end="0x007F" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -51,62 +51,62 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="LVP" value="0x1000" >
+ </tqmask>
+ <tqmask name="LVP" value="0x1000" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x1000" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x2000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x2000" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x2000" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" >
- <mask name="BORV" value="0x0100" >
+ <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" >
+ <tqmask name="BORV" value="0x0100" >
<value value="0x0100" name="4.0" cname="_BOR40V" />
<value value="0x0000" name="2.1" cname="_BOR21V" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="0000:03FF" cname="_WRT_HALF" />
<value value="0x0200" name="0000:00FF" cname="_WRT_1FOURTH" />
<value value="0x0400" name="invalid" />
<value value="0x0600" name="Off" cname="_WRT_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F883.xml b/src/devices/pic/xml_data/16F883.xml
index 1140b72..1ec6702 100644
--- a/src/devices/pic/xml_data/16F883.xml
+++ b/src/devices/pic/xml_data/16F883.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="calibration" start="0x2009" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2009" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2008" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -51,62 +51,62 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="LVP" value="0x1000" >
+ </tqmask>
+ <tqmask name="LVP" value="0x1000" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x1000" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x2000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x2000" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x2000" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" >
- <mask name="BORV" value="0x0100" >
+ <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" >
+ <tqmask name="BORV" value="0x0100" >
<value value="0x0100" name="4.0" cname="_BOR40V" />
<value value="0x0000" name="2.1" cname="_BOR21V" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="0000:07FF" cname="_WRT_HALF" />
<value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" />
<value value="0x0400" name="0000:00FF" cname="_WRT_256" />
<value value="0x0600" name="Off" cname="_WRT_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F884.xml b/src/devices/pic/xml_data/16F884.xml
index fbe9423..538d214 100644
--- a/src/devices/pic/xml_data/16F884.xml
+++ b/src/devices/pic/xml_data/16F884.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="calibration" start="0x2009" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2009" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2008" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -51,62 +51,62 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="LVP" value="0x1000" >
+ </tqmask>
+ <tqmask name="LVP" value="0x1000" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x1000" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x2000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x2000" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x2000" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" >
- <mask name="BORV" value="0x0100" >
+ <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" >
+ <tqmask name="BORV" value="0x0100" >
<value value="0x0100" name="4.0" cname="_BOR40V" />
<value value="0x0000" name="2.1" cname="_BOR21V" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="0000:07FF" cname="_WRT_HALF" />
<value value="0x0200" name="0000:03FF" cname="_WRT_1FOURTH" />
<value value="0x0400" name="0000:00FF" cname="_WRT_256" />
<value value="0x0600" name="Off" cname="_WRT_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F886.xml b/src/devices/pic/xml_data/16F886.xml
index 3205cd7..fe07fe7 100644
--- a/src/devices/pic/xml_data/16F886.xml
+++ b/src/devices/pic/xml_data/16F886.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="calibration" start="0x2009" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2009" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2008" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -51,62 +51,62 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="LVP" value="0x1000" >
+ </tqmask>
+ <tqmask name="LVP" value="0x1000" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x1000" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x2000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x2000" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x2000" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" >
- <mask name="BORV" value="0x0100" >
+ <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" >
+ <tqmask name="BORV" value="0x0100" >
<value value="0x0100" name="4.0" cname="_BOR40V" />
<value value="0x0000" name="2.1" cname="_BOR21V" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="0000:0FFF" cname="_WRT_HALF" />
<value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" />
<value value="0x0400" name="0000:00FF" cname="_WRT_256" />
<value value="0x0600" name="Off" cname="_WRT_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F887.xml b/src/devices/pic/xml_data/16F887.xml
index 78be11e..bbfdf91 100644
--- a/src/devices/pic/xml_data/16F887.xml
+++ b/src/devices/pic/xml_data/16F887.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="calibration" start="0x2009" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2009" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2008" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0x3FFF" bvalue="0x3FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -51,62 +51,62 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOR_OFF" />
<value value="0x0100" name="Software" cname="_BOR_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOR_NSLEEP" />
<value value="0x0300" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="LVP" value="0x1000" >
+ </tqmask>
+ <tqmask name="LVP" value="0x1000" >
<value value="0x0000" name="Off" cname="_LVP_OFF" />
<value value="0x1000" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x2000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x2000" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x2000" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x0700" >
- <mask name="BORV" value="0x0100" >
+ <config offset="0x1" name="CONFIG2" wtqmask="0x3FFF" bvalue="0x0700" >
+ <tqmask name="BORV" value="0x0100" >
<value value="0x0100" name="4.0" cname="_BOR40V" />
<value value="0x0000" name="2.1" cname="_BOR21V" />
- </mask>
- <mask name="WRT" value="0x0600" >
+ </tqmask>
+ <tqmask name="WRT" value="0x0600" >
<value value="0x0000" name="0000:0FFF" cname="_WRT_HALF" />
<value value="0x0200" name="0000:07FF" cname="_WRT_1FOURTH" />
<value value="0x0400" name="0000:00FF" cname="_WRT_256" />
<value value="0x0600" name="Off" cname="_WRT_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F913.xml b/src/devices/pic/xml_data/16F913.xml
index c904d5d..c793c72 100644
--- a/src/devices/pic/xml_data/16F913.xml
+++ b/src/devices/pic/xml_data/16F913.xml
@@ -31,16 +31,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -49,45 +49,45 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="DEBUG" value="0x1000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x1000" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x1000" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F914.xml b/src/devices/pic/xml_data/16F914.xml
index d74a0d5..1bdd6ad 100644
--- a/src/devices/pic/xml_data/16F914.xml
+++ b/src/devices/pic/xml_data/16F914.xml
@@ -31,16 +31,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x0FFF" />
- <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -49,45 +49,45 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="DEBUG" value="0x1000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x1000" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x1000" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F916.xml b/src/devices/pic/xml_data/16F916.xml
index b066f93..f2a139a 100644
--- a/src/devices/pic/xml_data/16F916.xml
+++ b/src/devices/pic/xml_data/16F916.xml
@@ -31,16 +31,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -49,45 +49,45 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="DEBUG" value="0x1000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x1000" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x1000" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F917.xml b/src/devices/pic/xml_data/16F917.xml
index 9e17dcc..b2fb425 100644
--- a/src/devices/pic/xml_data/16F917.xml
+++ b/src/devices/pic/xml_data/16F917.xml
@@ -31,16 +31,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -49,45 +49,45 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="DEBUG" value="0x1000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x1000" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x1000" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16F946.xml b/src/devices/pic/xml_data/16F946.xml
index 53df522..df3ac70 100644
--- a/src/devices/pic/xml_data/16F946.xml
+++ b/src/devices/pic/xml_data/16F946.xml
@@ -31,16 +31,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x0000" end="0x1FFF" />
- <memory name="calibration" start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
- <memory name="user_ids" start="0x2000" end="0x2003" rmask="0x007F" />
+ <memory name="calibration" start="0x2008" end="0x2009" cal_optqmask="0x0000" cal_opcode="0x0000" />
+ <memory name="user_ids" start="0x2000" end="0x2003" rtqmask="0x007F" />
<memory name="device_id" start="0x2006" end="0x2006" />
<memory name="config" start="0x2007" end="0x2007" />
<memory name="eeprom" start="0x0000" end="0x00FF" hexfile_offset="0x2100" />
<memory name="debug_vector" start="0x2004" end="0x2004" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG" wmask="0x3FFF" bvalue="0x1FFF" >
- <mask name="FOSC" value="0x0007" >
+ <config offset="0x0" name="CONFIG" wtqmask="0x3FFF" bvalue="0x1FFF" >
+ <tqmask name="FOSC" value="0x0007" >
<value value="0x0000" name="LP" cname="_LP_OSC" />
<value value="0x0001" name="XT" cname="_XT_OSC" />
<value value="0x0002" name="HS" cname="_HS_OSC" />
@@ -49,45 +49,45 @@
<value value="0x0005" name="INTRC_CLKOUT" cname="_INTRC_OSC_CLKOUT" ecnames="_INTOSC" />
<value value="0x0006" name="EXTRC_IO" cname="_EXTRC_OSC_NOCLKOUT" ecnames="_EXTRCIO" />
<value value="0x0007" name="EXTRC_CLKOUT" cname="_EXTRC_OSC_CLKOUT" ecnames="_EXTRC" />
- </mask>
- <mask name="WDT" value="0x0008" >
+ </tqmask>
+ <tqmask name="WDT" value="0x0008" >
<value value="0x0000" name="Off" cname="_WDT_OFF" />
<value value="0x0008" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="PWRTE" value="0x0010" >
+ </tqmask>
+ <tqmask name="PWRTE" value="0x0010" >
<value value="0x0000" name="On" cname="_PWRTE_ON" />
<value value="0x0010" name="Off" cname="_PWRTE_OFF" />
- </mask>
- <mask name="MCLRE" value="0x0020" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x0020" >
<value value="0x0000" name="Internal" cname="_MCLRE_OFF" />
<value value="0x0020" name="External" cname="_MCLRE_ON" />
- </mask>
- <mask name="CP" value="0x0040" >
+ </tqmask>
+ <tqmask name="CP" value="0x0040" >
<value value="0x0000" name="All" cname="_CP_ON" />
<value value="0x0040" name="Off" cname="_CP_OFF" />
- </mask>
- <mask name="CPD" value="0x0080" >
+ </tqmask>
+ <tqmask name="CPD" value="0x0080" >
<value value="0x0000" name="All" cname="_CPD_ON" />
<value value="0x0080" name="Off" cname="_CPD_OFF" />
- </mask>
- <mask name="BODEN" value="0x0300" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0300" >
<value value="0x0000" name="Off" cname="_BOD_OFF" />
<value value="0x0100" name="Software" cname="_BOD_SBODEN" />
<value value="0x0200" name="On_run" cname="_BOD_NSLEEP" />
<value value="0x0300" name="On" cname="_BOD_ON" />
- </mask>
- <mask name="IESO" value="0x0400" >
+ </tqmask>
+ <tqmask name="IESO" value="0x0400" >
<value value="0x0000" name="Off" cname="_IESO_OFF" />
<value value="0x0400" name="On" cname="_IESO_ON" />
- </mask>
- <mask name="FCMEN" value="0x0800" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x0800" >
<value value="0x0000" name="Off" cname="_FCMEN_OFF" />
<value value="0x0800" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="DEBUG" value="0x1000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x1000" >
<value value="0x0000" name="On" cname="_DEBUG_ON" />
<value value="0x1000" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/16HV540.xml b/src/devices/pic/xml_data/16HV540.xml
index 439aa82..4acd802 100644
--- a/src/devices/pic/xml_data/16HV540.xml
+++ b/src/devices/pic/xml_data/16HV540.xml
@@ -28,25 +28,25 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000" end="0x1FF" />
- <memory name="user_ids" start="0x200" end="0x203" rmask="0x00F" />
+ <memory name="user_ids" start="0x200" end="0x203" rtqmask="0x00F" />
<memory name="config" start="0xFFF" end="0xFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFF" bvalue="0x00F" >
- <mask name="FOSC" value="0x003" >
+ <config offset="0x0" name="" wtqmask="0xFFF" bvalue="0x00F" >
+ <tqmask name="FOSC" value="0x003" >
<value value="0x000" name="LP" cname="_LP_OSC" />
<value value="0x001" name="XT" cname="_XT_OSC" />
<value value="0x002" name="HS" cname="_HS_OSC" />
<value value="0x003" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="WDT" value="0x004" >
+ </tqmask>
+ <tqmask name="WDT" value="0x004" >
<value value="0x000" name="Off" cname="_WDT_OFF" />
<value value="0x004" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="CP" value="0x008" >
+ </tqmask>
+ <tqmask name="CP" value="0x008" >
<value value="0x000" name="All" cname="_CP_ON" />
<value value="0x008" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C42.xml b/src/devices/pic/xml_data/17C42.xml
index e072c94..7ca1e0f 100644
--- a/src/devices/pic/xml_data/17C42.xml
+++ b/src/devices/pic/xml_data/17C42.xml
@@ -30,25 +30,25 @@
<memory name="config" start="0xFE00" end="0xFE00" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x005F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x005F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LF_OSC" />
<value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0002" name="XT" cname="_XT_OSC" />
<value value="0x0003" name="EC" cname="_EC_OSC" />
- </mask>
- <mask name="WDTPS" value="0x000C" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x000C" >
<value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
<value value="0x0004" name="1:128" cname="_WDT_64" />
<value value="0x0008" name="1:512" cname="_WDT_256" />
<value value="0x000C" name="1:1" cname="_WDT_1" />
- </mask>
- <mask name="PM" value="0x0050" >
+ </tqmask>
+ <tqmask name="PM" value="0x0050" >
<value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
<value value="0x0010" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x0040" name="Microcontroller" cname="_MC_MODE" />
<value value="0x0050" name="Microprocessor" cname="_MP_MODE" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C42A.xml b/src/devices/pic/xml_data/17C42A.xml
index 58c59b3..2c068ae 100644
--- a/src/devices/pic/xml_data/17C42A.xml
+++ b/src/devices/pic/xml_data/17C42A.xml
@@ -33,26 +33,26 @@
<memory name="config" start="0xFE00" end="0xFE00" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LF_OSC" />
<value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0002" name="XT" cname="_XT_OSC" />
<value value="0x0003" name="EC" cname="_EC_OSC" />
- </mask>
- <mask name="WDTPS" value="0x000C" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x000C" >
<value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
<value value="0x0004" name="1:128" cname="_WDT_64" />
<value value="0x0008" name="1:512" cname="_WDT_256" />
<value value="0x000C" name="1:1" cname="_WDT_1" />
- </mask>
- <mask name="PM" value="0x0150" >
+ </tqmask>
+ <tqmask name="PM" value="0x0150" >
<value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
<value value="0x0110" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x0140" name="Microcontroller" cname="_MC_MODE" />
<value value="0x0150" name="Microprocessor" cname="_MP_MODE" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C43.xml b/src/devices/pic/xml_data/17C43.xml
index 4c91f40..b49734a 100644
--- a/src/devices/pic/xml_data/17C43.xml
+++ b/src/devices/pic/xml_data/17C43.xml
@@ -33,26 +33,26 @@
<memory name="config" start="0xFE00" end="0xFE00" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LF_OSC" />
<value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0002" name="XT" cname="_XT_OSC" />
<value value="0x0003" name="EC" cname="_EC_OSC" />
- </mask>
- <mask name="WDTPS" value="0x000C" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x000C" >
<value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
<value value="0x0004" name="1:128" cname="_WDT_64" />
<value value="0x0008" name="1:512" cname="_WDT_256" />
<value value="0x000C" name="1:1" cname="_WDT_1" />
- </mask>
- <mask name="PM" value="0x0150" >
+ </tqmask>
+ <tqmask name="PM" value="0x0150" >
<value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
<value value="0x0110" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x0140" name="Microcontroller" cname="_MC_MODE" />
<value value="0x0150" name="Microprocessor" cname="_MP_MODE" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C44.xml b/src/devices/pic/xml_data/17C44.xml
index da4be7b..ac0d8f6 100644
--- a/src/devices/pic/xml_data/17C44.xml
+++ b/src/devices/pic/xml_data/17C44.xml
@@ -33,26 +33,26 @@
<memory name="config" start="0xFE00" end="0xFE00" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LF_OSC" />
<value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0002" name="XT" cname="_XT_OSC" />
<value value="0x0003" name="EC" cname="_EC_OSC" />
- </mask>
- <mask name="WDTPS" value="0x000C" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x000C" >
<value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
<value value="0x0004" name="1:128" cname="_WDT_64" />
<value value="0x0008" name="1:512" cname="_WDT_256" />
<value value="0x000C" name="1:1" cname="_WDT_1" />
- </mask>
- <mask name="PM" value="0x0150" >
+ </tqmask>
+ <tqmask name="PM" value="0x0150" >
<value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
<value value="0x0110" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x0140" name="Microcontroller" cname="_MC_MODE" />
<value value="0x0150" name="Microprocessor" cname="_MP_MODE" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C752.xml b/src/devices/pic/xml_data/17C752.xml
index 20f798f..adb759c 100644
--- a/src/devices/pic/xml_data/17C752.xml
+++ b/src/devices/pic/xml_data/17C752.xml
@@ -33,30 +33,30 @@
<memory name="config" start="0xFE00" end="0xFE00" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LF_OSC" />
<value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0002" name="XT" cname="_XT_OSC" />
<value value="0x0003" name="EC" cname="_EC_OSC" />
- </mask>
- <mask name="WDTPS" value="0x000C" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x000C" >
<value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
<value value="0x0004" name="1:64" cname="_WDT_64" />
<value value="0x0008" name="1:256" cname="_WDT_256" />
<value value="0x000C" name="1:1" cname="_WDT_1" ecnames="_WDT_0" />
- </mask>
- <mask name="BODEN" value="0x4000" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x4000" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x4000" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="PM" value="0x8050" >
+ </tqmask>
+ <tqmask name="PM" value="0x8050" >
<value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
<value value="0x8010" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x8040" name="Microcontroller" cname="_MC_MODE" />
<value value="0x8050" name="Microprocessor" cname="_MP_MODE" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C756.xml b/src/devices/pic/xml_data/17C756.xml
index a5df4c4..68b0ae7 100644
--- a/src/devices/pic/xml_data/17C756.xml
+++ b/src/devices/pic/xml_data/17C756.xml
@@ -33,30 +33,30 @@
<memory name="config" start="0xFE00" end="0xFE00" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LF_OSC" />
<value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0002" name="XT" cname="_XT_OSC" />
<value value="0x0003" name="EC" cname="_EC_OSC" />
- </mask>
- <mask name="WDTPS" value="0x000C" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x000C" >
<value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
<value value="0x0004" name="1:64" cname="_WDT_64" />
<value value="0x0008" name="1:256" cname="_WDT_256" />
<value value="0x000C" name="1:1" cname="_WDT_1" ecnames="_WDT_0" />
- </mask>
- <mask name="BODEN" value="0x4000" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x4000" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x4000" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="PM" value="0x8050" >
+ </tqmask>
+ <tqmask name="PM" value="0x8050" >
<value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
<value value="0x8010" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x8040" name="Microcontroller" cname="_MC_MODE" />
<value value="0x8050" name="Microprocessor" cname="_MP_MODE" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C756A.xml b/src/devices/pic/xml_data/17C756A.xml
index f20ee31..39c9b81 100644
--- a/src/devices/pic/xml_data/17C756A.xml
+++ b/src/devices/pic/xml_data/17C756A.xml
@@ -33,30 +33,30 @@
<memory name="config" start="0xFE00" end="0xFE00" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LF_OSC" />
<value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0002" name="XT" cname="_XT_OSC" />
<value value="0x0003" name="EC" cname="_EC_OSC" />
- </mask>
- <mask name="WDTPS" value="0x000C" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x000C" >
<value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
<value value="0x0004" name="1:64" cname="_WDT_64" />
<value value="0x0008" name="1:256" cname="_WDT_256" />
<value value="0x000C" name="1:1" cname="_WDT_1" ecnames="_WDT_0" />
- </mask>
- <mask name="BODEN" value="0x4000" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x4000" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x4000" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="PM" value="0x8050" >
+ </tqmask>
+ <tqmask name="PM" value="0x8050" >
<value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
<value value="0x8010" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x8040" name="Microcontroller" cname="_MC_MODE" />
<value value="0x8050" name="Microprocessor" cname="_MP_MODE" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C762.xml b/src/devices/pic/xml_data/17C762.xml
index 10e3a86..311caa6 100644
--- a/src/devices/pic/xml_data/17C762.xml
+++ b/src/devices/pic/xml_data/17C762.xml
@@ -33,30 +33,30 @@
<memory name="config" start="0xFE00" end="0xFE00" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LF_OSC" />
<value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0002" name="XT" cname="_XT_OSC" />
<value value="0x0003" name="EC" cname="_EC_OSC" />
- </mask>
- <mask name="WDTPS" value="0x000C" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x000C" >
<value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
<value value="0x0004" name="1:64" cname="_WDT_64" />
<value value="0x0008" name="1:256" cname="_WDT_256" />
<value value="0x000C" name="1:1" cname="_WDT_1" ecnames="_WDT_0" />
- </mask>
- <mask name="BODEN" value="0x4000" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x4000" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x4000" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="PM" value="0x8050" >
+ </tqmask>
+ <tqmask name="PM" value="0x8050" >
<value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
<value value="0x8010" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x8040" name="Microcontroller" cname="_MC_MODE" />
<value value="0x8050" name="Microprocessor" cname="_MP_MODE" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17C766.xml b/src/devices/pic/xml_data/17C766.xml
index 0d2559d..059decd 100644
--- a/src/devices/pic/xml_data/17C766.xml
+++ b/src/devices/pic/xml_data/17C766.xml
@@ -33,30 +33,30 @@
<memory name="config" start="0xFE00" end="0xFE00" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFFF" bvalue="0xC05F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0xC05F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LF_OSC" />
<value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0002" name="XT" cname="_XT_OSC" />
<value value="0x0003" name="EC" cname="_EC_OSC" />
- </mask>
- <mask name="WDTPS" value="0x000C" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x000C" >
<value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
<value value="0x0004" name="1:64" cname="_WDT_64" />
<value value="0x0008" name="1:256" cname="_WDT_256" />
<value value="0x000C" name="1:1" cname="_WDT_1" ecnames="_WDT_0" />
- </mask>
- <mask name="BODEN" value="0x4000" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x4000" >
<value value="0x0000" name="Off" cname="_BODEN_OFF" />
<value value="0x4000" name="On" cname="_BODEN_ON" />
- </mask>
- <mask name="PM" value="0x8050" >
+ </tqmask>
+ <tqmask name="PM" value="0x8050" >
<value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
<value value="0x8010" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x8040" name="Microcontroller" cname="_MC_MODE" />
<value value="0x8050" name="Microprocessor" cname="_MP_MODE" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17CR42.xml b/src/devices/pic/xml_data/17CR42.xml
index b691cd8..21893f8 100644
--- a/src/devices/pic/xml_data/17CR42.xml
+++ b/src/devices/pic/xml_data/17CR42.xml
@@ -33,26 +33,26 @@
<memory name="config" start="0xFE00" end="0xFE00" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LF_OSC" />
<value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0002" name="XT" cname="_XT_OSC" />
<value value="0x0003" name="EC" cname="_EC_OSC" />
- </mask>
- <mask name="WDTPS" value="0x000C" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x000C" >
<value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
<value value="0x0004" name="1:128" cname="_WDT_64" />
<value value="0x0008" name="1:512" cname="_WDT_256" />
<value value="0x000C" name="1:1" cname="_WDT_1" />
- </mask>
- <mask name="PM" value="0x0150" >
+ </tqmask>
+ <tqmask name="PM" value="0x0150" >
<value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
<value value="0x0110" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x0140" name="Microcontroller" cname="_MC_MODE" />
<value value="0x0150" name="Microprocessor" cname="_MP_MODE" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/17CR43.xml b/src/devices/pic/xml_data/17CR43.xml
index 13c1f2c..1e43eec 100644
--- a/src/devices/pic/xml_data/17CR43.xml
+++ b/src/devices/pic/xml_data/17CR43.xml
@@ -33,26 +33,26 @@
<memory name="config" start="0xFE00" end="0xFE00" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="" wmask="0xFFFF" bvalue="0x015F" >
- <mask name="FOSC" value="0x0003" >
+ <config offset="0x0" name="" wtqmask="0xFFFF" bvalue="0x015F" >
+ <tqmask name="FOSC" value="0x0003" >
<value value="0x0000" name="LP" cname="_LF_OSC" />
<value value="0x0001" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0002" name="XT" cname="_XT_OSC" />
<value value="0x0003" name="EC" cname="_EC_OSC" />
- </mask>
- <mask name="WDTPS" value="0x000C" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x000C" >
<value value="0x0000" name="Disabled" cname="_WDT_OFF" ecnames="_WDT_NORM" />
<value value="0x0004" name="1:128" cname="_WDT_64" />
<value value="0x0008" name="1:512" cname="_WDT_256" />
<value value="0x000C" name="1:1" cname="_WDT_1" />
- </mask>
- <mask name="PM" value="0x0150" >
+ </tqmask>
+ <tqmask name="PM" value="0x0150" >
<value value="0x0000" name="Code-protected microcontroller" cname="_PMC_MODE" />
<value value="0x0110" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x0140" name="Microcontroller" cname="_MC_MODE" />
<value value="0x0150" name="Microprocessor" cname="_MP_MODE" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18C242.xml b/src/devices/pic/xml_data/18C242.xml
index 798c478..32495ab 100644
--- a/src/devices/pic/xml_data/18C242.xml
+++ b/src/devices/pic/xml_data/18C242.xml
@@ -29,21 +29,21 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x300007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP" value="0xFF" >
+ <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP" value="0xFF" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0xFF" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -52,36 +52,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -90,26 +90,26 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="pdip soic" nb_pins="28" >
diff --git a/src/devices/pic/xml_data/18C252.xml b/src/devices/pic/xml_data/18C252.xml
index 81f370b..d5a7161 100644
--- a/src/devices/pic/xml_data/18C252.xml
+++ b/src/devices/pic/xml_data/18C252.xml
@@ -29,21 +29,21 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x300007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP" value="0xFF" >
+ <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP" value="0xFF" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0xFF" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -52,36 +52,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -90,26 +90,26 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="pdip soic" nb_pins="28" >
diff --git a/src/devices/pic/xml_data/18C442.xml b/src/devices/pic/xml_data/18C442.xml
index 419ee29..5ecb3b4 100644
--- a/src/devices/pic/xml_data/18C442.xml
+++ b/src/devices/pic/xml_data/18C442.xml
@@ -29,21 +29,21 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x300007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP" value="0xFF" >
+ <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP" value="0xFF" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0xFF" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -52,36 +52,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -90,26 +90,26 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="pdip" nb_pins="40" >
diff --git a/src/devices/pic/xml_data/18C452.xml b/src/devices/pic/xml_data/18C452.xml
index 73e3610..5a6a07c 100644
--- a/src/devices/pic/xml_data/18C452.xml
+++ b/src/devices/pic/xml_data/18C452.xml
@@ -29,21 +29,21 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x300007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP" value="0xFF" >
+ <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP" value="0xFF" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0xFF" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -52,36 +52,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -90,26 +90,26 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="pdip" nb_pins="40" >
diff --git a/src/devices/pic/xml_data/18C601.xml b/src/devices/pic/xml_data/18C601.xml
index 6d41b1c..9469902 100644
--- a/src/devices/pic/xml_data/18C601.xml
+++ b/src/devices/pic/xml_data/18C601.xml
@@ -27,34 +27,34 @@
<memory name="config" start="0x300000" end="0x300007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x02" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x02" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="EC_CLKOUT" cname="_EC_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
<value value="0x03" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x41" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x41" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_BW_8_BIT" />
<value value="0x40" name="16" cname="_BW_16_BIT" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -63,25 +63,25 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="0x7F" />
<value value="0x80" name="Off" cname="0xFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18C658.xml b/src/devices/pic/xml_data/18C658.xml
index 9ca140c..5f115ee 100644
--- a/src/devices/pic/xml_data/18C658.xml
+++ b/src/devices/pic/xml_data/18C658.xml
@@ -29,21 +29,21 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x300007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP" value="0xFF" >
+ <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP" value="0xFF" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0xFF" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -52,36 +52,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -90,21 +90,21 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18C801.xml b/src/devices/pic/xml_data/18C801.xml
index 3e067ad..186230c 100644
--- a/src/devices/pic/xml_data/18C801.xml
+++ b/src/devices/pic/xml_data/18C801.xml
@@ -27,34 +27,34 @@
<memory name="config" start="0x300000" end="0x300007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x02" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x02" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="EC_CLKOUT" cname="_EC_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
<value value="0x03" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x41" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x41" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_BW_8_BIT" />
<value value="0x40" name="16" cname="_BW_16_BIT" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -63,25 +63,25 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="0x7F" />
<value value="0x80" name="Off" cname="0xFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18C858.xml b/src/devices/pic/xml_data/18C858.xml
index 7ce8087..33eb056 100644
--- a/src/devices/pic/xml_data/18C858.xml
+++ b/src/devices/pic/xml_data/18C858.xml
@@ -29,21 +29,21 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x300007" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG0" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP" value="0xFF" >
+ <config offset="0x0" name="CONFIG0" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP" value="0xFF" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0xFF" name="Off" cname="_CP_OFF" />
<value value="default" name="invalid" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -52,36 +52,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG3" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG3" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -90,21 +90,21 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG4" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG4" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG5" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG5" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG6" wmask="0xFF" bvalue="0x01" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG6" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG7" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG7" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F1220.xml b/src/devices/pic/xml_data/18F1220.xml
index e46f7f0..1cd826b 100644
--- a/src/devices/pic/xml_data/18F1220.xml
+++ b/src/devices/pic/xml_data/18F1220.xml
@@ -34,17 +34,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -55,40 +55,40 @@
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_EXT_Port_on_RA6" />
<value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" sdcc_cname="_OSC_INT_Port_on_RA6_Port_on_RA7" />
<value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" sdcc_cname="_OSC_INT_CLKOUT_on_RA6_Port_on_RA7" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FSCM_OFF" sdcc_cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FSCM_ON" sdcc_cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
<value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -105,99 +105,99 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8K" sdcc_cname="_WDTPS_1_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16K" sdcc_cname="_WDTPS_1_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32K" sdcc_cname="_WDTPS_1_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x80" >
- <mask name="MCLRE" value="0x80" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x80" >
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_disabled_RA5_input_en" />
<value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_enabled_RA5_input_dis" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F1230.xml b/src/devices/pic/xml_data/18F1230.xml
index 043687a..c84d79f 100644
--- a/src/devices/pic/xml_data/18F1230.xml
+++ b/src/devices/pic/xml_data/18F1230.xml
@@ -39,17 +39,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x00007F" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -60,42 +60,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO2" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="Software" cname="_BOR_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOR_BOACTIVE" />
<value value="0x06" name="On" cname="_BOR_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -112,124 +112,124 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x0E" >
- <mask name="PWMPIN" value="0x02" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x0E" >
+ <tqmask name="PWMPIN" value="0x02" >
<value value="0x00" name="On" cname="_PWMPIN_ON" />
<value value="0x02" name="Off" cname="_PWMPIN_OFF" />
- </mask>
- <mask name="LPOL" value="0x04" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x04" >
<value value="0x00" name="low" cname="_LPOL_LOW" />
<value value="0x04" name="high" cname="_LPOL_HIGH" />
- </mask>
- <mask name="HPOL" value="0x08" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x08" >
<value value="0x00" name="low" cname="_HPOL_LOW" />
<value value="0x08" name="high" cname="_HPOL_HIGH" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="FLTAMX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="FLTAMX" value="0x01" >
<value value="0x00" name="RA7" cname="_FLTAMX_RA7" />
<value value="0x01" name="RA5" cname="_FLTAMX_RA5" />
- </mask>
- <mask name="T1OSCMX" value="0x08" >
+ </tqmask>
+ <tqmask name="T1OSCMX" value="0x08" >
<value value="0x00" name="RB2" cname="_T1OSCMX_HIGH" />
<value value="0x08" name="RA6" cname="_T1OSCMX_LOW" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="256" cname="_BBSIZ_BB256" />
<value value="default" name="512" cname="_BBSIZ_BB512" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200/0400:07FF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200/0400:07FF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200/0400:07FF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F1320.xml b/src/devices/pic/xml_data/18F1320.xml
index d4dd214..8cee921 100644
--- a/src/devices/pic/xml_data/18F1320.xml
+++ b/src/devices/pic/xml_data/18F1320.xml
@@ -34,17 +34,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -56,40 +56,40 @@
<value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" />
<value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" />
<value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FSCM_OFF" />
<value value="0x40" name="On" cname="_FSCM_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,99 +106,99 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8K" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x80" >
- <mask name="MCLRE" value="0x80" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x80" >
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F1330.xml b/src/devices/pic/xml_data/18F1330.xml
index 14130ce..fb11bbb 100644
--- a/src/devices/pic/xml_data/18F1330.xml
+++ b/src/devices/pic/xml_data/18F1330.xml
@@ -40,17 +40,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x00007F" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -61,42 +61,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO2" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="Software" cname="_BOR_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOR_BOACTIVE" />
<value value="0x06" name="On" cname="_BOR_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -113,125 +113,125 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x0E" >
- <mask name="PWMPIN" value="0x02" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x0E" >
+ <tqmask name="PWMPIN" value="0x02" >
<value value="0x00" name="On" cname="_PWMPIN_ON" />
<value value="0x02" name="Off" cname="_PWMPIN_OFF" />
- </mask>
- <mask name="LPOL" value="0x04" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x04" >
<value value="0x00" name="low" cname="_LPOL_LOW" />
<value value="0x04" name="high" cname="_LPOL_HIGH" />
- </mask>
- <mask name="HPOL" value="0x08" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x08" >
<value value="0x00" name="low" cname="_HPOL_LOW" />
<value value="0x08" name="high" cname="_HPOL_HIGH" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="FLTAMX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="FLTAMX" value="0x01" >
<value value="0x00" name="RA7" cname="_FLTAMX_RA7" />
<value value="0x01" name="RA5" cname="_FLTAMX_RA5" />
- </mask>
- <mask name="T1OSCMX" value="0x08" >
+ </tqmask>
+ <tqmask name="T1OSCMX" value="0x08" >
<value value="0x00" name="RB2" cname="_T1OSCMX_HIGH" />
<value value="0x08" name="RA6" cname="_T1OSCMX_LOW" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="256" cname="_BBSIZ_BB256" />
<value value="0x10" name="512" cname="_BBSIZ_BB512" />
<value value="default" name="1024" cname="_BBSIZ_BB1K" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200/0400/0800:0FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200/0400/0800:0FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200/0400/0800:0FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2220.xml b/src/devices/pic/xml_data/18F2220.xml
index 43f6fbc..7ea415b 100644
--- a/src/devices/pic/xml_data/18F2220.xml
+++ b/src/devices/pic/xml_data/18F2220.xml
@@ -35,17 +35,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -56,40 +56,40 @@
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_EXT_Port_on_RA6" />
<value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" sdcc_cname="_OSC_INT_Port_on_RA6_Port_on_RA7" />
<value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" sdcc_cname="_OSC_INT_CLKOUT_on_RA6_Port_on_RA7" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FSCM_OFF" sdcc_cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FSCM_ON" sdcc_cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
<value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -106,107 +106,107 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8K" sdcc_cname="_WDTPS_1_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16K" sdcc_cname="_WDTPS_1_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32K" sdcc_cname="_WDTPS_1_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_B3" ecnames="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_C1" ecnames="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBAD_DIG" sdcc_cname="_PBADEN_PORTB_4_0__digital_I_O_on_REST" />
<value value="0x02" name="analog" cname="_PBAD_ANA" sdcc_cname="_PBADEN_PORTB_4_0__analog_inputs_on_RSET" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_Disabled_RE3_Enabled" />
<value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_Enabled_RE3_Disabled" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2221.xml b/src/devices/pic/xml_data/18F2221.xml
index f2a58d6..b3436d5 100644
--- a/src/devices/pic/xml_data/18F2221.xml
+++ b/src/devices/pic/xml_data/18F2221.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -48,42 +48,42 @@
<value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" />
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO2" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="Software" cname="_BOR_SOFT" />
<value value="0x04" name="On_run" cname="_BOR_NOSLP" />
<value value="0x06" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -100,119 +100,119 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_RC1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_DIG" />
<value value="0x02" name="analog" cname="_PBADEN_ANA" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="256" cname="_BBSIZ_BB256" />
<value value="default" name="512" cname="_BBSIZ_BB512" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="200/400:7FF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200/0400:07FF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200/0400:07FF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2320.xml b/src/devices/pic/xml_data/18F2320.xml
index 80e8250..d17d96a 100644
--- a/src/devices/pic/xml_data/18F2320.xml
+++ b/src/devices/pic/xml_data/18F2320.xml
@@ -37,17 +37,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -59,40 +59,40 @@
<value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" />
<value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" />
<value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FSCM_OFF" />
<value value="0x40" name="On" cname="_FSCM_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -109,131 +109,131 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8K" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_B3" ecnames="_CCP2MX_OFF" />
<value value="0x01" name="RC1" cname="_CCP2MX_C1" ecnames="_CCP2MX_ON" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBAD_DIG" />
<value value="0x02" name="analog" cname="_PBAD_ANA" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="1000:17FF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="1800:1FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="1000:17FF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="1800:1FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="1000:17FF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="1800:1FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2321.xml b/src/devices/pic/xml_data/18F2321.xml
index a016fc7..f00f7dc 100644
--- a/src/devices/pic/xml_data/18F2321.xml
+++ b/src/devices/pic/xml_data/18F2321.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -48,42 +48,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO2" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO1" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="Software" cname="_BOR_SOFT" />
<value value="0x04" name="On_run" cname="_BOR_NOSLP" />
<value value="0x06" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -100,120 +100,120 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_RC1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_DIG" />
<value value="0x02" name="analog" cname="_PBADEN_ANA" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="256" cname="_BBSIZ_BB256" />
<value value="0x10" name="512" cname="_BBSIZ_BB512" />
<value value="default" name="1024" cname="_BBSIZ_BB1K" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200/0400/0800:0FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200/0400/0800:0FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200/0400/0800:0FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2331.xml b/src/devices/pic/xml_data/18F2331.xml
index 46a8872..7f73a7d 100644
--- a/src/devices/pic/xml_data/18F2331.xml
+++ b/src/devices/pic/xml_data/18F2331.xml
@@ -34,17 +34,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -55,40 +55,40 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRC" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRTEN_ON" />
<value value="0x01" name="Off" cname="_PWRTEN_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="On" cname="_BOREN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDTEN_OFF" />
<value value="0x01" name="On" cname="_WDTEN_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDPS_1" />
<value value="0x02" name="1:2" cname="_WDPS_2" />
<value value="0x04" name="1:4" cname="_WDPS_4" />
@@ -105,120 +105,120 @@
<value value="0x1A" name="1:8192" cname="_WDPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDPS_32768" />
- </mask>
- <mask name="WINEN" value="0x20" >
+ </tqmask>
+ <tqmask name="WINEN" value="0x20" >
<value value="0x00" name="On" cname="_WINEN_ON" />
<value value="0x20" name="Off" cname="_WINEN_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" >
- <mask name="PWMPIN" value="0x04" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" >
+ <tqmask name="PWMPIN" value="0x04" >
<value value="0x00" name="On" cname="_PWMPIN_ON" />
<value value="0x04" name="Off" cname="_PWMPIN_OFF" />
- </mask>
- <mask name="LPOL" value="0x08" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x08" >
<value value="0x00" name="low" cname="_LPOL_LOW" />
<value value="0x08" name="high" cname="_LPOL_HIGH" />
- </mask>
- <mask name="HPOL" value="0x10" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x10" >
<value value="0x00" name="low" cname="_HPOL_LOW" />
<value value="0x10" name="high" cname="_HPOL_HIGH" />
- </mask>
- <mask name="T1OSCMX" value="0x20" >
+ </tqmask>
+ <tqmask name="T1OSCMX" value="0x20" >
<value value="0x00" name="Legacy" cname="_T1OSCMX_OFF" />
<value value="0x20" name="Low Power" cname="_T1OSCMX_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" >
- <mask name="MCLRE" value="0x80" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" >
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2410.xml b/src/devices/pic/xml_data/18F2410.xml
index 15d6179..76968f8 100644
--- a/src/devices/pic/xml_data/18F2410.xml
+++ b/src/devices/pic/xml_data/18F2410.xml
@@ -27,16 +27,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -47,42 +47,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -99,107 +99,107 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F242.xml b/src/devices/pic/xml_data/18F242.xml
index d09dd83..8588203 100644
--- a/src/devices/pic/xml_data/18F242.xml
+++ b/src/devices/pic/xml_data/18F242.xml
@@ -34,17 +34,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -53,36 +53,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -91,99 +91,99 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" icnames="_CP2_OFF _CP2_ON _CP3_OFF _CP3_ON" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" icnames="_CP2_OFF _CP2_ON _CP3_OFF _CP3_ON" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" icnames="_WRT2_OFF _WRT2_ON _WRT3_OFF _WRT3_ON" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" icnames="_WRT2_OFF _WRT2_ON _WRT3_OFF _WRT3_ON" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" icnames="_EBTR2_OFF _EBTR2_ON _EBTR3_OFF _EBTR3_ON" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" icnames="_EBTR2_OFF _EBTR2_ON _EBTR3_OFF _EBTR3_ON" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2420.xml b/src/devices/pic/xml_data/18F2420.xml
index aba9ace..d50dd2a 100644
--- a/src/devices/pic/xml_data/18F2420.xml
+++ b/src/devices/pic/xml_data/18F2420.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -48,42 +48,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -100,115 +100,115 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2423.xml b/src/devices/pic/xml_data/18F2423.xml
index 0905f18..29ff971 100644
--- a/src/devices/pic/xml_data/18F2423.xml
+++ b/src/devices/pic/xml_data/18F2423.xml
@@ -24,17 +24,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -45,42 +45,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -97,115 +97,115 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2431.xml b/src/devices/pic/xml_data/18F2431.xml
index f898f99..f162ef2 100644
--- a/src/devices/pic/xml_data/18F2431.xml
+++ b/src/devices/pic/xml_data/18F2431.xml
@@ -35,17 +35,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -56,40 +56,40 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRC" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRTEN_ON" />
<value value="0x01" name="Off" cname="_PWRTEN_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="On" cname="_BOREN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDTEN_OFF" />
<value value="0x01" name="On" cname="_WDTEN_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDPS_1" />
<value value="0x02" name="1:2" cname="_WDPS_2" />
<value value="0x04" name="1:4" cname="_WDPS_4" />
@@ -106,120 +106,120 @@
<value value="0x1A" name="1:8192" cname="_WDPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDPS_32768" />
- </mask>
- <mask name="WINEN" value="0x20" >
+ </tqmask>
+ <tqmask name="WINEN" value="0x20" >
<value value="0x00" name="On" cname="_WINEN_ON" />
<value value="0x20" name="Off" cname="_WINEN_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" >
- <mask name="PWMPIN" value="0x04" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" >
+ <tqmask name="PWMPIN" value="0x04" >
<value value="0x00" name="On" cname="_PWMPIN_ON" />
<value value="0x04" name="Off" cname="_PWMPIN_OFF" />
- </mask>
- <mask name="LPOL" value="0x08" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x08" >
<value value="0x00" name="low" cname="_LPOL_LOW" />
<value value="0x08" name="high" cname="_LPOL_HIGH" />
- </mask>
- <mask name="HPOL" value="0x10" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x10" >
<value value="0x00" name="low" cname="_HPOL_LOW" />
<value value="0x10" name="high" cname="_HPOL_HIGH" />
- </mask>
- <mask name="T1OSCMX" value="0x20" >
+ </tqmask>
+ <tqmask name="T1OSCMX" value="0x20" >
<value value="0x00" name="Legacy" cname="_T1OSCMX_OFF" />
<value value="0x20" name="Low Power" cname="_T1OSCMX_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" >
- <mask name="MCLRE" value="0x80" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" >
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2439.xml b/src/devices/pic/xml_data/18F2439.xml
index ad389e3..edc3696 100644
--- a/src/devices/pic/xml_data/18F2439.xml
+++ b/src/devices/pic/xml_data/18F2439.xml
@@ -35,48 +35,48 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="default" name="invalid" />
<value value="0x02" name="HS" cname="_OSC_HS" />
<value value="0x04" name="EC_CLKOUT" cname="_OSC_EC" />
<value value="0x05" name="EC_IO" cname="_OSC_ECIO" />
<value value="0x06" name="H4" cname="_OSC_HSPLL" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -85,94 +85,94 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2450.xml b/src/devices/pic/xml_data/18F2450.xml
index 2388a92..ad3994f 100644
--- a/src/devices/pic/xml_data/18F2450.xml
+++ b/src/devices/pic/xml_data/18F2450.xml
@@ -27,14 +27,14 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x07" cmask="0x00" >
- <mask name="PLLDIV" value="0x07" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" >
+ <tqmask name="PLLDIV" value="0x07" >
<value value="0x00" name="1" cname="_PLLDIV_1" />
<value value="0x01" name="2" cname="_PLLDIV_2" />
<value value="0x02" name="3" cname="_PLLDIV_3" />
@@ -43,21 +43,21 @@
<value value="0x05" name="6" cname="_PLLDIV_6" />
<value value="0x06" name="10" cname="_PLLDIV_10" />
<value value="0x07" name="12" cname="_PLLDIV_12" />
- </mask>
- <mask name="CPUDIV" value="0x18" >
+ </tqmask>
+ <tqmask name="CPUDIV" value="0x18" >
<value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" />
<value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" />
<value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" />
<value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" />
- </mask>
- <mask name="USBDIV" value="0x20" >
+ </tqmask>
+ <tqmask name="USBDIV" value="0x20" >
<value value="0x00" name="1" cname="_USBDIV_1" />
<value value="0x20" name="2" cname="_USBDIV_2" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" cmask="0x00" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="XT" cname="_FOSC_XT_XT" />
<value value="0x01" name="XT" cname="_FOSC_XT_XT" />
<value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" />
@@ -74,46 +74,46 @@
<value value="0x0D" name="HS" cname="_FOSC_HS" />
<value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" />
<value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="Software" cname="_BOR_SOFT" />
<value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" />
<value value="0x06" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.6" cname="_BORV_46" />
<value value="0x08" name="4.3" cname="_BORV_43" />
<value value="0x10" name="2.8" cname="_BORV_28" />
<value value="0x18" name="2.1" cname="_BORV_21" />
- </mask>
- <mask name="VREGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="VREGEN" value="0x20" >
<value value="0x00" name="Off" cname="_VREGEN_OFF" />
<value value="0x20" name="On" cname="_VREGEN_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -130,107 +130,107 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" cmask="0x00" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" ctqmask="0x00" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x08" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x08" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x08" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x08" >
<value value="0x00" name="1024" cname="_BBSIZ_BB1K" />
<value value="0x08" name="2048" cname="_BBSIZ_BB2K" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2455.xml b/src/devices/pic/xml_data/18F2455.xml
index 7097218..c42923a 100644
--- a/src/devices/pic/xml_data/18F2455.xml
+++ b/src/devices/pic/xml_data/18F2455.xml
@@ -26,15 +26,15 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x005FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" >
- <mask name="PLLDIV" value="0x07" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" >
+ <tqmask name="PLLDIV" value="0x07" >
<value value="0x00" name="1" cname="_PLLDIV_1" sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" />
<value value="0x01" name="2" cname="_PLLDIV_2" sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" />
<value value="0x02" name="3" cname="_PLLDIV_3" sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" />
@@ -43,21 +43,21 @@
<value value="0x05" name="6" cname="_PLLDIV_6" sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" />
<value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" />
<value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" />
- </mask>
- <mask name="CPUDIV" value="0x18" >
+ </tqmask>
+ <tqmask name="CPUDIV" value="0x18" >
<value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" />
<value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" />
<value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" />
<value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" />
- </mask>
- <mask name="USBDIV" value="0x20" >
+ </tqmask>
+ <tqmask name="USBDIV" value="0x20" >
<value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" />
<value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" />
<value value="0x01" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" />
<value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" sdcc_cname="_OSC_XT__XT_PLL__USB_XT" />
@@ -74,46 +74,46 @@
<value value="0x0D" name="HS" cname="_FOSC_HS" sdcc_cname="_OSC_HS__USB_HS" />
<value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
<value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEM_ON" sdcc_cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" cmask="0x18" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" ctqmask="0x18" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="Software" cname="_BOR_SOFT" sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" />
<value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" />
<value value="0x06" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" />
<value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" />
<value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" />
<value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" />
- </mask>
- <mask name="VREGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="VREGEN" value="0x20" >
<value value="0x00" name="Off" cname="_VREGEN_OFF" />
<value value="0x20" name="On" cname="_VREGEN_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
<value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -130,127 +130,127 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
<value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
<value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xDF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xDF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" sdcc_cname="_ENHCPU_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0xC0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0xC0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F248.xml b/src/devices/pic/xml_data/18F248.xml
index 973ba90..a7078ba 100644
--- a/src/devices/pic/xml_data/18F248.xml
+++ b/src/devices/pic/xml_data/18F248.xml
@@ -34,17 +34,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -53,36 +53,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.0" cname="_BORV_25" sdcc_cname="_BODENV_2_0V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -91,94 +91,94 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2480.xml b/src/devices/pic/xml_data/18F2480.xml
index 7f8929b..4282365 100644
--- a/src/devices/pic/xml_data/18F2480.xml
+++ b/src/devices/pic/xml_data/18F2480.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" cmask="0x0F" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" ctqmask="0x0F" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" cmask="0x06" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" ctqmask="0x06" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,115 +106,115 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" cmask="0x02" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" ctqmask="0x02" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x10" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x10" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F24J10.xml b/src/devices/pic/xml_data/18F24J10.xml
index c4ae257..b88c8f0 100644
--- a/src/devices/pic/xml_data/18F24J10.xml
+++ b/src/devices/pic/xml_data/18F24J10.xml
@@ -31,55 +31,55 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -96,23 +96,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2510.xml b/src/devices/pic/xml_data/18F2510.xml
index 1950de1..55c62f8 100644
--- a/src/devices/pic/xml_data/18F2510.xml
+++ b/src/devices/pic/xml_data/18F2510.xml
@@ -27,16 +27,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,131 +105,131 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2515.xml b/src/devices/pic/xml_data/18F2515.xml
index 89960ae..fa07b14 100644
--- a/src/devices/pic/xml_data/18F2515.xml
+++ b/src/devices/pic/xml_data/18F2515.xml
@@ -27,16 +27,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,119 +105,119 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F252.xml b/src/devices/pic/xml_data/18F252.xml
index b1d4153..595eb74 100644
--- a/src/devices/pic/xml_data/18F252.xml
+++ b/src/devices/pic/xml_data/18F252.xml
@@ -35,17 +35,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -54,36 +54,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -92,123 +92,123 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2520.xml b/src/devices/pic/xml_data/18F2520.xml
index 3c77df0..07a97db 100644
--- a/src/devices/pic/xml_data/18F2520.xml
+++ b/src/devices/pic/xml_data/18F2520.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,139 +106,139 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2523.xml b/src/devices/pic/xml_data/18F2523.xml
index 6a92c8d..e630c60 100644
--- a/src/devices/pic/xml_data/18F2523.xml
+++ b/src/devices/pic/xml_data/18F2523.xml
@@ -24,17 +24,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -45,42 +45,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -97,139 +97,139 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2525.xml b/src/devices/pic/xml_data/18F2525.xml
index 2ff5bc7..eb2f3fe 100644
--- a/src/devices/pic/xml_data/18F2525.xml
+++ b/src/devices/pic/xml_data/18F2525.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,127 +106,127 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2539.xml b/src/devices/pic/xml_data/18F2539.xml
index 0f4a17a..8e5f2cc 100644
--- a/src/devices/pic/xml_data/18F2539.xml
+++ b/src/devices/pic/xml_data/18F2539.xml
@@ -35,48 +35,48 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x005FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="default" name="invalid" />
<value value="0x02" name="HS" cname="_OSC_HS" />
<value value="0x04" name="EC_CLKOUT" cname="_OSC_EC" />
<value value="0x05" name="EC_IO" cname="_OSC_ECIO" />
<value value="0x06" name="H4" cname="_OSC_HSPLL" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -85,106 +85,106 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2550.xml b/src/devices/pic/xml_data/18F2550.xml
index 21ab9ae..af87dd0 100644
--- a/src/devices/pic/xml_data/18F2550.xml
+++ b/src/devices/pic/xml_data/18F2550.xml
@@ -26,15 +26,15 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" >
- <mask name="PLLDIV" value="0x07" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" >
+ <tqmask name="PLLDIV" value="0x07" >
<value value="0x00" name="1" cname="_PLLDIV_1" sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" />
<value value="0x01" name="2" cname="_PLLDIV_2" sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" />
<value value="0x02" name="3" cname="_PLLDIV_3" sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" />
@@ -43,21 +43,21 @@
<value value="0x05" name="6" cname="_PLLDIV_6" sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" />
<value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" />
<value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" />
- </mask>
- <mask name="CPUDIV" value="0x18" >
+ </tqmask>
+ <tqmask name="CPUDIV" value="0x18" >
<value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" />
<value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" />
<value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" />
<value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" />
- </mask>
- <mask name="USBDIV" value="0x20" >
+ </tqmask>
+ <tqmask name="USBDIV" value="0x20" >
<value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" />
<value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" />
<value value="0x01" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" />
<value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" sdcc_cname="_OSC_XT__XT_PLL__USB_XT" />
@@ -74,46 +74,46 @@
<value value="0x0D" name="HS" cname="_FOSC_HS" sdcc_cname="_OSC_HS__USB_HS" />
<value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
<value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEM_ON" sdcc_cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="Software" cname="_BOR_SOFT" sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" />
<value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" />
<value value="0x06" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" />
<value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" />
<value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" />
<value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" />
- </mask>
- <mask name="VREGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="VREGEN" value="0x20" >
<value value="0x00" name="Off" cname="_VREGEN_OFF" />
<value value="0x20" name="On" cname="_VREGEN_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
<value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -130,131 +130,131 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
<value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
<value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xDF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xDF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" sdcc_cname="_ENHCPU_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" cmask="0x40" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" ctqmask="0x40" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F258.xml b/src/devices/pic/xml_data/18F258.xml
index bb27ca5..c24567e 100644
--- a/src/devices/pic/xml_data/18F258.xml
+++ b/src/devices/pic/xml_data/18F258.xml
@@ -35,17 +35,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -54,36 +54,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -92,118 +92,118 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2580.xml b/src/devices/pic/xml_data/18F2580.xml
index 6721af5..4458519 100644
--- a/src/devices/pic/xml_data/18F2580.xml
+++ b/src/devices/pic/xml_data/18F2580.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,139 +106,139 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x10" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x10" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2585.xml b/src/devices/pic/xml_data/18F2585.xml
index 12b38f1..fa6d739 100644
--- a/src/devices/pic/xml_data/18F2585.xml
+++ b/src/devices/pic/xml_data/18F2585.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,129 +106,129 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
<value value="0x20" name="4096" cname="_BBSIZ_4096" />
<value value="0x30" name="4096" cname="_BBSIZ_4096" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F25J10.xml b/src/devices/pic/xml_data/18F25J10.xml
index 57f37d4..e6b94e0 100644
--- a/src/devices/pic/xml_data/18F25J10.xml
+++ b/src/devices/pic/xml_data/18F25J10.xml
@@ -31,55 +31,55 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -96,23 +96,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2610.xml b/src/devices/pic/xml_data/18F2610.xml
index e38c6d2..3de5893 100644
--- a/src/devices/pic/xml_data/18F2610.xml
+++ b/src/devices/pic/xml_data/18F2610.xml
@@ -27,16 +27,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,131 +105,131 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2620.xml b/src/devices/pic/xml_data/18F2620.xml
index 7c25f21..faacae3 100644
--- a/src/devices/pic/xml_data/18F2620.xml
+++ b/src/devices/pic/xml_data/18F2620.xml
@@ -30,17 +30,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -51,42 +51,42 @@
<value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO6" />
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.6" cname="_BORV_0" sdcc_cname="_BORV_46" />
<value value="0x08" name="4.3" cname="_BORV_1" sdcc_cname="_BORV_43" />
<value value="0x10" name="2.8" cname="_BORV_2" sdcc_cname="_BORV_28" />
<value value="0x18" name="2.1" cname="_BORV_3" sdcc_cname="_BORV_21" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -103,131 +103,131 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" sdcc_cname="_CCP2MUX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
<value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
<value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2680.xml b/src/devices/pic/xml_data/18F2680.xml
index 2dcd013..09c4863 100644
--- a/src/devices/pic/xml_data/18F2680.xml
+++ b/src/devices/pic/xml_data/18F2680.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,141 +106,141 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
<value value="0x20" name="4096" cname="_BBSIZ_4096" />
<value value="0x30" name="4096" cname="_BBSIZ_4096" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2682.xml b/src/devices/pic/xml_data/18F2682.xml
index 8c13b2d..9f5501f 100644
--- a/src/devices/pic/xml_data/18F2682.xml
+++ b/src/devices/pic/xml_data/18F2682.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x013FFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -48,42 +48,42 @@
<value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" />
<value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -100,153 +100,153 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
<value value="0x20" name="4096" cname="_BBSIZ_4096" />
<value value="0x30" name="4096" cname="_BBSIZ_4096" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x1F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
- <mask name="CP_4" value="0x10" >
+ </tqmask>
+ <tqmask name="CP_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
<value value="0x10" name="Off" cname="_CP4_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x1F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
- <mask name="WRT_4" value="0x10" >
+ </tqmask>
+ <tqmask name="WRT_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
<value value="0x10" name="Off" cname="_WRT4_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x1F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
- <mask name="EBTR_4" value="0x10" >
+ </tqmask>
+ <tqmask name="EBTR_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
<value value="0x10" name="Off" cname="_EBTR4_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F2685.xml b/src/devices/pic/xml_data/18F2685.xml
index bca6818..cba2b20 100644
--- a/src/devices/pic/xml_data/18F2685.xml
+++ b/src/devices/pic/xml_data/18F2685.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -48,42 +48,42 @@
<value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" />
<value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -100,165 +100,165 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
<value value="0x20" name="4096" cname="_BBSIZ_4096" />
<value value="0x30" name="4096" cname="_BBSIZ_4096" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
- <mask name="CP_4" value="0x10" >
+ </tqmask>
+ <tqmask name="CP_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
<value value="0x10" name="Off" cname="_CP4_OFF" />
- </mask>
- <mask name="CP_5" value="0x20" >
+ </tqmask>
+ <tqmask name="CP_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
<value value="0x20" name="Off" cname="_CP5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
- <mask name="WRT_4" value="0x10" >
+ </tqmask>
+ <tqmask name="WRT_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
<value value="0x10" name="Off" cname="_WRT4_OFF" />
- </mask>
- <mask name="WRT_5" value="0x20" >
+ </tqmask>
+ <tqmask name="WRT_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
<value value="0x20" name="Off" cname="_WRT5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
- <mask name="EBTR_4" value="0x10" >
+ </tqmask>
+ <tqmask name="EBTR_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
<value value="0x10" name="Off" cname="_EBTR4_OFF" />
- </mask>
- <mask name="EBTR_5" value="0x20" >
+ </tqmask>
+ <tqmask name="EBTR_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
<value value="0x20" name="Off" cname="_EBTR5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4220.xml b/src/devices/pic/xml_data/18F4220.xml
index f1c19c7..12dda87 100644
--- a/src/devices/pic/xml_data/18F4220.xml
+++ b/src/devices/pic/xml_data/18F4220.xml
@@ -35,17 +35,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -57,40 +57,40 @@
<value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" />
<value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" />
<value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FSCM_OFF" />
<value value="0x40" name="On" cname="_FSCM_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -107,107 +107,107 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8K" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_B3" />
<value value="0x01" name="RC1" cname="_CCP2MX_C1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBAD_DIG" />
<value value="0x02" name="analog" cname="_PBAD_ANA" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4221.xml b/src/devices/pic/xml_data/18F4221.xml
index d4a7e11..417ae32 100644
--- a/src/devices/pic/xml_data/18F4221.xml
+++ b/src/devices/pic/xml_data/18F4221.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x000FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="Software" cname="_BOR_SOFT" />
<value value="0x04" name="On_run" cname="_BOR_NOSLP" />
<value value="0x06" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,125 +106,125 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_RC1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_DIG" />
<value value="0x02" name="analog" cname="_PBADEN_ANA" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x38" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x38" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="ICPORT" value="0x08" >
+ </tqmask>
+ <tqmask name="ICPORT" value="0x08" >
<value value="0x00" name="Off" cname="_ICPORT_OFF" />
<value value="0x08" name="On" cname="_ICPORT_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="256" cname="_BBSIZ_BB256" />
<value value="0x10" name="512" cname="_BBSIZ_BB512" />
<value value="0x20" name="512" cname="_BBSIZ_BB512" />
<value value="0x30" name="512" cname="_BBSIZ_BB512" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200/0400:07FF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200/0400:07FF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200/0400:07FF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4320.xml b/src/devices/pic/xml_data/18F4320.xml
index 734bb11..141b008 100644
--- a/src/devices/pic/xml_data/18F4320.xml
+++ b/src/devices/pic/xml_data/18F4320.xml
@@ -37,17 +37,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -59,40 +59,40 @@
<value value="0x08" name="INTRC_IO" cname="_INTIO2_OSC" />
<value value="0x09" name="INTRC_CLKOUT" cname="_INTIO1_OSC" />
<value value="default" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FSCM_OFF" />
<value value="0x40" name="On" cname="_FSCM_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -109,131 +109,131 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8K" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_B3" />
<value value="0x01" name="RC1" cname="_CCP2MX_C1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBAD_DIG" />
<value value="0x02" name="analog" cname="_PBAD_ANA" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="1000:17FF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="1800:1FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="1000:17FF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="1800:1FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:07FF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="0800:0FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="1000:17FF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="1800:1FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4321.xml b/src/devices/pic/xml_data/18F4321.xml
index 6bdd265..a7f5bd9 100644
--- a/src/devices/pic/xml_data/18F4321.xml
+++ b/src/devices/pic/xml_data/18F4321.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="Software" cname="_BOR_SOFT" />
<value value="0x04" name="On_run" cname="_BOR_NOSLP" />
<value value="0x06" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,125 +106,125 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x87" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x87" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CPP2MX_RB3" />
<value value="0x01" name="RC1" cname="_CPP2MX_RC1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_DIG" />
<value value="0x02" name="analog" cname="_PBADEN_ANA" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x38" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x38" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="ICPORT" value="0x08" >
+ </tqmask>
+ <tqmask name="ICPORT" value="0x08" >
<value value="0x00" name="Off" cname="_ICPORT_OFF" />
<value value="0x08" name="On" cname="_ICPORT_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="256" cname="_BBSIZ_BB256" />
<value value="0x10" name="512" cname="_BBSIZ_BB512" />
<value value="0x20" name="1024" cname="_BBSIZ_BB512" />
<value value="0x30" name="1024" cname="_BBSIZ_BB512" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200/0400/0800:0FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200/0400/0800:0FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200/0400/0800:0FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4331.xml b/src/devices/pic/xml_data/18F4331.xml
index a22e667..7709516 100644
--- a/src/devices/pic/xml_data/18F4331.xml
+++ b/src/devices/pic/xml_data/18F4331.xml
@@ -34,17 +34,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -61,40 +61,40 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRTEN_ON" />
<value value="0x01" name="Off" cname="_PWRTEN_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="On" cname="_BOREN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDTEN_OFF" />
<value value="0x01" name="On" cname="_WDTEN_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDPS_1" />
<value value="0x02" name="1:2" cname="_WDPS_2" />
<value value="0x04" name="1:4" cname="_WDPS_4" />
@@ -111,136 +111,136 @@
<value value="0x1A" name="1:8192" cname="_WDPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDPS_32768" />
- </mask>
- <mask name="WINEN" value="0x20" >
+ </tqmask>
+ <tqmask name="WINEN" value="0x20" >
<value value="0x00" name="On" cname="_WINEN_ON" />
<value value="0x20" name="Off" cname="_WINEN_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" >
- <mask name="PWMPIN" value="0x04" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" >
+ <tqmask name="PWMPIN" value="0x04" >
<value value="0x00" name="On" cname="_PWMPIN_ON" />
<value value="0x04" name="Off" cname="_PWMPIN_OFF" />
- </mask>
- <mask name="LPOL" value="0x08" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x08" >
<value value="0x00" name="low" cname="_LPOL_LOW" />
<value value="0x08" name="high" cname="_LPOL_HIGH" />
- </mask>
- <mask name="HPOL" value="0x10" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x10" >
<value value="0x00" name="low" cname="_HPOL_LOW" />
<value value="0x10" name="high" cname="_HPOL_HIGH" />
- </mask>
- <mask name="T1OSCMX" value="0x20" >
+ </tqmask>
+ <tqmask name="T1OSCMX" value="0x20" >
<value value="0x00" name="Legacy" cname="_T1OSCMX_OFF" />
<value value="0x20" name="Low Power" cname="_T1OSCMX_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" >
- <mask name="FLTAMX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" >
+ <tqmask name="FLTAMX" value="0x01" >
<value value="0x00" name="RD4" cname="_FLTAMX_RD4" />
<value value="0x01" name="RC1" cname="_FLTAMX_RC1" />
- </mask>
- <mask name="SSPMX" value="0x04" >
+ </tqmask>
+ <tqmask name="SSPMX" value="0x04" >
<value value="0x00" name="RD3, RD2, RD1" cname="_SSPMX_RD1" />
<value value="0x04" name="RC5, RC4, RC7" cname="_SSPMX_RC7" />
- </mask>
- <mask name="PWM4MX" value="0x08" >
+ </tqmask>
+ <tqmask name="PWM4MX" value="0x08" >
<value value="0x00" name="RD5" cname="_PWM4MX_RD5" />
<value value="0x08" name="RB5" cname="_PWM4MX_RB5" />
- </mask>
- <mask name="EXCLKMX" value="0x10" >
+ </tqmask>
+ <tqmask name="EXCLKMX" value="0x10" >
<value value="0x00" name="RD0" cname="_EXCLKMX_RD0" />
<value value="0x10" name="RC3" cname="_EXCLKMX_RC3" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4410.xml b/src/devices/pic/xml_data/18F4410.xml
index 8ca9b17..42557f8 100644
--- a/src/devices/pic/xml_data/18F4410.xml
+++ b/src/devices/pic/xml_data/18F4410.xml
@@ -27,16 +27,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,107 +105,107 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F442.xml b/src/devices/pic/xml_data/18F442.xml
index 61f6a63..1a864f5 100644
--- a/src/devices/pic/xml_data/18F442.xml
+++ b/src/devices/pic/xml_data/18F442.xml
@@ -34,17 +34,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -53,36 +53,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -91,99 +91,99 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1"/>
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4420.xml b/src/devices/pic/xml_data/18F4420.xml
index 83a0022..19e9c62 100644
--- a/src/devices/pic/xml_data/18F4420.xml
+++ b/src/devices/pic/xml_data/18F4420.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,115 +106,115 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4423.xml b/src/devices/pic/xml_data/18F4423.xml
index 1760494..540c8e4 100644
--- a/src/devices/pic/xml_data/18F4423.xml
+++ b/src/devices/pic/xml_data/18F4423.xml
@@ -24,17 +24,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -45,42 +45,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -97,115 +97,115 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x80" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x80" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x80" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x80" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4431.xml b/src/devices/pic/xml_data/18F4431.xml
index c19b48a..dc8edc0 100644
--- a/src/devices/pic/xml_data/18F4431.xml
+++ b/src/devices/pic/xml_data/18F4431.xml
@@ -35,17 +35,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0xCF" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -62,40 +62,40 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRTEN_ON" />
<value value="0x01" name="Off" cname="_PWRTEN_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="On" cname="_BOREN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x3F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDTEN_OFF" />
<value value="0x01" name="On" cname="_WDTEN_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDPS_1" />
<value value="0x02" name="1:2" cname="_WDPS_2" />
<value value="0x04" name="1:4" cname="_WDPS_4" />
@@ -112,160 +112,160 @@
<value value="0x1A" name="1:8192" cname="_WDPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDPS_32768" />
- </mask>
- <mask name="WINEN" value="0x20" >
+ </tqmask>
+ <tqmask name="WINEN" value="0x20" >
<value value="0x00" name="On" cname="_WINEN_ON" />
<value value="0x20" name="Off" cname="_WINEN_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x3C" >
- <mask name="PWMPIN" value="0x04" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x3C" >
+ <tqmask name="PWMPIN" value="0x04" >
<value value="0x00" name="On" cname="_PWMPIN_ON" />
<value value="0x04" name="Off" cname="_PWMPIN_OFF" />
- </mask>
- <mask name="LPOL" value="0x08" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x08" >
<value value="0x00" name="low" cname="_LPOL_LOW" />
<value value="0x08" name="high" cname="_LPOL_HIGH" />
- </mask>
- <mask name="HPOL" value="0x10" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x10" >
<value value="0x00" name="low" cname="_HPOL_LOW" />
<value value="0x10" name="high" cname="_HPOL_HIGH" />
- </mask>
- <mask name="T1OSCMX" value="0x20" >
+ </tqmask>
+ <tqmask name="T1OSCMX" value="0x20" >
<value value="0x00" name="Legacy" cname="_T1OSCMX_OFF" />
<value value="0x20" name="Low Power" cname="_T1OSCMX_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x9D" >
- <mask name="FLTAMX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x9D" >
+ <tqmask name="FLTAMX" value="0x01" >
<value value="0x00" name="RD4" cname="_FLTAMX_RD4" />
<value value="0x01" name="RC1" cname="_FLTAMX_RC1" />
- </mask>
- <mask name="SSPMX" value="0x04" >
+ </tqmask>
+ <tqmask name="SSPMX" value="0x04" >
<value value="0x00" name="RD3, RD2, RD1" cname="_SSPMX_RD1" />
<value value="0x04" name="RC5, RC4, RC7" cname="_SSPMX_RC7" />
- </mask>
- <mask name="PWM4MX" value="0x08" >
+ </tqmask>
+ <tqmask name="PWM4MX" value="0x08" >
<value value="0x00" name="RD5" cname="_PWM4MX_RD5" />
<value value="0x08" name="RB5" cname="_PWM4MX_RB5" />
- </mask>
- <mask name="EXCLKMX" value="0x10" >
+ </tqmask>
+ <tqmask name="EXCLKMX" value="0x10" >
<value value="0x00" name="RD0" cname="_EXCLKMX_RD0" />
<value value="0x10" name="RC3" cname="_EXCLKMX_RC3" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="2000:2FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="3000:3FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="2000:2FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="3000:3FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:0FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="1000:1FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="2000:2FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="3000:3FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4439.xml b/src/devices/pic/xml_data/18F4439.xml
index 3441809..9104408 100644
--- a/src/devices/pic/xml_data/18F4439.xml
+++ b/src/devices/pic/xml_data/18F4439.xml
@@ -35,48 +35,48 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="default" name="invalid" />
<value value="0x02" name="HS" cname="_OSC_HS" />
<value value="0x04" name="EC_CLKOUT" cname="_OSC_EC" />
<value value="0x05" name="EC_IO" cname="_OSC_ECIO" />
<value value="0x06" name="H4" cname="_OSC_HSPLL" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -85,94 +85,94 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4450.xml b/src/devices/pic/xml_data/18F4450.xml
index e634df1..208518e 100644
--- a/src/devices/pic/xml_data/18F4450.xml
+++ b/src/devices/pic/xml_data/18F4450.xml
@@ -27,14 +27,14 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x07" cmask="0x00" >
- <mask name="PLLDIV" value="0x07" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" >
+ <tqmask name="PLLDIV" value="0x07" >
<value value="0x00" name="1" cname="_PLLDIV_1" />
<value value="0x01" name="2" cname="_PLLDIV_2" />
<value value="0x02" name="3" cname="_PLLDIV_3" />
@@ -43,21 +43,21 @@
<value value="0x05" name="6" cname="_PLLDIV_6" />
<value value="0x06" name="10" cname="_PLLDIV_10" />
<value value="0x07" name="12" cname="_PLLDIV_12" />
- </mask>
- <mask name="CPUDIV" value="0x18" >
+ </tqmask>
+ <tqmask name="CPUDIV" value="0x18" >
<value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" />
<value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" />
<value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" />
<value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" />
- </mask>
- <mask name="USBDIV" value="0x20" >
+ </tqmask>
+ <tqmask name="USBDIV" value="0x20" >
<value value="0x00" name="1" cname="_USBDIV_1" />
<value value="0x20" name="2" cname="_USBDIV_2" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" cmask="0x00" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" ctqmask="0x00" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="XT" cname="_FOSC_XT_XT" />
<value value="0x01" name="XT" cname="_FOSC_XT_XT" />
<value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" />
@@ -74,46 +74,46 @@
<value value="0x0D" name="HS" cname="_FOSC_HS" />
<value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" />
<value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="Software" cname="_BOR_SOFT" />
<value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" />
<value value="0x06" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.6" cname="_BORV_46" />
<value value="0x08" name="4.3" cname="_BORV_43" />
<value value="0x10" name="2.8" cname="_BORV_28" />
<value value="0x18" name="2.1" cname="_BORV_21" />
- </mask>
- <mask name="VREGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="VREGEN" value="0x20" >
<value value="0x00" name="Off" cname="_VREGEN_OFF" />
<value value="0x20" name="On" cname="_VREGEN_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -130,111 +130,111 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" cmask="0x00" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" ctqmask="0x00" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x28" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x28" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x08" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x08" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x08" name="2048" cname="_BBSIZ_2048" />
- </mask>
- <mask name="ICPORT" value="0x20" >
+ </tqmask>
+ <tqmask name="ICPORT" value="0x20" >
<value value="0x00" name="On" cname="_ICPORT_ON" />
<value value="0x20" name="Off" cname="_ICPORT_OFF" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4455.xml b/src/devices/pic/xml_data/18F4455.xml
index 282decb..6a77cfb 100644
--- a/src/devices/pic/xml_data/18F4455.xml
+++ b/src/devices/pic/xml_data/18F4455.xml
@@ -26,15 +26,15 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x005FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" >
- <mask name="PLLDIV" value="0x07" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" >
+ <tqmask name="PLLDIV" value="0x07" >
<value value="0x00" name="1" cname="_PLLDIV_1" sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" />
<value value="0x01" name="2" cname="_PLLDIV_2" sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" />
<value value="0x02" name="3" cname="_PLLDIV_3" sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" />
@@ -43,21 +43,21 @@
<value value="0x05" name="6" cname="_PLLDIV_6" sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" />
<value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" />
<value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" />
- </mask>
- <mask name="CPUDIV" value="0x18" >
+ </tqmask>
+ <tqmask name="CPUDIV" value="0x18" >
<value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" />
<value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" />
<value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" />
<value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" />
- </mask>
- <mask name="USBDIV" value="0x20" >
+ </tqmask>
+ <tqmask name="USBDIV" value="0x20" >
<value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" />
<value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" />
<value value="0x01" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" />
<value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" sdcc_cname="_OSC_XT__XT_PLL__USB_XT" />
@@ -74,46 +74,46 @@
<value value="0x0D" name="HS" cname="_FOSC_HS" sdcc_cname="_OSC_HS__USB_HS" />
<value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
<value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEM_ON" sdcc_cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="Software" cname="_BOR_SOFT" sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" />
<value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" />
<value value="0x06" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" />
<value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" />
<value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" />
<value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" />
- </mask>
- <mask name="VREGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="VREGEN" value="0x20" >
<value value="0x00" name="Off" cname="_VREGEN_OFF" />
<value value="0x20" name="On" cname="_VREGEN_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
<value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -130,131 +130,131 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
<value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
<value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x20" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x20" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="ICPORT" value="0x20" >
+ </tqmask>
+ <tqmask name="ICPORT" value="0x20" >
<value value="0x00" name="Off" cname="_ICPRT_OFF" sdcc_cname="_ENICPORT_OFF" />
<value value="0x20" name="On" cname="_ICPRT_ON" sdcc_cname="_ENICPORT_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" sdcc_cname="_ENHCPU_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0xC0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0xC0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F448.xml b/src/devices/pic/xml_data/18F448.xml
index 40de124..137b34a 100644
--- a/src/devices/pic/xml_data/18F448.xml
+++ b/src/devices/pic/xml_data/18F448.xml
@@ -34,17 +34,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -53,36 +53,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.0" cname="_BORV_25" sdcc_cname="_BODENV_2_0V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -91,94 +91,94 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4480.xml b/src/devices/pic/xml_data/18F4480.xml
index b9a87da..14b60cb 100644
--- a/src/devices/pic/xml_data/18F4480.xml
+++ b/src/devices/pic/xml_data/18F4480.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,115 +106,115 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x10" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x10" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x03" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x03" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x03" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F44J10.xml b/src/devices/pic/xml_data/18F44J10.xml
index ddf2019..c9ce5b8 100644
--- a/src/devices/pic/xml_data/18F44J10.xml
+++ b/src/devices/pic/xml_data/18F44J10.xml
@@ -31,55 +31,55 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -96,23 +96,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4510.xml b/src/devices/pic/xml_data/18F4510.xml
index b038b39..bcfec9c 100644
--- a/src/devices/pic/xml_data/18F4510.xml
+++ b/src/devices/pic/xml_data/18F4510.xml
@@ -27,16 +27,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,131 +105,131 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4515.xml b/src/devices/pic/xml_data/18F4515.xml
index 4325432..671198c 100644
--- a/src/devices/pic/xml_data/18F4515.xml
+++ b/src/devices/pic/xml_data/18F4515.xml
@@ -27,16 +27,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,119 +105,119 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F452.xml b/src/devices/pic/xml_data/18F452.xml
index 12ad5ce..24d1e3d 100644
--- a/src/devices/pic/xml_data/18F452.xml
+++ b/src/devices/pic/xml_data/18F452.xml
@@ -35,17 +35,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -54,36 +54,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -92,123 +92,123 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4520.xml b/src/devices/pic/xml_data/18F4520.xml
index a1a1e75..4699c01 100644
--- a/src/devices/pic/xml_data/18F4520.xml
+++ b/src/devices/pic/xml_data/18F4520.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,139 +106,139 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4523.xml b/src/devices/pic/xml_data/18F4523.xml
index 29b2583..26db550 100644
--- a/src/devices/pic/xml_data/18F4523.xml
+++ b/src/devices/pic/xml_data/18F4523.xml
@@ -24,17 +24,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -51,42 +51,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -103,139 +103,139 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTB" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4525.xml b/src/devices/pic/xml_data/18F4525.xml
index f37d90b..0928756 100644
--- a/src/devices/pic/xml_data/18F4525.xml
+++ b/src/devices/pic/xml_data/18F4525.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,127 +106,127 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4539.xml b/src/devices/pic/xml_data/18F4539.xml
index 71a1f4c..2733301 100644
--- a/src/devices/pic/xml_data/18F4539.xml
+++ b/src/devices/pic/xml_data/18F4539.xml
@@ -35,48 +35,48 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x005FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="default" name="invalid" />
<value value="0x02" name="HS" cname="_OSC_HS" />
<value value="0x04" name="EC_CLKOUT" cname="_OSC_EC" />
<value value="0x05" name="EC_IO" cname="_OSC_ECIO" />
<value value="0x06" name="H4" cname="_OSC_HSPLL" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -85,106 +85,106 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4550.xml b/src/devices/pic/xml_data/18F4550.xml
index b0e26c8..d988438 100644
--- a/src/devices/pic/xml_data/18F4550.xml
+++ b/src/devices/pic/xml_data/18F4550.xml
@@ -26,15 +26,15 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" >
- <mask name="PLLDIV" value="0x07" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" >
+ <tqmask name="PLLDIV" value="0x07" >
<value value="0x00" name="1" cname="_PLLDIV_1" sdcc_cname="_PLLDIV_NO_DIVIDE__4MHZ_INPUT_" />
<value value="0x01" name="2" cname="_PLLDIV_2" sdcc_cname="_PLLDIV_DIVIDE_BY_2__8MHZ_INPUT_" />
<value value="0x02" name="3" cname="_PLLDIV_3" sdcc_cname="_PLLDIV_DIVIDE_BY_3__12MHZ_INPUT_" />
@@ -43,21 +43,21 @@
<value value="0x05" name="6" cname="_PLLDIV_6" sdcc_cname="_PLLDIV_DIVIDE_BY_6__24MHZ_INPUT_" />
<value value="0x06" name="10" cname="_PLLDIV_10" sdcc_cname="_PLLDIV_DIVIDE_BY_10__40MHZ_INPUT_" />
<value value="0x07" name="12" cname="_PLLDIV_12" sdcc_cname="_PLLDIV_DIVIDE_BY_12__48MHZ_INPUT_" />
- </mask>
- <mask name="CPUDIV" value="0x18" >
+ </tqmask>
+ <tqmask name="CPUDIV" value="0x18" >
<value value="0x00" name="1" cname="_CPUDIV_OSC1_PLL2" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___1__96MHZ_PLL_SRC___2_" />
<value value="0x08" name="2" cname="_CPUDIV_OSC2_PLL3" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___2__96MHZ_PLL_SRC___3_" />
<value value="0x10" name="3" cname="_CPUDIV_OSC3_PLL4" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___3__96MHZ_PLL_SRC___4_" />
<value value="0x18" name="4" cname="_CPUDIV_OSC4_PLL6" sdcc_cname="_CPUDIV__OSC1_OSC2_SRC___4__96MHZ_PLL_SRC___6_" />
- </mask>
- <mask name="USBDIV" value="0x20" >
+ </tqmask>
+ <tqmask name="USBDIV" value="0x20" >
<value value="0x00" name="1" cname="_USBDIV_1" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_OSC1_OSC2" />
<value value="0x20" name="2" cname="_USBDIV_2" sdcc_cname="_USBPLL_CLOCK_SRC_FROM_96MHZ_PLL_2" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x05" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x05" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" />
<value value="0x01" name="XT" cname="_FOSC_XT_XT" sdcc_cname="_OSC_XT__USB_XT" />
<value value="0x02" name="XTPLL" cname="_FOSC_XTPLL" sdcc_cname="_OSC_XT__XT_PLL__USB_XT" />
@@ -74,46 +74,46 @@
<value value="0x0D" name="HS" cname="_FOSC_HS" sdcc_cname="_OSC_HS__USB_HS" />
<value value="0x0E" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
<value value="0x0F" name="HSPLL" cname="_FOSC_HSPLL_HS" sdcc_cname="_OSC_HS__HS_PLL__USB_HS" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEM_OFF" sdcc_cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEM_ON" sdcc_cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="Software" cname="_BOR_SOFT" sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" />
<value value="0x04" name="On_run" cname="_BOR_ON_ACTIVE" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" />
<value value="0x06" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" />
<value value="0x08" name="4.2" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" />
<value value="0x10" name="2.7" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" />
<value value="0x18" name="2.0" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" />
- </mask>
- <mask name="VREGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="VREGEN" value="0x20" >
<value value="0x00" name="Off" cname="_VREGEN_OFF" />
<value value="0x20" name="On" cname="_VREGEN_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
<value value="0x01" name="On" cname="_WDT_ON" sdcc_cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -130,135 +130,135 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
<value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
<value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x20" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x20" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="ICPORT" value="0x20" >
+ </tqmask>
+ <tqmask name="ICPORT" value="0x20" >
<value value="0x00" name="Off" cname="_ICPRT_OFF" sdcc_cname="_ENICPORT_OFF" />
<value value="0x20" name="On" cname="_ICPRT_ON" sdcc_cname="_ENICPORT_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" sdcc_cname="_ENHCPU_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" sdcc_cname="_ENHCPU_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" cmask="0x40" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" ctqmask="0x40" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F458.xml b/src/devices/pic/xml_data/18F458.xml
index 33069dd..758acc8 100644
--- a/src/devices/pic/xml_data/18F458.xml
+++ b/src/devices/pic/xml_data/18F458.xml
@@ -35,17 +35,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -54,36 +54,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.0" cname="_BORV_20" sdcc_cname="_BODENV_2_0V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -92,118 +92,118 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:1FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4580.xml b/src/devices/pic/xml_data/18F4580.xml
index e6e105a..cd1e077 100644
--- a/src/devices/pic/xml_data/18F4580.xml
+++ b/src/devices/pic/xml_data/18F4580.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="16" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0000FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,139 +106,139 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x10" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x10" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x10" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x10" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4585.xml b/src/devices/pic/xml_data/18F4585.xml
index fb438b8..dca0022 100644
--- a/src/devices/pic/xml_data/18F4585.xml
+++ b/src/devices/pic/xml_data/18F4585.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,129 +106,129 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
<value value="0x20" name="4096" cname="_BBSIZ_4096" />
<value value="0x30" name="4096" cname="_BBSIZ_4096" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F45J10.xml b/src/devices/pic/xml_data/18F45J10.xml
index af2c752..aede454 100644
--- a/src/devices/pic/xml_data/18F45J10.xml
+++ b/src/devices/pic/xml_data/18F45J10.xml
@@ -31,55 +31,55 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0x7F" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0x7F" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -96,23 +96,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0xFF" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0xFF" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0xF8" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0xF8" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4610.xml b/src/devices/pic/xml_data/18F4610.xml
index d105cdb..9c3fe13 100644
--- a/src/devices/pic/xml_data/18F4610.xml
+++ b/src/devices/pic/xml_data/18F4610.xml
@@ -27,16 +27,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,131 +105,131 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4620.xml b/src/devices/pic/xml_data/18F4620.xml
index 5964590..ff74392 100644
--- a/src/devices/pic/xml_data/18F4620.xml
+++ b/src/devices/pic/xml_data/18F4620.xml
@@ -30,17 +30,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -51,42 +51,42 @@
<value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO6" />
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" sdcc_cname="_BODEN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" sdcc_cname="_BODEN_ON_WHILE_ACTIVE" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" sdcc_cname="_BODEN_CONTROLLED_WITH_SBOREN_BIT" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.6" cname="_BORV_0" sdcc_cname="_BODENV_4_5V" />
<value value="0x08" name="4.3" cname="_BORV_1" sdcc_cname="_BODENV_4_2V" />
<value value="0x10" name="2.8" cname="_BORV_2" sdcc_cname="_BODENV_2_7V" />
<value value="0x18" name="2.1" cname="_BORV_3" sdcc_cname="_BODENV_2_0V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" sdcc_cname="_WDT_DISABLED_CONTROLLED" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -103,131 +103,131 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" sdcc_cname="_WDTPS_1_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" sdcc_cname="_WDTPS_1_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" sdcc_cname="_WDTPS_1_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" sdcc_cname="_CCP2MUX_RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
- <mask name="PBADEN" value="0x02" >
+ </tqmask>
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_DIGITAL_I_O_ON_RESET" />
<value value="0x02" name="analog" cname="_PBADEN_ON" sdcc_cname="_PBADEN_PORTB_4_0__CONFIGURED_AS_ANALOG_INPUTS_ON_RESET" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" sdcc_cname="_MCLRE_MCLR_OFF_RE3_ON" />
<value value="0x80" name="External" cname="_MCLRE_ON" sdcc_cname="_MCLRE_MCLR_ON_RE3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" sdcc_cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" sdcc_cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x60" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x60" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4680.xml b/src/devices/pic/xml_data/18F4680.xml
index f5ef137..155abb9 100644
--- a/src/devices/pic/xml_data/18F4680.xml
+++ b/src/devices/pic/xml_data/18F4680.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_OSC_RC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,141 +106,141 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
<value value="0x20" name="4096" cname="_BBSIZ_4096" />
<value value="0x30" name="4096" cname="_BBSIZ_4096" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4682.xml b/src/devices/pic/xml_data/18F4682.xml
index 19b387b..c6ce618 100644
--- a/src/devices/pic/xml_data/18F4682.xml
+++ b/src/devices/pic/xml_data/18F4682.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x013FFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -48,42 +48,42 @@
<value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" />
<value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -100,153 +100,153 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
<value value="0x20" name="4096" cname="_BBSIZ_4096" />
<value value="0x30" name="4096" cname="_BBSIZ_4096" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x1F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
- <mask name="CP_4" value="0x10" >
+ </tqmask>
+ <tqmask name="CP_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
<value value="0x10" name="Off" cname="_CP4_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x1F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
- <mask name="WRT_4" value="0x10" >
+ </tqmask>
+ <tqmask name="WRT_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
<value value="0x10" name="Off" cname="_WRT4_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x1F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
- <mask name="EBTR_4" value="0x10" >
+ </tqmask>
+ <tqmask name="EBTR_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
<value value="0x10" name="Off" cname="_EBTR4_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F4685.xml b/src/devices/pic/xml_data/18F4685.xml
index 7b68ee2..1e73ffd 100644
--- a/src/devices/pic/xml_data/18F4685.xml
+++ b/src/devices/pic/xml_data/18F4685.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -48,42 +48,42 @@
<value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" />
<value value="0x08" name="INTRC_IO" cname="_OSC_IRCIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_IRCIO7" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_SBORENCTRL" />
<value value="0x04" name="On_run" cname="_BOREN_BOACTIVE" />
<value value="0x06" name="On" cname="_BOREN_BOHW" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -100,165 +100,165 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x82" >
- <mask name="PBADEN" value="0x02" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x82" >
+ <tqmask name="PBADEN" value="0x02" >
<value value="0x00" name="digital" cname="_PBADEN_OFF" />
<value value="0x02" name="analog" cname="_PBADEN_ON" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" cmask="0x30" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" ctqmask="0x30" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
<value value="0x20" name="4096" cname="_BBSIZ_4096" />
<value value="0x30" name="4096" cname="_BBSIZ_4096" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
- <mask name="CP_4" value="0x10" >
+ </tqmask>
+ <tqmask name="CP_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
<value value="0x10" name="Off" cname="_CP4_OFF" />
- </mask>
- <mask name="CP_5" value="0x20" >
+ </tqmask>
+ <tqmask name="CP_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
<value value="0x20" name="Off" cname="_CP5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
- <mask name="WRT_4" value="0x10" >
+ </tqmask>
+ <tqmask name="WRT_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
<value value="0x10" name="Off" cname="_WRT4_OFF" />
- </mask>
- <mask name="WRT_5" value="0x20" >
+ </tqmask>
+ <tqmask name="WRT_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
<value value="0x20" name="Off" cname="_WRT5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
- <mask name="EBTR_4" value="0x10" >
+ </tqmask>
+ <tqmask name="EBTR_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
<value value="0x10" name="Off" cname="_EBTR4_OFF" />
- </mask>
- <mask name="EBTR_5" value="0x20" >
+ </tqmask>
+ <tqmask name="EBTR_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
<value value="0x20" name="Off" cname="_EBTR5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6310.xml b/src/devices/pic/xml_data/18F6310.xml
index 9bdbfb7..f975990 100644
--- a/src/devices/pic/xml_data/18F6310.xml
+++ b/src/devices/pic/xml_data/18F6310.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,79 +105,79 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
<value value="0x02" name="Microprocessor" cname="_PM_MP" />
<value value="0x03" name="Microcontroller" cname="_PM_MC" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_BW_8" />
<value value="0x40" name="16" cname="_BW_16" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F6390.xml b/src/devices/pic/xml_data/18F6390.xml
index 02f2498..ec6b10c 100644
--- a/src/devices/pic/xml_data/18F6390.xml
+++ b/src/devices/pic/xml_data/18F6390.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,79 +105,79 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
<value value="0x02" name="Microprocessor" cname="_PM_MP" />
<value value="0x03" name="Microcontroller" cname="_PM_MC" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_BW_8" />
<value value="0x40" name="16" cname="_BW_16" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F6393.xml b/src/devices/pic/xml_data/18F6393.xml
index bc778f4..bb48cbe 100644
--- a/src/devices/pic/xml_data/18F6393.xml
+++ b/src/devices/pic/xml_data/18F6393.xml
@@ -36,16 +36,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -56,42 +56,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -108,79 +108,79 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
<value value="0x02" name="Microprocessor" cname="_PM_MP" />
<value value="0x03" name="Microcontroller" cname="_PM_MC" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_BW_8" />
<value value="0x40" name="16" cname="_BW_16" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F63J11.xml b/src/devices/pic/xml_data/18F63J11.xml
index 37273bc..481e5e8 100644
--- a/src/devices/pic/xml_data/18F63J11.xml
+++ b/src/devices/pic/xml_data/18F63J11.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F63J90.xml b/src/devices/pic/xml_data/18F63J90.xml
index ef1310c..48f5c8e 100644
--- a/src/devices/pic/xml_data/18F63J90.xml
+++ b/src/devices/pic/xml_data/18F63J90.xml
@@ -28,55 +28,55 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -93,23 +93,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6410.xml b/src/devices/pic/xml_data/18F6410.xml
index c270208..670937b 100644
--- a/src/devices/pic/xml_data/18F6410.xml
+++ b/src/devices/pic/xml_data/18F6410.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,79 +105,79 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
<value value="0x02" name="Microprocessor" cname="_PM_MP" />
<value value="0x03" name="Microcontroller" cname="_PM_MC" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_BW_8" />
<value value="0x40" name="16" cname="_BW_16" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F6490.xml b/src/devices/pic/xml_data/18F6490.xml
index 1727686..bd4ae20 100644
--- a/src/devices/pic/xml_data/18F6490.xml
+++ b/src/devices/pic/xml_data/18F6490.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,79 +105,79 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
<value value="0x02" name="Microprocessor" cname="_PM_MP" />
<value value="0x03" name="Microcontroller" cname="_PM_MC" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_BW_8" />
<value value="0x40" name="16" cname="_BW_16" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F6493.xml b/src/devices/pic/xml_data/18F6493.xml
index 89f409d..f980eca 100644
--- a/src/devices/pic/xml_data/18F6493.xml
+++ b/src/devices/pic/xml_data/18F6493.xml
@@ -36,16 +36,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -56,42 +56,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -108,79 +108,79 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
<value value="0x02" name="Microprocessor" cname="_PM_MP" />
<value value="0x03" name="Microcontroller" cname="_PM_MC" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_BW_8" />
<value value="0x40" name="16" cname="_BW_16" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="64" >
diff --git a/src/devices/pic/xml_data/18F64J11.xml b/src/devices/pic/xml_data/18F64J11.xml
index fd126a0..d3e9696 100644
--- a/src/devices/pic/xml_data/18F64J11.xml
+++ b/src/devices/pic/xml_data/18F64J11.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F64J90.xml b/src/devices/pic/xml_data/18F64J90.xml
index fedf592..70df11f 100644
--- a/src/devices/pic/xml_data/18F64J90.xml
+++ b/src/devices/pic/xml_data/18F64J90.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6520.xml b/src/devices/pic/xml_data/18F6520.xml
index a022295..20eac42 100644
--- a/src/devices/pic/xml_data/18F6520.xml
+++ b/src/devices/pic/xml_data/18F6520.xml
@@ -36,17 +36,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -55,36 +55,36 @@
<value value="0x05" name="EC_IO" cname="_OSC_ECIO" />
<value value="0x06" name="H4" cname="_OSC_HSPLL" />
<value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -93,123 +93,123 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MUX_RE7" />
<value value="0x01" name="RC1" cname="_CCP2MUX_RC1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6525.xml b/src/devices/pic/xml_data/18F6525.xml
index 953e12a..c3206cb 100644
--- a/src/devices/pic/xml_data/18F6525.xml
+++ b/src/devices/pic/xml_data/18F6525.xml
@@ -35,17 +35,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -59,36 +59,36 @@
<value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" />
<value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" />
<value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,115 +105,115 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6527.xml b/src/devices/pic/xml_data/18F6527.xml
index 04a2bf1..8779fa8 100644
--- a/src/devices/pic/xml_data/18F6527.xml
+++ b/src/devices/pic/xml_data/18F6527.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FSCM_OFF" />
<value value="0x40" name="On" cname="_FSCM_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,129 +106,129 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8K" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_PORTE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_1024" />
<value value="0x10" name="2048" cname="_BBSIZ_2048" />
<value value="0x20" name="4096" cname="_BBSIZ_4096" />
<value value="0x30" name="4096" cname="_BBSIZ_4096" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6585.xml b/src/devices/pic/xml_data/18F6585.xml
index 0bf9bab..d602f95 100644
--- a/src/devices/pic/xml_data/18F6585.xml
+++ b/src/devices/pic/xml_data/18F6585.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -51,36 +51,36 @@
<value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" />
<value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" />
<value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -97,115 +97,115 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" cmask="0x02" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" ctqmask="0x02" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F65J10.xml b/src/devices/pic/xml_data/18F65J10.xml
index a67fe87..473c590 100644
--- a/src/devices/pic/xml_data/18F65J10.xml
+++ b/src/devices/pic/xml_data/18F65J10.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F65J11.xml b/src/devices/pic/xml_data/18F65J11.xml
index 2ef5b3d..c4284fc 100644
--- a/src/devices/pic/xml_data/18F65J11.xml
+++ b/src/devices/pic/xml_data/18F65J11.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F65J15.xml b/src/devices/pic/xml_data/18F65J15.xml
index f5f310a..6c212d2 100644
--- a/src/devices/pic/xml_data/18F65J15.xml
+++ b/src/devices/pic/xml_data/18F65J15.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F65J50.xml b/src/devices/pic/xml_data/18F65J50.xml
index d0cdd2b..ad5bc75 100644
--- a/src/devices/pic/xml_data/18F65J50.xml
+++ b/src/devices/pic/xml_data/18F65J50.xml
@@ -29,12 +29,12 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="PLLDIV" value="0x0E" >
+ </tqmask>
+ <tqmask name="PLLDIV" value="0x0E" >
<value value="0x00" name="12" cname="" />
<value value="0x02" name="10" cname="" />
<value value="0x04" name="6" cname="" />
@@ -43,51 +43,51 @@
<value value="0x0A" name="3" cname="" />
<value value="0x0C" name="2" cname="" />
<value value="0x0E" name="1" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -104,27 +104,27 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F65J90.xml b/src/devices/pic/xml_data/18F65J90.xml
index 91997da..34e7be9 100644
--- a/src/devices/pic/xml_data/18F65J90.xml
+++ b/src/devices/pic/xml_data/18F65J90.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6620.xml b/src/devices/pic/xml_data/18F6620.xml
index e88ee06..8159b62 100644
--- a/src/devices/pic/xml_data/18F6620.xml
+++ b/src/devices/pic/xml_data/18F6620.xml
@@ -38,17 +38,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -57,36 +57,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.5" cname="_BORV_20" sdcc_cname="_BODENV_2_5V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -95,123 +95,123 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RE7" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6621.xml b/src/devices/pic/xml_data/18F6621.xml
index 664de3f..e043ddf 100644
--- a/src/devices/pic/xml_data/18F6621.xml
+++ b/src/devices/pic/xml_data/18F6621.xml
@@ -35,17 +35,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -59,36 +59,36 @@
<value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" />
<value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" />
<value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,127 +105,127 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6622.xml b/src/devices/pic/xml_data/18F6622.xml
index 6fb81d7..b8e0bb7 100644
--- a/src/devices/pic/xml_data/18F6622.xml
+++ b/src/devices/pic/xml_data/18F6622.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -54,42 +54,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FSCM_OFF" />
<value value="0x40" name="On" cname="_FSCM_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -106,141 +106,141 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8K" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_PORTE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
<value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
<value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
<value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6627.xml b/src/devices/pic/xml_data/18F6627.xml
index 74248c6..1b0bbc8 100644
--- a/src/devices/pic/xml_data/18F6627.xml
+++ b/src/devices/pic/xml_data/18F6627.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -48,42 +48,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -100,165 +100,165 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_PORTE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
<value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
<value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
<value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
- <mask name="CP_4" value="0x10" >
+ </tqmask>
+ <tqmask name="CP_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
<value value="0x10" name="Off" cname="_CP4_OFF" />
- </mask>
- <mask name="CP_5" value="0x20" >
+ </tqmask>
+ <tqmask name="CP_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
<value value="0x20" name="Off" cname="_CP5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
- <mask name="WRT_4" value="0x10" >
+ </tqmask>
+ <tqmask name="WRT_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
<value value="0x10" name="Off" cname="_WRT4_OFF" />
- </mask>
- <mask name="WRT_5" value="0x20" >
+ </tqmask>
+ <tqmask name="WRT_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
<value value="0x20" name="Off" cname="_WRT5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
- <mask name="EBTR_4" value="0x10" >
+ </tqmask>
+ <tqmask name="EBTR_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
<value value="0x10" name="Off" cname="_EBTR4_OFF" />
- </mask>
- <mask name="EBTR_5" value="0x20" >
+ </tqmask>
+ <tqmask name="EBTR_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
<value value="0x20" name="Off" cname="_EBTR5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6680.xml b/src/devices/pic/xml_data/18F6680.xml
index d0a9922..6780e23 100644
--- a/src/devices/pic/xml_data/18F6680.xml
+++ b/src/devices/pic/xml_data/18F6680.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32"/>
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -51,36 +51,36 @@
<value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" />
<value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" />
<value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -97,127 +97,127 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J10.xml b/src/devices/pic/xml_data/18F66J10.xml
index 7bb9aa7..6df51e5 100644
--- a/src/devices/pic/xml_data/18F66J10.xml
+++ b/src/devices/pic/xml_data/18F66J10.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J11.xml b/src/devices/pic/xml_data/18F66J11.xml
index 8fd1314..11d7f05 100644
--- a/src/devices/pic/xml_data/18F66J11.xml
+++ b/src/devices/pic/xml_data/18F66J11.xml
@@ -30,55 +30,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -95,27 +95,27 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J15.xml b/src/devices/pic/xml_data/18F66J15.xml
index c1c5c95..651b2d4 100644
--- a/src/devices/pic/xml_data/18F66J15.xml
+++ b/src/devices/pic/xml_data/18F66J15.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J16.xml b/src/devices/pic/xml_data/18F66J16.xml
index cf84f44..8a15ffd 100644
--- a/src/devices/pic/xml_data/18F66J16.xml
+++ b/src/devices/pic/xml_data/18F66J16.xml
@@ -29,55 +29,55 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,27 +94,27 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J50.xml b/src/devices/pic/xml_data/18F66J50.xml
index 34dbe21..4d60faa 100644
--- a/src/devices/pic/xml_data/18F66J50.xml
+++ b/src/devices/pic/xml_data/18F66J50.xml
@@ -29,12 +29,12 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="PLLDIV" value="0x0E" >
+ </tqmask>
+ <tqmask name="PLLDIV" value="0x0E" >
<value value="0x00" name="12" cname="" />
<value value="0x02" name="10" cname="" />
<value value="0x04" name="6" cname="" />
@@ -43,51 +43,51 @@
<value value="0x0A" name="3" cname="" />
<value value="0x0C" name="2" cname="" />
<value value="0x0E" name="1" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -104,27 +104,27 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J55.xml b/src/devices/pic/xml_data/18F66J55.xml
index 7e95978..d97b54a 100644
--- a/src/devices/pic/xml_data/18F66J55.xml
+++ b/src/devices/pic/xml_data/18F66J55.xml
@@ -29,12 +29,12 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="PLLDIV" value="0x0E" >
+ </tqmask>
+ <tqmask name="PLLDIV" value="0x0E" >
<value value="0x00" name="12" cname="" />
<value value="0x02" name="10" cname="" />
<value value="0x04" name="6" cname="" />
@@ -43,51 +43,51 @@
<value value="0x0A" name="3" cname="" />
<value value="0x0C" name="2" cname="" />
<value value="0x0E" name="1" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -104,27 +104,27 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J60.xml b/src/devices/pic/xml_data/18F66J60.xml
index e4ac5ea..430812c 100644
--- a/src/devices/pic/xml_data/18F66J60.xml
+++ b/src/devices/pic/xml_data/18F66J60.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="ETHLED" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="ETHLED" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F66J65.xml b/src/devices/pic/xml_data/18F66J65.xml
index 8431ec8..3a54046 100644
--- a/src/devices/pic/xml_data/18F66J65.xml
+++ b/src/devices/pic/xml_data/18F66J65.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="ETHLED" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="ETHLED" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6720.xml b/src/devices/pic/xml_data/18F6720.xml
index c023b5e..a609ee9 100644
--- a/src/devices/pic/xml_data/18F6720.xml
+++ b/src/devices/pic/xml_data/18F6720.xml
@@ -35,17 +35,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x01FFFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -54,36 +54,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -92,171 +92,171 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
- <mask name="CP_4" value="0x10" >
+ </tqmask>
+ <tqmask name="CP_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
<value value="0x10" name="Off" cname="_CP4_OFF" />
- </mask>
- <mask name="CP_5" value="0x20" >
+ </tqmask>
+ <tqmask name="CP_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
<value value="0x20" name="Off" cname="_CP5_OFF" />
- </mask>
- <mask name="CP_6" value="0x40" >
+ </tqmask>
+ <tqmask name="CP_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_CP6_ON" />
<value value="0x40" name="Off" cname="_CP6_OFF" />
- </mask>
- <mask name="CP_7" value="0x80" >
+ </tqmask>
+ <tqmask name="CP_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" />
<value value="0x80" name="Off" cname="_CP7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
- <mask name="WRT_4" value="0x10" >
+ </tqmask>
+ <tqmask name="WRT_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
<value value="0x10" name="Off" cname="_WRT4_OFF" />
- </mask>
- <mask name="WRT_5" value="0x20" >
+ </tqmask>
+ <tqmask name="WRT_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
<value value="0x20" name="Off" cname="_WRT5_OFF" />
- </mask>
- <mask name="WRT_6" value="0x40" >
+ </tqmask>
+ <tqmask name="WRT_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" />
<value value="0x40" name="Off" cname="_WRT6_OFF" />
- </mask>
- <mask name="WRT_7" value="0x80" >
+ </tqmask>
+ <tqmask name="WRT_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" />
<value value="0x80" name="Off" cname="_WRT7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
- <mask name="EBTR_4" value="0x10" >
+ </tqmask>
+ <tqmask name="EBTR_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
<value value="0x10" name="Off" cname="_EBTR4_OFF" />
- </mask>
- <mask name="EBTR_5" value="0x20" >
+ </tqmask>
+ <tqmask name="EBTR_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
<value value="0x20" name="Off" cname="_EBTR5_OFF" />
- </mask>
- <mask name="EBTR_6" value="0x40" >
+ </tqmask>
+ <tqmask name="EBTR_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" />
<value value="0x40" name="Off" cname="_EBTR6_OFF" />
- </mask>
- <mask name="EBTR_7" value="0x80" >
+ </tqmask>
+ <tqmask name="EBTR_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" />
<value value="0x80" name="Off" cname="_EBTR7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F6722.xml b/src/devices/pic/xml_data/18F6722.xml
index fb30985..6a3c8ad 100644
--- a/src/devices/pic/xml_data/18F6722.xml
+++ b/src/devices/pic/xml_data/18F6722.xml
@@ -27,17 +27,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x01FFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -48,42 +48,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -100,189 +100,189 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x85" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_PORTE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
<value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
<value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
<value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
- <mask name="CP_4" value="0x10" >
+ </tqmask>
+ <tqmask name="CP_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
<value value="0x10" name="Off" cname="_CP4_OFF" />
- </mask>
- <mask name="CP_5" value="0x20" >
+ </tqmask>
+ <tqmask name="CP_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
<value value="0x20" name="Off" cname="_CP5_OFF" />
- </mask>
- <mask name="CP_6" value="0x40" >
+ </tqmask>
+ <tqmask name="CP_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_CP6_ON" />
<value value="0x40" name="Off" cname="_CP6_OFF" />
- </mask>
- <mask name="CP_7" value="0x80" >
+ </tqmask>
+ <tqmask name="CP_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" />
<value value="0x80" name="Off" cname="_CP7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
- <mask name="WRT_4" value="0x10" >
+ </tqmask>
+ <tqmask name="WRT_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
<value value="0x10" name="Off" cname="_WRT4_OFF" />
- </mask>
- <mask name="WRT_5" value="0x20" >
+ </tqmask>
+ <tqmask name="WRT_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
<value value="0x20" name="Off" cname="_WRT5_OFF" />
- </mask>
- <mask name="WRT_6" value="0x40" >
+ </tqmask>
+ <tqmask name="WRT_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" />
<value value="0x40" name="Off" cname="_WRT6_OFF" />
- </mask>
- <mask name="WRT_7" value="0x80" >
+ </tqmask>
+ <tqmask name="WRT_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" />
<value value="0x80" name="Off" cname="_WRT7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
- <mask name="EBTR_4" value="0x10" >
+ </tqmask>
+ <tqmask name="EBTR_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
<value value="0x10" name="Off" cname="_EBTR4_OFF" />
- </mask>
- <mask name="EBTR_5" value="0x20" >
+ </tqmask>
+ <tqmask name="EBTR_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
<value value="0x20" name="Off" cname="_EBTR5_OFF" />
- </mask>
- <mask name="EBTR_6" value="0x40" >
+ </tqmask>
+ <tqmask name="EBTR_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" />
<value value="0x40" name="Off" cname="_EBTR6_OFF" />
- </mask>
- <mask name="EBTR_7" value="0x80" >
+ </tqmask>
+ <tqmask name="EBTR_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" />
<value value="0x80" name="Off" cname="_EBTR7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F67J10.xml b/src/devices/pic/xml_data/18F67J10.xml
index 78223c3..4c6f875 100644
--- a/src/devices/pic/xml_data/18F67J10.xml
+++ b/src/devices/pic/xml_data/18F67J10.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F67J11.xml b/src/devices/pic/xml_data/18F67J11.xml
index d13e7dc..3f12d71 100644
--- a/src/devices/pic/xml_data/18F67J11.xml
+++ b/src/devices/pic/xml_data/18F67J11.xml
@@ -30,55 +30,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -95,27 +95,27 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F67J50.xml b/src/devices/pic/xml_data/18F67J50.xml
index 91eade3..d704f33 100644
--- a/src/devices/pic/xml_data/18F67J50.xml
+++ b/src/devices/pic/xml_data/18F67J50.xml
@@ -29,12 +29,12 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="PLLDIV" value="0x0E" >
+ </tqmask>
+ <tqmask name="PLLDIV" value="0x0E" >
<value value="0x00" name="12" cname="" />
<value value="0x02" name="10" cname="" />
<value value="0x04" name="6" cname="" />
@@ -43,51 +43,51 @@
<value value="0x0A" name="3" cname="" />
<value value="0x0C" name="2" cname="" />
<value value="0x0E" name="1" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -104,27 +104,27 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x09" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x09" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F67J60.xml b/src/devices/pic/xml_data/18F67J60.xml
index 29922db..a5bfdcf 100644
--- a/src/devices/pic/xml_data/18F67J60.xml
+++ b/src/devices/pic/xml_data/18F67J60.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,23 +94,23 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="ETHLED" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="ETHLED" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8310.xml b/src/devices/pic/xml_data/18F8310.xml
index 1fe084d..5a16736 100644
--- a/src/devices/pic/xml_data/18F8310.xml
+++ b/src/devices/pic/xml_data/18F8310.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,79 +105,79 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
<value value="0x02" name="Microprocessor" cname="_PM_MP" />
<value value="0x03" name="Microcontroller" cname="_PM_MC" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_BW_8" />
<value value="0x40" name="16" cname="_BW_16" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F8390.xml b/src/devices/pic/xml_data/18F8390.xml
index 4dbff0c..182acf1 100644
--- a/src/devices/pic/xml_data/18F8390.xml
+++ b/src/devices/pic/xml_data/18F8390.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,79 +105,79 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_PM_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_PM_MPB" />
<value value="0x02" name="Microprocessor" cname="_PM_MP" />
<value value="0x03" name="Microcontroller" cname="_PM_MC" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_BW_8" />
<value value="0x40" name="16" cname="_BW_16" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F8393.xml b/src/devices/pic/xml_data/18F8393.xml
index ce846db..bd27973 100644
--- a/src/devices/pic/xml_data/18F8393.xml
+++ b/src/devices/pic/xml_data/18F8393.xml
@@ -36,16 +36,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x001FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -56,42 +56,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -108,64 +108,64 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F83J11.xml b/src/devices/pic/xml_data/18F83J11.xml
index 4a9d249..6fbfbc0 100644
--- a/src/devices/pic/xml_data/18F83J11.xml
+++ b/src/devices/pic/xml_data/18F83J11.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,45 +94,45 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F83J90.xml b/src/devices/pic/xml_data/18F83J90.xml
index 8e10c27..c8fc70e 100644
--- a/src/devices/pic/xml_data/18F83J90.xml
+++ b/src/devices/pic/xml_data/18F83J90.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,45 +94,45 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8410.xml b/src/devices/pic/xml_data/18F8410.xml
index b5c49cd..46d46a3 100644
--- a/src/devices/pic/xml_data/18F8410.xml
+++ b/src/devices/pic/xml_data/18F8410.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,64 +105,64 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F8490.xml b/src/devices/pic/xml_data/18F8490.xml
index 3871a60..0f2e987 100644
--- a/src/devices/pic/xml_data/18F8490.xml
+++ b/src/devices/pic/xml_data/18F8490.xml
@@ -33,16 +33,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,42 +53,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -105,64 +105,64 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F8493.xml b/src/devices/pic/xml_data/18F8493.xml
index 4e8bc52..4d61277 100644
--- a/src/devices/pic/xml_data/18F8493.xml
+++ b/src/devices/pic/xml_data/18F8493.xml
@@ -36,16 +36,16 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x003FFF" word_write_align="8" word_erase_align="0" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -56,42 +56,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -108,64 +108,64 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" />
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xC3" />
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7/RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x81" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x81" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x01" >
- <mask name="CP" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CP" value="0x01" >
<value value="0x00" name="All" cname="_CP_ON" />
<value value="0x01" name="Off" cname="_CP_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="EBTR" value="0x01" >
<value value="0x00" name="All" cname="_EBTR_ON" />
<value value="0x01" name="Off" cname="_EBTR_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x00" />
<!--* Packages *************************************************************-->
<package types="tqfp" nb_pins="80" >
diff --git a/src/devices/pic/xml_data/18F84J11.xml b/src/devices/pic/xml_data/18F84J11.xml
index 9c69d2b..efdf05a 100644
--- a/src/devices/pic/xml_data/18F84J11.xml
+++ b/src/devices/pic/xml_data/18F84J11.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,45 +94,45 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F84J90.xml b/src/devices/pic/xml_data/18F84J90.xml
index 59711f3..1236e43 100644
--- a/src/devices/pic/xml_data/18F84J90.xml
+++ b/src/devices/pic/xml_data/18F84J90.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,45 +94,45 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8520.xml b/src/devices/pic/xml_data/18F8520.xml
index 6bc1aae..ed9b7c7 100644
--- a/src/devices/pic/xml_data/18F8520.xml
+++ b/src/devices/pic/xml_data/18F8520.xml
@@ -37,17 +37,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x007FFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -56,36 +56,36 @@
<value value="0x05" name="EC_IO" cname="_OSC_ECIO" />
<value value="0x06" name="H4" cname="_OSC_HSPLL" />
<value value="0x07" name="EXTRC_IO" cname="_OSC_RCIO" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.5" cname="_BORV_25" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -94,134 +94,134 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
<value value="0x02" name="Microprocessor" cname="_MODE_MP" />
<value value="0x03" name="Microcontroller" cname="_MODE_MC" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" cmask="0x02" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" ctqmask="0x02" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MUX_RE7" />
<value value="0x01" name="RC1" cname="_CCP2MUX_RC1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" cmask="0x40" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" ctqmask="0x40" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" cmask="0x40" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" ctqmask="0x40" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:1FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="2000:3FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="4000:5FFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="6000:7FFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8525.xml b/src/devices/pic/xml_data/18F8525.xml
index e7b5219..7e016eb 100644
--- a/src/devices/pic/xml_data/18F8525.xml
+++ b/src/devices/pic/xml_data/18F8525.xml
@@ -29,17 +29,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,36 +53,36 @@
<value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" />
<value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" />
<value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -99,130 +99,130 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
<value value="0x02" name="Microprocessor" cname="_MODE_MP" />
<value value="0x03" name="Microcontroller" cname="_MODE_MC" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="_ECCPMX_PORTH" />
<value value="0x02" name="RE6-RE3" cname="_ECCPMX_PORTE" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8527.xml b/src/devices/pic/xml_data/18F8527.xml
index 62c01d4..e5159bd 100644
--- a/src/devices/pic/xml_data/18F8527.xml
+++ b/src/devices/pic/xml_data/18F8527.xml
@@ -30,17 +30,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -57,42 +57,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FSCM_OFF" />
<value value="0x40" name="On" cname="_FSCM_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -109,154 +109,154 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8K" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
<value value="0x02" name="Microprocessor" cname="_MODE_MP" />
<value value="0x03" name="Microcontroller" cname="_MODE_MC" />
- </mask>
- <mask name="ABW" value="0x30" >
+ </tqmask>
+ <tqmask name="ABW" value="0x30" >
<value value="0x00" name="8" cname="_ADDRBW_ADDR8BIT" />
<value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" />
<value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" />
<value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_DATABW_DATA8BIT" />
<value value="0x40" name="16" cname="_DATABW_DATA16BIT" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="_ECCPMX_PORTH" />
<value value="0x02" name="RE6-RE3" cname="_ECCPMX_PORTE" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
<value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
<value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
<value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8585.xml b/src/devices/pic/xml_data/18F8585.xml
index 08367ab..85b3561 100644
--- a/src/devices/pic/xml_data/18F8585.xml
+++ b/src/devices/pic/xml_data/18F8585.xml
@@ -29,17 +29,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00BFFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,36 +53,36 @@
<value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" />
<value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" />
<value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -99,130 +99,130 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
<value value="0x02" name="Microprocessor" cname="_MODE_MP" />
<value value="0x03" name="Microcontroller" cname="_MODE_MC" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" />
<value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x07" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x07" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x07" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F85J10.xml b/src/devices/pic/xml_data/18F85J10.xml
index 99b998c..6fab213 100644
--- a/src/devices/pic/xml_data/18F85J10.xml
+++ b/src/devices/pic/xml_data/18F85J10.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,45 +94,45 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F85J11.xml b/src/devices/pic/xml_data/18F85J11.xml
index 91b4cc2..0193782 100644
--- a/src/devices/pic/xml_data/18F85J11.xml
+++ b/src/devices/pic/xml_data/18F85J11.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,45 +94,45 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F85J15.xml b/src/devices/pic/xml_data/18F85J15.xml
index c2445ab..3011a51 100644
--- a/src/devices/pic/xml_data/18F85J15.xml
+++ b/src/devices/pic/xml_data/18F85J15.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,45 +94,45 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F85J50.xml b/src/devices/pic/xml_data/18F85J50.xml
index dee0637..80199eb 100644
--- a/src/devices/pic/xml_data/18F85J50.xml
+++ b/src/devices/pic/xml_data/18F85J50.xml
@@ -29,16 +29,16 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="PLLDIV" value="0x0E" >
+ </tqmask>
+ <tqmask name="PLLDIV" value="0x0E" >
<value value="0x00" name="12" cname="" />
<value value="0x02" name="10" cname="" />
<value value="0x04" name="6" cname="" />
@@ -47,47 +47,47 @@
<value value="0x0A" name="3" cname="" />
<value value="0x0C" name="2" cname="" />
<value value="0x0E" name="1" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -104,53 +104,53 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="PMPMX" value="0x04" >
+ </tqmask>
+ <tqmask name="PMPMX" value="0x04" >
<value value="0x00" name="NotConnected" cname="" />
<value value="0x04" name="Connected" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F85J90.xml b/src/devices/pic/xml_data/18F85J90.xml
index 61e7571..51d6085 100644
--- a/src/devices/pic/xml_data/18F85J90.xml
+++ b/src/devices/pic/xml_data/18F85J90.xml
@@ -28,55 +28,55 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -93,45 +93,45 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8620.xml b/src/devices/pic/xml_data/18F8620.xml
index 8503556..fe596c1 100644
--- a/src/devices/pic/xml_data/18F8620.xml
+++ b/src/devices/pic/xml_data/18F8620.xml
@@ -37,17 +37,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" sdcc_cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_XT_OSC" sdcc_cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_HS_OSC" sdcc_cname="_OSC_HS" />
@@ -56,36 +56,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" sdcc_cname="_OSC_EC_OSC2_RA6" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" sdcc_cname="_OSC_HS_PLL" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" sdcc_cname="_OSC_RC_OSC2" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" sdcc_cname="_PUT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" sdcc_cname="_PUT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" sdcc_cname="_BODEN_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" sdcc_cname="_BODEN_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" sdcc_cname="_BODENV_4_5V" />
<value value="0x04" name="4.2" cname="_BORV_42" sdcc_cname="_BODENV_4_2V" />
<value value="0x08" name="2.7" cname="_BORV_27" sdcc_cname="_BODENV_2_7V" />
<value value="0x0C" name="2.5" cname="_BORV_20" sdcc_cname="_BODENV_2_5V" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" sdcc_cname="_WDTPS_1_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" sdcc_cname="_WDTPS_1_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" sdcc_cname="_WDTPS_1_4" />
@@ -94,134 +94,134 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" sdcc_cname="_WDTPS_1_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" sdcc_cname="_WDTPS_1_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" sdcc_cname="_WDTPS_1_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_XMC_MODE" sdcc_cname="_PMODE_EXT" />
<value value="0x01" name="Microprocessor with boot" cname="_MPB_MODE" sdcc_cname="_PMODE_MICROPROCESSOR_w_Boot" />
<value value="0x02" name="Microprocessor" cname="_MP_MODE" sdcc_cname="_PMODE_MICROPROCESSOR_" />
<value value="0x03" name="Microcontroller" cname="_MC_MODE" sdcc_cname="_PMODE_MICROCONTROLLER" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_OFF" sdcc_cname="_CCP2MUX_RE7_MICROCONTROLLER__RB3" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" sdcc_cname="_CCP2MUX_RC1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" sdcc_cname="_BACKBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" sdcc_cname="_BACKBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_CP0_ON" sdcc_cname="_CP_0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" sdcc_cname="_CP_0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" sdcc_cname="_CP_1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" sdcc_cname="_CP_1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" sdcc_cname="_CP_2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" sdcc_cname="_CP_2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" sdcc_cname="_CP_3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" sdcc_cname="_CP_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_WRT0_ON" sdcc_cname="_WRT_0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" sdcc_cname="_WRT_0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" sdcc_cname="_WRT_1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" sdcc_cname="_WRT_1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" sdcc_cname="_WRT_2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" sdcc_cname="_WRT_2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" sdcc_cname="_WRT_3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" sdcc_cname="_WRT_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_EBTR0_ON" sdcc_cname="_EBTR_0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" sdcc_cname="_EBTR_0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" sdcc_cname="_EBTR_1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" sdcc_cname="_EBTR_1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" sdcc_cname="_EBTR_2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" sdcc_cname="_EBTR_2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" sdcc_cname="_EBTR_3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" sdcc_cname="_EBTR_3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8621.xml b/src/devices/pic/xml_data/18F8621.xml
index e5689ae..654f4a2 100644
--- a/src/devices/pic/xml_data/18F8621.xml
+++ b/src/devices/pic/xml_data/18F8621.xml
@@ -29,17 +29,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,36 +53,36 @@
<value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" />
<value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" />
<value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -99,142 +99,142 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
<value value="0x02" name="Microprocessor" cname="_MODE_MP" />
<value value="0x03" name="Microcontroller" cname="_MODE_MC" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="_ECCPMX_PORTH" />
<value value="0x02" name="RE6-RE3" cname="_ECCPMX_PORTE" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8622.xml b/src/devices/pic/xml_data/18F8622.xml
index fe29be9..9a38941 100644
--- a/src/devices/pic/xml_data/18F8622.xml
+++ b/src/devices/pic/xml_data/18F8622.xml
@@ -30,17 +30,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -57,42 +57,42 @@
<value value="0x0D" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0E" name="EXTRC_CLKOUT" cname="_RC_OSC" />
<value value="0x0F" name="EXTRC_CLKOUT" cname="_RC_OSC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FSCM_OFF" />
<value value="0x40" name="On" cname="_FSCM_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -109,166 +109,166 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8K" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16K" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32K" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
<value value="0x02" name="Microprocessor" cname="_MODE_MP" />
<value value="0x03" name="Microcontroller" cname="_MODE_MC" />
- </mask>
- <mask name="ABW" value="0x30" >
+ </tqmask>
+ <tqmask name="ABW" value="0x30" >
<value value="0x00" name="8" cname="_ADDRBW_ADDR8BIT" />
<value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" />
<value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" />
<value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_DATABW_DATA8BIT" />
<value value="0x40" name="16" cname="_DATABW_DATA16BIT" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CPP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CPP2MX_PORTC" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" />
<value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
<value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
<value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
<value value="0x30" name="4096" cname="_BBSIZ_BB7K" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8627.xml b/src/devices/pic/xml_data/18F8627.xml
index 2b7f70b..3a5ab09 100644
--- a/src/devices/pic/xml_data/18F8627.xml
+++ b/src/devices/pic/xml_data/18F8627.xml
@@ -30,17 +30,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x017FFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -51,42 +51,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -103,190 +103,190 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
<value value="0x02" name="Microprocessor" cname="_MODE_MP" />
<value value="0x03" name="Microcontroller" cname="_MODE_MC" />
- </mask>
- <mask name="ABW" value="0x30" >
+ </tqmask>
+ <tqmask name="ABW" value="0x30" >
<value value="0x00" name="8" cname="_ADDRBW_ADDR8BIT" />
<value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" />
<value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" />
<value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_DATABW_DATA8BIT" />
<value value="0x40" name="16" cname="_DATABW_DATA16BIT" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" />
<value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
<value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
<value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
<value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x3F" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
- <mask name="CP_4" value="0x10" >
+ </tqmask>
+ <tqmask name="CP_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
<value value="0x10" name="Off" cname="_CP4_OFF" />
- </mask>
- <mask name="CP_5" value="0x20" >
+ </tqmask>
+ <tqmask name="CP_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
<value value="0x20" name="Off" cname="_CP5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x3F" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
- <mask name="WRT_4" value="0x10" >
+ </tqmask>
+ <tqmask name="WRT_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
<value value="0x10" name="Off" cname="_WRT4_OFF" />
- </mask>
- <mask name="WRT_5" value="0x20" >
+ </tqmask>
+ <tqmask name="WRT_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
<value value="0x20" name="Off" cname="_WRT5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x3F" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x3F" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
- <mask name="EBTR_4" value="0x10" >
+ </tqmask>
+ <tqmask name="EBTR_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
<value value="0x10" name="Off" cname="_EBTR4_OFF" />
- </mask>
- <mask name="EBTR_5" value="0x20" >
+ </tqmask>
+ <tqmask name="EBTR_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
<value value="0x20" name="Off" cname="_EBTR5_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8680.xml b/src/devices/pic/xml_data/18F8680.xml
index 97ec3c0..607bf0f 100644
--- a/src/devices/pic/xml_data/18F8680.xml
+++ b/src/devices/pic/xml_data/18F8680.xml
@@ -29,17 +29,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x00FFFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x2F" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x2F" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -53,36 +53,36 @@
<value value="0x0D" name="E4S_IO" cname="_OSC_ECIOSWPLL" />
<value value="0x0E" name="H4S" cname="_OSC_HSSWPLL" />
<value value="0x0F" name="EXTRC_IO" cname="_OSC_RCIO" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -99,142 +99,142 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
<value value="0x02" name="Microprocessor" cname="_MODE_MP" />
<value value="0x03" name="Microcontroller" cname="_MODE_MC" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" />
<value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x0F" cmask="0x08" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0x0F" ctqmask="0x08" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J10.xml b/src/devices/pic/xml_data/18F86J10.xml
index 6cc1ec1..1974a92 100644
--- a/src/devices/pic/xml_data/18F86J10.xml
+++ b/src/devices/pic/xml_data/18F86J10.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,45 +94,45 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J11.xml b/src/devices/pic/xml_data/18F86J11.xml
index 05e065e..844b0e1 100644
--- a/src/devices/pic/xml_data/18F86J11.xml
+++ b/src/devices/pic/xml_data/18F86J11.xml
@@ -30,55 +30,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -95,53 +95,53 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="PMPMX" value="0x04" >
+ </tqmask>
+ <tqmask name="PMPMX" value="0x04" >
<value value="0x00" name="NotConnected" cname="" />
<value value="0x04" name="Connected" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J15.xml b/src/devices/pic/xml_data/18F86J15.xml
index bcebf10..e5f94df 100644
--- a/src/devices/pic/xml_data/18F86J15.xml
+++ b/src/devices/pic/xml_data/18F86J15.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,45 +94,45 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J16.xml b/src/devices/pic/xml_data/18F86J16.xml
index b06b858..ce5d2c4 100644
--- a/src/devices/pic/xml_data/18F86J16.xml
+++ b/src/devices/pic/xml_data/18F86J16.xml
@@ -29,55 +29,55 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,53 +94,53 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="PMPMX" value="0x04" >
+ </tqmask>
+ <tqmask name="PMPMX" value="0x04" >
<value value="0x00" name="NotConnected" cname="" />
<value value="0x04" name="Connected" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J50.xml b/src/devices/pic/xml_data/18F86J50.xml
index fa67e08..44acae5 100644
--- a/src/devices/pic/xml_data/18F86J50.xml
+++ b/src/devices/pic/xml_data/18F86J50.xml
@@ -29,16 +29,16 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="PLLDIV" value="0x0E" >
+ </tqmask>
+ <tqmask name="PLLDIV" value="0x0E" >
<value value="0x00" name="12" cname="" />
<value value="0x02" name="10" cname="" />
<value value="0x04" name="6" cname="" />
@@ -47,47 +47,47 @@
<value value="0x0A" name="3" cname="" />
<value value="0x0C" name="2" cname="" />
<value value="0x0E" name="1" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -104,53 +104,53 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="PMPMX" value="0x04" >
+ </tqmask>
+ <tqmask name="PMPMX" value="0x04" >
<value value="0x00" name="NotConnected" cname="" />
<value value="0x04" name="Connected" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J55.xml b/src/devices/pic/xml_data/18F86J55.xml
index 9b29823..1b9d553 100644
--- a/src/devices/pic/xml_data/18F86J55.xml
+++ b/src/devices/pic/xml_data/18F86J55.xml
@@ -29,16 +29,16 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="PLLDIV" value="0x0E" >
+ </tqmask>
+ <tqmask name="PLLDIV" value="0x0E" >
<value value="0x00" name="12" cname="" />
<value value="0x02" name="10" cname="" />
<value value="0x04" name="6" cname="" />
@@ -47,47 +47,47 @@
<value value="0x0A" name="3" cname="" />
<value value="0x0C" name="2" cname="" />
<value value="0x0E" name="1" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -104,53 +104,53 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="PMPMX" value="0x04" >
+ </tqmask>
+ <tqmask name="PMPMX" value="0x04" >
<value value="0x00" name="NotConnected" cname="" />
<value value="0x04" name="Connected" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J60.xml b/src/devices/pic/xml_data/18F86J60.xml
index 42f3d20..3fa4f03 100644
--- a/src/devices/pic/xml_data/18F86J60.xml
+++ b/src/devices/pic/xml_data/18F86J60.xml
@@ -32,55 +32,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -97,31 +97,31 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
- <mask name="ETHLED" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="ETHLED" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="CCP2MX" value="0x04" >
+ </tqmask>
+ <tqmask name="CCP2MX" value="0x04" >
<value value="0x00" name="RE7" cname="" />
<value value="0x04" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F86J65.xml b/src/devices/pic/xml_data/18F86J65.xml
index c2cdf41..d482c93 100644
--- a/src/devices/pic/xml_data/18F86J65.xml
+++ b/src/devices/pic/xml_data/18F86J65.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,31 +94,31 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
- <mask name="ETHLED" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="ETHLED" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="CCP2MX" value="0x04" >
+ </tqmask>
+ <tqmask name="CCP2MX" value="0x04" >
<value value="0x00" name="RE7" cname="" />
<value value="0x04" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8720.xml b/src/devices/pic/xml_data/18F8720.xml
index f634b25..8905720 100644
--- a/src/devices/pic/xml_data/18F8720.xml
+++ b/src/devices/pic/xml_data/18F8720.xml
@@ -37,17 +37,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x01FFFF" word_write_align="4" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x27" >
- <mask name="FOSC" value="0x07" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x27" >
+ <tqmask name="FOSC" value="0x07" >
<value value="0x00" name="LP" cname="_LP_OSC" />
<value value="0x01" name="XT" cname="_XT_OSC" />
<value value="0x02" name="HS" cname="_HS_OSC" />
@@ -56,36 +56,36 @@
<value value="0x05" name="EC_IO" cname="_ECIO_OSC" />
<value value="0x06" name="H4" cname="_HSPLL_OSC" />
<value value="0x07" name="EXTRC_IO" cname="_RCIO_OSC" />
- </mask>
- <mask name="OSCSEN" value="0x20" >
+ </tqmask>
+ <tqmask name="OSCSEN" value="0x20" >
<value value="0x00" name="On" cname="_OSCS_ON" />
<value value="0x20" name="Off" cname="_OSCS_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x0F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x02" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x02" >
<value value="0x00" name="Off" cname="_BOR_OFF" />
<value value="0x02" name="On" cname="_BOR_ON" />
- </mask>
- <mask name="BORV" value="0x0C" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0C" >
<value value="0x00" name="4.5" cname="_BORV_45" />
<value value="0x04" name="4.2" cname="_BORV_42" />
<value value="0x08" name="2.7" cname="_BORV_27" />
<value value="0x0C" name="2.0" cname="_BORV_20" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x0E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x0E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -94,182 +94,182 @@
<value value="0x0A" name="1:32" cname="_WDTPS_32" />
<value value="0x0C" name="1:64" cname="_WDTPS_64" />
<value value="0x0E" name="1:128" cname="_WDTPS_128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x83" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x83" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_XMC_MODE" />
<value value="0x01" name="Microprocessor with boot" cname="_MPB_MODE" />
<value value="0x02" name="Microprocessor" cname="_MP_MODE" />
<value value="0x03" name="Microcontroller" cname="_MC_MODE" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x01" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x01" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="_CCP2MX_OFF" />
<value value="0x01" name="RC1" cname="_CCP2MX_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVR_OFF" />
<value value="0x01" name="On" cname="_STVR_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
- <mask name="CP_4" value="0x10" >
+ </tqmask>
+ <tqmask name="CP_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
<value value="0x10" name="Off" cname="_CP4_OFF" />
- </mask>
- <mask name="CP_5" value="0x20" >
+ </tqmask>
+ <tqmask name="CP_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
<value value="0x20" name="Off" cname="_CP5_OFF" />
- </mask>
- <mask name="CP_6" value="0x40" >
+ </tqmask>
+ <tqmask name="CP_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_CP6_ON" />
<value value="0x40" name="Off" cname="_CP6_OFF" />
- </mask>
- <mask name="CP_7" value="0x80" >
+ </tqmask>
+ <tqmask name="CP_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" />
<value value="0x80" name="Off" cname="_CP7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
- <mask name="WRT_4" value="0x10" >
+ </tqmask>
+ <tqmask name="WRT_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
<value value="0x10" name="Off" cname="_WRT4_OFF" />
- </mask>
- <mask name="WRT_5" value="0x20" >
+ </tqmask>
+ <tqmask name="WRT_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
<value value="0x20" name="Off" cname="_WRT5_OFF" />
- </mask>
- <mask name="WRT_6" value="0x40" >
+ </tqmask>
+ <tqmask name="WRT_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" />
<value value="0x40" name="Off" cname="_WRT6_OFF" />
- </mask>
- <mask name="WRT_7" value="0x80" >
+ </tqmask>
+ <tqmask name="WRT_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" />
<value value="0x80" name="Off" cname="_WRT7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="0000:01FF" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0200:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
- <mask name="EBTR_4" value="0x10" >
+ </tqmask>
+ <tqmask name="EBTR_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
<value value="0x10" name="Off" cname="_EBTR4_OFF" />
- </mask>
- <mask name="EBTR_5" value="0x20" >
+ </tqmask>
+ <tqmask name="EBTR_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
<value value="0x20" name="Off" cname="_EBTR5_OFF" />
- </mask>
- <mask name="EBTR_6" value="0x40" >
+ </tqmask>
+ <tqmask name="EBTR_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" />
<value value="0x40" name="Off" cname="_EBTR6_OFF" />
- </mask>
- <mask name="EBTR_7" value="0x80" >
+ </tqmask>
+ <tqmask name="EBTR_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" />
<value value="0x80" name="Off" cname="_EBTR7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="0000:07FF" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F8722.xml b/src/devices/pic/xml_data/18F8722.xml
index 3db0bbd..8cdffbb 100644
--- a/src/devices/pic/xml_data/18F8722.xml
+++ b/src/devices/pic/xml_data/18F8722.xml
@@ -30,17 +30,17 @@
<!--* Memory ***************************************************************-->
<memory name="code" start="0x000000" end="0x01FFFF" word_write_align="32" word_erase_align="32" />
- <memory name="user_ids" start="0x200000" end="0x200007" rmask="0x0F" />
+ <memory name="user_ids" start="0x200000" end="0x200007" rtqmask="0x0F" />
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<memory name="config" start="0x300000" end="0x30000D" />
<memory name="eeprom" start="0x000000" end="0x0003FF" hexfile_offset="0xF00000" />
<memory name="debug_vector" start="0x200028" end="0x200037" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x1" name="CONFIG1H" wmask="0xFF" bvalue="0x07" >
- <mask name="FOSC" value="0x0F" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FOSC" value="0x0F" >
<value value="0x00" name="LP" cname="_OSC_LP" />
<value value="0x01" name="XT" cname="_OSC_XT" />
<value value="0x02" name="HS" cname="_OSC_HS" />
@@ -51,42 +51,42 @@
<value value="0x08" name="INTRC_IO" cname="_OSC_INTIO67" />
<value value="0x09" name="INTRC_CLKOUT" cname="_OSC_INTIO7" />
<value value="default" name="EXTRC_CLKOUT" cname="_OSC_RC" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="Off" cname="_FCMEN_OFF" />
<value value="0x40" name="On" cname="_FCMEN_ON" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" cname="_IESO_OFF" />
<value value="0x80" name="On" cname="_IESO_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0x1F" >
- <mask name="PWRTE" value="0x01" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="PWRTE" value="0x01" >
<value value="0x00" name="On" cname="_PWRT_ON" />
<value value="0x01" name="Off" cname="_PWRT_OFF" />
- </mask>
- <mask name="BODEN" value="0x06" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x06" >
<value value="0x00" name="Off" cname="_BOREN_OFF" />
<value value="0x02" name="Software" cname="_BOREN_ON" />
<value value="0x04" name="On_run" cname="_BOREN_NOSLP" />
<value value="0x06" name="On" cname="_BOREN_SBORDIS" />
- </mask>
- <mask name="BORV" value="0x18" >
+ </tqmask>
+ <tqmask name="BORV" value="0x18" >
<value value="0x00" name="4.5" cname="_BORV_0" />
<value value="0x08" name="4.2" cname="_BORV_1" />
<value value="0x10" name="2.7" cname="_BORV_2" />
<value value="0x18" name="2.0" cname="_BORV_3" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x1F" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x1F" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="_WDT_OFF" />
<value value="0x01" name="On" cname="_WDT_ON" />
- </mask>
- <mask name="WDTPS" value="0x1E" >
+ </tqmask>
+ <tqmask name="WDTPS" value="0x1E" >
<value value="0x00" name="1:1" cname="_WDTPS_1" />
<value value="0x02" name="1:2" cname="_WDTPS_2" />
<value value="0x04" name="1:4" cname="_WDTPS_4" />
@@ -103,214 +103,214 @@
<value value="0x1A" name="1:8192" cname="_WDTPS_8192" />
<value value="0x1C" name="1:16384" cname="_WDTPS_16384" />
<value value="0x1E" name="1:32768" cname="_WDTPS_32768" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF3" >
- <mask name="PM" value="0x03" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF3" >
+ <tqmask name="PM" value="0x03" >
<value value="0x00" name="Extended microcontroller" cname="_MODE_EM" />
<value value="0x01" name="Microprocessor with boot" cname="_MODE_MPB" />
<value value="0x02" name="Microprocessor" cname="_MODE_MP" />
<value value="0x03" name="Microcontroller" cname="_MODE_MC" />
- </mask>
- <mask name="ABW" value="0x30" >
+ </tqmask>
+ <tqmask name="ABW" value="0x30" >
<value value="0x00" name="8" cname="_ADDRBW_ADDR8BIT" />
<value value="0x10" name="12" cname="_ADDRBW_ADDR12BIT" />
<value value="0x20" name="16" cname="_ADDRBW_ADDR16BIT" />
<value value="0x30" name="20" cname="_ADDRBW_ADDR20BIT" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="_DATABW_DATA8BIT" />
<value value="0x40" name="16" cname="_DATABW_DATA16BIT" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="_WAIT_ON" />
<value value="0x80" name="Off" cname="_WAIT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x83" cmask="0x02" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x83" ctqmask="0x02" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="_CCP2MX_PORTBE" />
<value value="0x01" name="RC1" cname="_CCP2MX_PORTC" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH6" cname="_ECCPMX_PORTH" />
<value value="0x02" name="RE6-RE5" cname="_ECCPMX_PORTE" />
- </mask>
- <mask name="LPT1OSC" value="0x04" >
+ </tqmask>
+ <tqmask name="LPT1OSC" value="0x04" >
<value value="0x00" name="Off" cname="_LPT1OSC_OFF" />
<value value="0x04" name="On" cname="_LPT1OSC_ON" />
- </mask>
- <mask name="MCLRE" value="0x80" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x80" >
<value value="0x00" name="Internal" cname="_MCLRE_OFF" />
<value value="0x80" name="External" cname="_MCLRE_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
- <mask name="STVREN" value="0x01" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x85" >
+ <tqmask name="STVREN" value="0x01" >
<value value="0x00" name="Off" cname="_STVREN_OFF" />
<value value="0x01" name="On" cname="_STVREN_ON" />
- </mask>
- <mask name="LVP" value="0x04" >
+ </tqmask>
+ <tqmask name="LVP" value="0x04" >
<value value="0x00" name="Off" cname="_LVP_OFF" />
<value value="0x04" name="On" cname="_LVP_ON" />
- </mask>
- <mask name="BBSIZ" value="0x30" >
+ </tqmask>
+ <tqmask name="BBSIZ" value="0x30" >
<value value="0x00" name="1024" cname="_BBSIZ_BB2K" />
<value value="0x10" name="2048" cname="_BBSIZ_BB4K" />
<value value="0x20" name="4096" cname="_BBSIZ_BB8K" />
<value value="0x30" name="4096" cname="_BBSIZ_BB8K" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="_XINST_OFF" />
<value value="0x40" name="On" cname="_XINST_ON" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="_DEBUG_ON" />
<value value="0x80" name="Off" cname="_DEBUG_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" />
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" />
- <config offset="0x8" name="CONFIG5L" wmask="0xFF" bvalue="0xFF" >
- <mask name="CP_0" value="0x01" >
+ <config offset="0x8" name="CONFIG5L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="CP_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_CP0_ON" />
<value value="0x01" name="Off" cname="_CP0_OFF" />
- </mask>
- <mask name="CP_1" value="0x02" >
+ </tqmask>
+ <tqmask name="CP_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_CP1_ON" />
<value value="0x02" name="Off" cname="_CP1_OFF" />
- </mask>
- <mask name="CP_2" value="0x04" >
+ </tqmask>
+ <tqmask name="CP_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_CP2_ON" />
<value value="0x04" name="Off" cname="_CP2_OFF" />
- </mask>
- <mask name="CP_3" value="0x08" >
+ </tqmask>
+ <tqmask name="CP_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_CP3_ON" />
<value value="0x08" name="Off" cname="_CP3_OFF" />
- </mask>
- <mask name="CP_4" value="0x10" >
+ </tqmask>
+ <tqmask name="CP_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_CP4_ON" />
<value value="0x10" name="Off" cname="_CP4_OFF" />
- </mask>
- <mask name="CP_5" value="0x20" >
+ </tqmask>
+ <tqmask name="CP_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_CP5_ON" />
<value value="0x20" name="Off" cname="_CP5_OFF" />
- </mask>
- <mask name="CP_6" value="0x40" >
+ </tqmask>
+ <tqmask name="CP_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_CP6_ON" />
<value value="0x40" name="Off" cname="_CP6_OFF" />
- </mask>
- <mask name="CP_7" value="0x80" >
+ </tqmask>
+ <tqmask name="CP_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_CP7_ON" />
<value value="0x80" name="Off" cname="_CP7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x9" name="CONFIG5H" wmask="0xFF" bvalue="0xC0" >
- <mask name="CPB" value="0x40" >
+ <config offset="0x9" name="CONFIG5H" wtqmask="0xFF" bvalue="0xC0" >
+ <tqmask name="CPB" value="0x40" >
<value value="0x00" name="All" cname="_CPB_ON" />
<value value="0x40" name="Off" cname="_CPB_OFF" />
- </mask>
- <mask name="CPD" value="0x80" >
+ </tqmask>
+ <tqmask name="CPD" value="0x80" >
<value value="0x00" name="All" cname="_CPD_ON" />
<value value="0x80" name="Off" cname="_CPD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="CONFIG6L" wmask="0xFF" bvalue="0xFF" >
- <mask name="WRT_0" value="0x01" >
+ <config offset="0xA" name="CONFIG6L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="WRT_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_WRT0_ON" />
<value value="0x01" name="Off" cname="_WRT0_OFF" />
- </mask>
- <mask name="WRT_1" value="0x02" >
+ </tqmask>
+ <tqmask name="WRT_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_WRT1_ON" />
<value value="0x02" name="Off" cname="_WRT1_OFF" />
- </mask>
- <mask name="WRT_2" value="0x04" >
+ </tqmask>
+ <tqmask name="WRT_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_WRT2_ON" />
<value value="0x04" name="Off" cname="_WRT2_OFF" />
- </mask>
- <mask name="WRT_3" value="0x08" >
+ </tqmask>
+ <tqmask name="WRT_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_WRT3_ON" />
<value value="0x08" name="Off" cname="_WRT3_OFF" />
- </mask>
- <mask name="WRT_4" value="0x10" >
+ </tqmask>
+ <tqmask name="WRT_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_WRT4_ON" />
<value value="0x10" name="Off" cname="_WRT4_OFF" />
- </mask>
- <mask name="WRT_5" value="0x20" >
+ </tqmask>
+ <tqmask name="WRT_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_WRT5_ON" />
<value value="0x20" name="Off" cname="_WRT5_OFF" />
- </mask>
- <mask name="WRT_6" value="0x40" >
+ </tqmask>
+ <tqmask name="WRT_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_WRT6_ON" />
<value value="0x40" name="Off" cname="_WRT6_OFF" />
- </mask>
- <mask name="WRT_7" value="0x80" >
+ </tqmask>
+ <tqmask name="WRT_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_WRT7_ON" />
<value value="0x80" name="Off" cname="_WRT7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0xE0" >
- <mask name="WRTC" value="0x20" >
+ <config offset="0xB" name="CONFIG6H" wtqmask="0xFF" bvalue="0xE0" >
+ <tqmask name="WRTC" value="0x20" >
<value value="0x00" name="All" cname="_WRTC_ON" />
<value value="0x20" name="Off" cname="_WRTC_OFF" />
- </mask>
- <mask name="WRTB" value="0x40" >
+ </tqmask>
+ <tqmask name="WRTB" value="0x40" >
<value value="0x00" name="All" cname="_WRTB_ON" />
<value value="0x40" name="Off" cname="_WRTB_OFF" />
- </mask>
- <mask name="WRTD" value="0x80" >
+ </tqmask>
+ <tqmask name="WRTD" value="0x80" >
<value value="0x00" name="All" cname="_WRTD_ON" />
<value value="0x80" name="Off" cname="_WRTD_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0xFF" >
- <mask name="EBTR_0" value="0x01" >
+ <config offset="0xC" name="CONFIG7L" wtqmask="0xFF" bvalue="0xFF" >
+ <tqmask name="EBTR_0" value="0x01" >
<value value="0x00" name="0800/1000/2000:3FFF" cname="_EBTR0_ON" />
<value value="0x01" name="Off" cname="_EBTR0_OFF" />
- </mask>
- <mask name="EBTR_1" value="0x02" >
+ </tqmask>
+ <tqmask name="EBTR_1" value="0x02" >
<value value="0x00" name="4000:7FFF" cname="_EBTR1_ON" />
<value value="0x02" name="Off" cname="_EBTR1_OFF" />
- </mask>
- <mask name="EBTR_2" value="0x04" >
+ </tqmask>
+ <tqmask name="EBTR_2" value="0x04" >
<value value="0x00" name="8000:BFFF" cname="_EBTR2_ON" />
<value value="0x04" name="Off" cname="_EBTR2_OFF" />
- </mask>
- <mask name="EBTR_3" value="0x08" >
+ </tqmask>
+ <tqmask name="EBTR_3" value="0x08" >
<value value="0x00" name="C000:FFFF" cname="_EBTR3_ON" />
<value value="0x08" name="Off" cname="_EBTR3_OFF" />
- </mask>
- <mask name="EBTR_4" value="0x10" >
+ </tqmask>
+ <tqmask name="EBTR_4" value="0x10" >
<value value="0x00" name="10000:13FFF" cname="_EBTR4_ON" />
<value value="0x10" name="Off" cname="_EBTR4_OFF" />
- </mask>
- <mask name="EBTR_5" value="0x20" >
+ </tqmask>
+ <tqmask name="EBTR_5" value="0x20" >
<value value="0x00" name="14000:17FFF" cname="_EBTR5_ON" />
<value value="0x20" name="Off" cname="_EBTR5_OFF" />
- </mask>
- <mask name="EBTR_6" value="0x40" >
+ </tqmask>
+ <tqmask name="EBTR_6" value="0x40" >
<value value="0x00" name="18000:1BFFF" cname="_EBTR6_ON" />
<value value="0x40" name="Off" cname="_EBTR6_OFF" />
- </mask>
- <mask name="EBTR_7" value="0x80" >
+ </tqmask>
+ <tqmask name="EBTR_7" value="0x80" >
<value value="0x00" name="1C000:1FFFF" cname="_EBTR7_ON" />
<value value="0x80" name="Off" cname="_EBTR7_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x40" >
- <mask name="EBTRB" value="0x40" >
+ <config offset="0xD" name="CONFIG7H" wtqmask="0xFF" bvalue="0x40" >
+ <tqmask name="EBTRB" value="0x40" >
<value value="0x00" name="All" cname="_EBTRB_ON" />
<value value="0x40" name="Off" cname="_EBTRB_OFF" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F87J10.xml b/src/devices/pic/xml_data/18F87J10.xml
index bc21af2..d7790cb 100644
--- a/src/devices/pic/xml_data/18F87J10.xml
+++ b/src/devices/pic/xml_data/18F87J10.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xC1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xC1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,45 +94,45 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x03" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x03" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RE7" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F87J11.xml b/src/devices/pic/xml_data/18F87J11.xml
index d3c84fb..495ecda 100644
--- a/src/devices/pic/xml_data/18F87J11.xml
+++ b/src/devices/pic/xml_data/18F87J11.xml
@@ -29,55 +29,55 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,53 +94,53 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="PMPMX" value="0x04" >
+ </tqmask>
+ <tqmask name="PMPMX" value="0x04" >
<value value="0x00" name="NotConnected" cname="" />
<value value="0x04" name="Connected" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F87J50.xml b/src/devices/pic/xml_data/18F87J50.xml
index 1749435..24207fe 100644
--- a/src/devices/pic/xml_data/18F87J50.xml
+++ b/src/devices/pic/xml_data/18F87J50.xml
@@ -29,16 +29,16 @@
<memory name="device_id" start="0x3FFFFE" end="0x3FFFFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xEF" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xEF" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="PLLDIV" value="0x0E" >
+ </tqmask>
+ <tqmask name="PLLDIV" value="0x0E" >
<value value="0x00" name="12" cname="" />
<value value="0x02" name="10" cname="" />
<value value="0x04" name="6" cname="" />
@@ -47,47 +47,47 @@
<value value="0x0A" name="3" cname="" />
<value value="0x0C" name="2" cname="" />
<value value="0x0E" name="1" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -104,53 +104,53 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="EASHFT" value="0x08" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="20BIT" cname="" />
<value value="0x10" name="16BIT" cname="" />
<value value="0x20" name="12BIT" cname="" />
<value value="0x30" name="Disabled" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="WAIT" value="0x80" >
+ </tqmask>
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x0F" >
- <mask name="CCP2MX" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="CCP2MX" value="0x01" >
<value value="0x00" name="RB3" cname="" />
<value value="0x01" name="RC1" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="PMPMX" value="0x04" >
+ </tqmask>
+ <tqmask name="PMPMX" value="0x04" >
<value value="0x00" name="NotConnected" cname="" />
<value value="0x04" name="Connected" cname="" />
- </mask>
- <mask name="MSSPSEL" value="0x08" >
+ </tqmask>
+ <tqmask name="MSSPSEL" value="0x08" >
<value value="0x00" name="5BIT" cname="" />
<value value="0x08" name="7BIT" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F87J60.xml b/src/devices/pic/xml_data/18F87J60.xml
index d101ed3..fcf788a 100644
--- a/src/devices/pic/xml_data/18F87J60.xml
+++ b/src/devices/pic/xml_data/18F87J60.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="0000:FFF7" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,31 +94,31 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
- <mask name="ETHLED" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="ETHLED" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="CCP2MX" value="0x04" >
+ </tqmask>
+ <tqmask name="CCP2MX" value="0x04" >
<value value="0x00" name="RE7" cname="" />
<value value="0x04" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F96J60.xml b/src/devices/pic/xml_data/18F96J60.xml
index 655b586..9b3dca7 100644
--- a/src/devices/pic/xml_data/18F96J60.xml
+++ b/src/devices/pic/xml_data/18F96J60.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,49 +94,49 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="WAIT" value="0x80" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="Disabled" cname="" />
<value value="0x10" name="12BIT" cname="" />
<value value="0x20" name="16BIT" cname="" />
<value value="0x30" name="20BIT" cname="" />
- </mask>
- <mask name="EASHFT" value="0x08" >
+ </tqmask>
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
- <mask name="ETHLED" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="ETHLED" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="CCP2MX" value="0x04" >
+ </tqmask>
+ <tqmask name="CCP2MX" value="0x04" >
<value value="0x00" name="RE7" cname="" />
<value value="0x04" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F96J65.xml b/src/devices/pic/xml_data/18F96J65.xml
index a61bb94..678e2f3 100644
--- a/src/devices/pic/xml_data/18F96J65.xml
+++ b/src/devices/pic/xml_data/18F96J65.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,49 +94,49 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="WAIT" value="0x80" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="Disabled" cname="" />
<value value="0x10" name="12BIT" cname="" />
<value value="0x20" name="16BIT" cname="" />
<value value="0x30" name="20BIT" cname="" />
- </mask>
- <mask name="EASHFT" value="0x08" >
+ </tqmask>
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
- <mask name="ETHLED" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="ETHLED" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="CCP2MX" value="0x04" >
+ </tqmask>
+ <tqmask name="CCP2MX" value="0x04" >
<value value="0x00" name="RE7" cname="" />
<value value="0x04" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/18F97J60.xml b/src/devices/pic/xml_data/18F97J60.xml
index ce570ba..a47d6d1 100644
--- a/src/devices/pic/xml_data/18F97J60.xml
+++ b/src/devices/pic/xml_data/18F97J60.xml
@@ -29,55 +29,55 @@
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0xE1" >
- <mask name="WDT" value="0x01" >
+ <config offset="0x0" name="CONFIG1L" wtqmask="0xFF" bvalue="0xE1" >
+ <tqmask name="WDT" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="STVREN" value="0x20" >
+ </tqmask>
+ <tqmask name="STVREN" value="0x20" >
<value value="0x00" name="Off" cname="" />
<value value="0x20" name="On" cname="" />
- </mask>
- <mask name="XINST" value="0x40" >
+ </tqmask>
+ <tqmask name="XINST" value="0x40" >
<value value="0x00" name="Off" cname="" />
<value value="0x40" name="On" cname="" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x1" name="CONFIG1H" wmask="0xF7" bvalue="0x04" >
- <mask name="CP" value="0x04" >
+ <config offset="0x1" name="CONFIG1H" wtqmask="0xF7" bvalue="0x04" >
+ <tqmask name="CP" value="0x04" >
<value value="0x00" name="All" cname="" />
<value value="0x04" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2L" wmask="0xFF" bvalue="0xC7" >
- <mask name="FOSC" value="0x03" >
+ <config offset="0x2" name="CONFIG2L" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="FOSC" value="0x03" >
<value value="0x00" name="HS" cname="" />
<value value="0x01" name="HSPLL" cname="" />
<value value="0x02" name="EC" cname="" />
<value value="0x03" name="ECPLL_IO" cname="" />
- </mask>
- <mask name="FOSC2" value="0x04" >
+ </tqmask>
+ <tqmask name="FOSC2" value="0x04" >
<value value="0x00" name="FOSC1:FOSC0" cname="" />
<value value="0x04" name="INTRC" cname="" />
- </mask>
- <mask name="FCMEN" value="0x40" >
+ </tqmask>
+ <tqmask name="FCMEN" value="0x40" >
<value value="0x00" name="On" cname="" />
<value value="0x40" name="Off" cname="" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x3" name="CONFIG2H" wmask="0xFF" bvalue="0x0F" >
- <mask name="WDTPS" value="0x0F" >
+ <config offset="0x3" name="CONFIG2H" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WDTPS" value="0x0F" >
<value value="0x00" name="1:1" cname="" />
<value value="0x01" name="1:2" cname="" />
<value value="0x02" name="1:4" cname="" />
@@ -94,49 +94,49 @@
<value value="0x0D" name="1:8192" cname="" />
<value value="0x0E" name="1:16384" cname="" />
<value value="0x0F" name="1:32768" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xF8" >
- <mask name="WAIT" value="0x80" >
+ <config offset="0x4" name="CONFIG3L" wtqmask="0xFF" bvalue="0xF8" >
+ <tqmask name="WAIT" value="0x80" >
<value value="0x00" name="On" cname="" />
<value value="0x80" name="Off" cname="" />
- </mask>
- <mask name="BW" value="0x40" >
+ </tqmask>
+ <tqmask name="BW" value="0x40" >
<value value="0x00" name="8" cname="" />
<value value="0x40" name="16" cname="" />
- </mask>
- <mask name="EMB" value="0x30" >
+ </tqmask>
+ <tqmask name="EMB" value="0x30" >
<value value="0x00" name="Disabled" cname="" />
<value value="0x10" name="12BIT" cname="" />
<value value="0x20" name="16BIT" cname="" />
<value value="0x30" name="20BIT" cname="" />
- </mask>
- <mask name="EASHFT" value="0x08" >
+ </tqmask>
+ <tqmask name="EASHFT" value="0x08" >
<value value="0x00" name="Off" cname="" />
<value value="0x08" name="On" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x07" >
- <mask name="ETHLED" value="0x01" >
+ <config offset="0x5" name="CONFIG3H" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="ETHLED" value="0x01" >
<value value="0x00" name="Off" cname="" />
<value value="0x01" name="On" cname="" />
- </mask>
- <mask name="ECCPMX" value="0x02" >
+ </tqmask>
+ <tqmask name="ECCPMX" value="0x02" >
<value value="0x00" name="RH7-RH4" cname="" />
<value value="0x02" name="RE6-RE3" cname="" />
- </mask>
- <mask name="CCP2MX" value="0x04" >
+ </tqmask>
+ <tqmask name="CCP2MX" value="0x04" >
<value value="0x00" name="RE7" cname="" />
<value value="0x04" name="RC1" cname="" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x6" name="CONFIG4L" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x7" name="CONFIG4H" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x7" name="CONFIG4H" wtqmask="0xFF" bvalue="0x00" >
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ128GA006.xml b/src/devices/pic/xml_data/24FJ128GA006.xml
index 7f264b9..a68bc37 100644
--- a/src/devices/pic/xml_data/24FJ128GA006.xml
+++ b/src/devices/pic/xml_data/24FJ128GA006.xml
@@ -24,13 +24,13 @@
<memory name="code" start="0x000200" end="0x0157FB" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0x0157FC" end="0x0157FF" />
-<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8007EF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
- <mask name="WDTPOST" value="0x00000F" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+ <tqmask name="WDTPOST" value="0x00000F" >
<value value="0x000000" name="1:1" />
<value value="0x000001" name="1:2" />
<value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
<value value="0x00000D" name="1:8192" />
<value value="0x00000E" name="1:16384" />
<value value="0x00000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x000010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x000010" >
<value value="0x000000" name="1:32" />
<value value="0x000010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x000040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x000040" >
<value value="0x000000" name="On" />
<value value="0x000040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x000080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x000080" >
<value value="0x000000" name="Software" />
<value value="0x000080" name="On" />
- </mask>
- <mask name="ICS" value="0x000100" >
+ </tqmask>
+ <tqmask name="ICS" value="0x000100" >
<value value="0x000000" name="EMUC1, EMUD1" />
<value value="0x000100" name="EMUC2, EMUD2" />
- </mask>
- <mask name="DEBUG" value="0x000800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x000800" >
<value value="0x000000" name="On" />
<value value="0x000800" name="Off" />
- </mask>
- <mask name="GWRP" value="0x001000" >
+ </tqmask>
+ <tqmask name="GWRP" value="0x001000" >
<value value="0x000000" name="All" />
<value value="0x001000" name="Off" />
- </mask>
- <mask name="GCP" value="0x002000" >
+ </tqmask>
+ <tqmask name="GCP" value="0x002000" >
<value value="0x000000" name="All" />
<value value="0x002000" name="Off" />
- </mask>
- <mask name="JTAGEN" value="0x004000" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x004000" >
<value value="0x000000" name="Off" />
<value value="0x004000" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
- <mask name="POSCMD" value="0x000003" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+ <tqmask name="POSCMD" value="0x000003" >
<value value="0x000000" name="EC" />
<value value="0x000001" name="XT" />
<value value="0x000002" name="HS" />
<value value="0x000003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x000020" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x000020" >
<value value="0x000000" name="IO" />
<value value="0x000020" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0x0000C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x0000C0" >
<value value="0x000000" name="Switching on, monitor on" />
<value value="0x000040" name="Switching on, monitor off" />
<value value="0x000080" name="Switching off, monitor off" />
<value value="0x0000C0" name="Switching off, monitor off" />
- </mask>
- <mask name="FNOSC" value="0x000700" >
+ </tqmask>
+ <tqmask name="FNOSC" value="0x000700" >
<value value="0x000000" name="EXTRC_F" />
<value value="0x000100" name="INTRC_F_PLL" />
<value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
<value value="0x000500" name="EXTRC_LP" />
<value value="0x000600" name="invalid" />
<value value="0x000700" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x008000" >
+ </tqmask>
+ <tqmask name="IESO" value="0x008000" >
<value value="0x000000" name="Off" />
<value value="0x008000" name="On" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ128GA008.xml b/src/devices/pic/xml_data/24FJ128GA008.xml
index b8d43d8..14e4f29 100644
--- a/src/devices/pic/xml_data/24FJ128GA008.xml
+++ b/src/devices/pic/xml_data/24FJ128GA008.xml
@@ -24,13 +24,13 @@
<memory name="code" start="0x000200" end="0x0157FB" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0x0157FC" end="0x0157FF" />
-<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8007EF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
- <mask name="WDTPOST" value="0x00000F" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+ <tqmask name="WDTPOST" value="0x00000F" >
<value value="0x000000" name="1:1" />
<value value="0x000001" name="1:2" />
<value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
<value value="0x00000D" name="1:8192" />
<value value="0x00000E" name="1:16384" />
<value value="0x00000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x000010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x000010" >
<value value="0x000000" name="1:32" />
<value value="0x000010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x000040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x000040" >
<value value="0x000000" name="On" />
<value value="0x000040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x000080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x000080" >
<value value="0x000000" name="Software" />
<value value="0x000080" name="On" />
- </mask>
- <mask name="ICS" value="0x000100" >
+ </tqmask>
+ <tqmask name="ICS" value="0x000100" >
<value value="0x000000" name="EMUC1, EMUD1" />
<value value="0x000100" name="EMUC2, EMUD2" />
- </mask>
- <mask name="DEBUG" value="0x000800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x000800" >
<value value="0x000000" name="On" />
<value value="0x000800" name="Off" />
- </mask>
- <mask name="GWRP" value="0x001000" >
+ </tqmask>
+ <tqmask name="GWRP" value="0x001000" >
<value value="0x000000" name="All" />
<value value="0x001000" name="Off" />
- </mask>
- <mask name="GCP" value="0x002000" >
+ </tqmask>
+ <tqmask name="GCP" value="0x002000" >
<value value="0x000000" name="All" />
<value value="0x002000" name="Off" />
- </mask>
- <mask name="JTAGEN" value="0x004000" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x004000" >
<value value="0x000000" name="Off" />
<value value="0x004000" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
- <mask name="POSCMD" value="0x000003" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+ <tqmask name="POSCMD" value="0x000003" >
<value value="0x000000" name="EC" />
<value value="0x000001" name="XT" />
<value value="0x000002" name="HS" />
<value value="0x000003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x000020" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x000020" >
<value value="0x000000" name="IO" />
<value value="0x000020" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0x0000C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x0000C0" >
<value value="0x000000" name="Switching on, monitor on" />
<value value="0x000040" name="Switching on, monitor off" />
<value value="0x000080" name="Switching off, monitor off" />
<value value="0x0000C0" name="Switching off, monitor off" />
- </mask>
- <mask name="FNOSC" value="0x000700" >
+ </tqmask>
+ <tqmask name="FNOSC" value="0x000700" >
<value value="0x000000" name="EXTRC_F" />
<value value="0x000100" name="INTRC_F_PLL" />
<value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
<value value="0x000500" name="EXTRC_LP" />
<value value="0x000600" name="invalid" />
<value value="0x000700" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x008000" >
+ </tqmask>
+ <tqmask name="IESO" value="0x008000" >
<value value="0x000000" name="Off" />
<value value="0x008000" name="On" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ128GA010.xml b/src/devices/pic/xml_data/24FJ128GA010.xml
index d57c7ff..cb01c2d 100644
--- a/src/devices/pic/xml_data/24FJ128GA010.xml
+++ b/src/devices/pic/xml_data/24FJ128GA010.xml
@@ -24,13 +24,13 @@
<memory name="code" start="0x000200" end="0x0157FB" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0x0157FC" end="0x0157FF" />
-<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8007EF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
- <mask name="WDTPOST" value="0x00000F" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+ <tqmask name="WDTPOST" value="0x00000F" >
<value value="0x000000" name="1:1" />
<value value="0x000001" name="1:2" />
<value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
<value value="0x00000D" name="1:8192" />
<value value="0x00000E" name="1:16384" />
<value value="0x00000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x000010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x000010" >
<value value="0x000000" name="1:32" />
<value value="0x000010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x000040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x000040" >
<value value="0x000000" name="On" />
<value value="0x000040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x000080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x000080" >
<value value="0x000000" name="Software" />
<value value="0x000080" name="On" />
- </mask>
- <mask name="ICS" value="0x000100" >
+ </tqmask>
+ <tqmask name="ICS" value="0x000100" >
<value value="0x000000" name="EMUC1, EMUD1" />
<value value="0x000100" name="EMUC2, EMUD2" />
- </mask>
- <mask name="DEBUG" value="0x000800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x000800" >
<value value="0x000000" name="On" />
<value value="0x000800" name="Off" />
- </mask>
- <mask name="GWRP" value="0x001000" >
+ </tqmask>
+ <tqmask name="GWRP" value="0x001000" >
<value value="0x000000" name="All" />
<value value="0x001000" name="Off" />
- </mask>
- <mask name="GCP" value="0x002000" >
+ </tqmask>
+ <tqmask name="GCP" value="0x002000" >
<value value="0x000000" name="All" />
<value value="0x002000" name="Off" />
- </mask>
- <mask name="JTAGEN" value="0x004000" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x004000" >
<value value="0x000000" name="Off" />
<value value="0x004000" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
- <mask name="POSCMD" value="0x000003" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+ <tqmask name="POSCMD" value="0x000003" >
<value value="0x000000" name="EC" />
<value value="0x000001" name="XT" />
<value value="0x000002" name="HS" />
<value value="0x000003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x000020" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x000020" >
<value value="0x000000" name="IO" />
<value value="0x000020" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0x0000C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x0000C0" >
<value value="0x000000" name="Switching on, monitor on" />
<value value="0x000040" name="Switching on, monitor off" />
<value value="0x000080" name="Switching off, monitor off" />
<value value="0x0000C0" name="Switching off, monitor off" />
- </mask>
- <mask name="FNOSC" value="0x000700" >
+ </tqmask>
+ <tqmask name="FNOSC" value="0x000700" >
<value value="0x000000" name="EXTRC_F" />
<value value="0x000100" name="INTRC_F_PLL" />
<value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
<value value="0x000500" name="EXTRC_LP" />
<value value="0x000600" name="invalid" />
<value value="0x000700" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x008000" >
+ </tqmask>
+ <tqmask name="IESO" value="0x008000" >
<value value="0x000000" name="Off" />
<value value="0x008000" name="On" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ64GA002.xml b/src/devices/pic/xml_data/24FJ64GA002.xml
index e051b07..90b9f05 100644
--- a/src/devices/pic/xml_data/24FJ64GA002.xml
+++ b/src/devices/pic/xml_data/24FJ64GA002.xml
@@ -24,13 +24,13 @@
<memory name="code" start="0x000200" end="0x00ABFB" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0x00ABFC" end="0x00ABFF" />
-<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8007EF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007FDF" >
- <mask name="WDTPOST" value="0x00000F" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007FDF" >
+ <tqmask name="WDTPOST" value="0x00000F" >
<value value="0x000000" name="1:1" />
<value value="0x000001" name="1:2" />
<value value="0x000002" name="1:4" />
@@ -47,69 +47,69 @@
<value value="0x00000D" name="1:8192" />
<value value="0x00000E" name="1:16384" />
<value value="0x00000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x000010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x000010" >
<value value="0x000000" name="1:32" />
<value value="0x000010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x000040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x000040" >
<value value="0x000000" name="On" />
<value value="0x000040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x000080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x000080" >
<value value="0x000000" name="Software" />
<value value="0x000080" name="On" />
- </mask>
- <mask name="ICS" value="0x000300" >
+ </tqmask>
+ <tqmask name="ICS" value="0x000300" >
<value value="0x000000" name="invalid" />
<value value="0x000100" name="EMUC3, EMUD3" />
<value value="0x000200" name="EMUC2, EMUD2" />
<value value="0x000300" name="EMUC1, EMUD1" />
- </mask>
- <mask name="DEBUG" value="0x000800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x000800" >
<value value="0x000000" name="On" />
<value value="0x000800" name="Off" />
- </mask>
- <mask name="GWRP" value="0x001000" >
+ </tqmask>
+ <tqmask name="GWRP" value="0x001000" >
<value value="0x000000" name="All" />
<value value="0x001000" name="Off" />
- </mask>
- <mask name="GCP" value="0x002000" >
+ </tqmask>
+ <tqmask name="GCP" value="0x002000" >
<value value="0x000000" name="All" />
<value value="0x002000" name="Off" />
- </mask>
- <mask name="JTAGEN" value="0x004000" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x004000" >
<value value="0x000000" name="Off" />
<value value="0x004000" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087F7" >
- <mask name="POSCMD" value="0x000003" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087F7" >
+ <tqmask name="POSCMD" value="0x000003" >
<value value="0x000000" name="EC" />
<value value="0x000001" name="XT" />
<value value="0x000002" name="HS" />
<value value="0x000003" name="Off" />
- </mask>
- <mask name="I2C1SEL" value="0x000004" >
+ </tqmask>
+ <tqmask name="I2C1SEL" value="0x000004" >
<value value="0x000000" name="Alternate" />
<value value="0x000004" name="Default" />
- </mask>
- <mask name="IOL1WAY" value="0x000010" >
+ </tqmask>
+ <tqmask name="IOL1WAY" value="0x000010" >
<value value="0x000000" name="Multiple reconfigurations" />
<value value="0x000010" name="One reconfiguration" />
- </mask>
- <mask name="OSCIOFNC" value="0x000020" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x000020" >
<value value="0x000000" name="IO" />
<value value="0x000020" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0x0000C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x0000C0" >
<value value="0x000000" name="Switching on, monitor on" />
<value value="0x000040" name="Switching on, monitor off" />
<value value="0x000080" name="Switching off, monitor off" />
<value value="0x0000C0" name="Switching off, monitor off" />
- </mask>
- <mask name="FNOSC" value="0x000700" >
+ </tqmask>
+ <tqmask name="FNOSC" value="0x000700" >
<value value="0x000000" name="EXTRC_F" />
<value value="0x000100" name="INTRC_F_PLL" />
<value value="0x000200" name="PRIM" />
@@ -118,11 +118,11 @@
<value value="0x000500" name="EXTRC_LP" />
<value value="0x000600" name="invalid" />
<value value="0x000700" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x008000" >
+ </tqmask>
+ <tqmask name="IESO" value="0x008000" >
<value value="0x000000" name="Off" />
<value value="0x008000" name="On" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ64GA004.xml b/src/devices/pic/xml_data/24FJ64GA004.xml
index c87748e..8cda66c 100644
--- a/src/devices/pic/xml_data/24FJ64GA004.xml
+++ b/src/devices/pic/xml_data/24FJ64GA004.xml
@@ -24,13 +24,13 @@
<memory name="code" start="0x000200" end="0x00ABFB" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0x00ABFC" end="0x00ABFF" />
-<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8007EF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007FDF" >
- <mask name="WDTPOST" value="0x00000F" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007FDF" >
+ <tqmask name="WDTPOST" value="0x00000F" >
<value value="0x000000" name="1:1" />
<value value="0x000001" name="1:2" />
<value value="0x000002" name="1:4" />
@@ -47,69 +47,69 @@
<value value="0x00000D" name="1:8192" />
<value value="0x00000E" name="1:16384" />
<value value="0x00000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x000010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x000010" >
<value value="0x000000" name="1:32" />
<value value="0x000010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x000040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x000040" >
<value value="0x000000" name="On" />
<value value="0x000040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x000080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x000080" >
<value value="0x000000" name="Software" />
<value value="0x000080" name="On" />
- </mask>
- <mask name="ICS" value="0x000300" >
+ </tqmask>
+ <tqmask name="ICS" value="0x000300" >
<value value="0x000000" name="invalid" />
<value value="0x000100" name="EMUC3, EMUD3" />
<value value="0x000200" name="EMUC2, EMUD2" />
<value value="0x000300" name="EMUC1, EMUD1" />
- </mask>
- <mask name="DEBUG" value="0x000800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x000800" >
<value value="0x000000" name="On" />
<value value="0x000800" name="Off" />
- </mask>
- <mask name="GWRP" value="0x001000" >
+ </tqmask>
+ <tqmask name="GWRP" value="0x001000" >
<value value="0x000000" name="All" />
<value value="0x001000" name="Off" />
- </mask>
- <mask name="GCP" value="0x002000" >
+ </tqmask>
+ <tqmask name="GCP" value="0x002000" >
<value value="0x000000" name="All" />
<value value="0x002000" name="Off" />
- </mask>
- <mask name="JTAGEN" value="0x004000" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x004000" >
<value value="0x000000" name="Off" />
<value value="0x004000" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087F7" >
- <mask name="POSCMD" value="0x000003" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087F7" >
+ <tqmask name="POSCMD" value="0x000003" >
<value value="0x000000" name="EC" />
<value value="0x000001" name="XT" />
<value value="0x000002" name="HS" />
<value value="0x000003" name="Off" />
- </mask>
- <mask name="I2C1SEL" value="0x000004" >
+ </tqmask>
+ <tqmask name="I2C1SEL" value="0x000004" >
<value value="0x000000" name="Alternate" />
<value value="0x000004" name="Default" />
- </mask>
- <mask name="IOL1WAY" value="0x000010" >
+ </tqmask>
+ <tqmask name="IOL1WAY" value="0x000010" >
<value value="0x000000" name="Multiple reconfigurations" />
<value value="0x000010" name="One reconfiguration" />
- </mask>
- <mask name="OSCIOFNC" value="0x000020" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x000020" >
<value value="0x000000" name="IO" />
<value value="0x000020" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0x0000C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x0000C0" >
<value value="0x000000" name="Switching on, monitor on" />
<value value="0x000040" name="Switching on, monitor off" />
<value value="0x000080" name="Switching off, monitor off" />
<value value="0x0000C0" name="Switching off, monitor off" />
- </mask>
- <mask name="FNOSC" value="0x000700" >
+ </tqmask>
+ <tqmask name="FNOSC" value="0x000700" >
<value value="0x000000" name="EXTRC_F" />
<value value="0x000100" name="INTRC_F_PLL" />
<value value="0x000200" name="PRIM" />
@@ -118,11 +118,11 @@
<value value="0x000500" name="EXTRC_LP" />
<value value="0x000600" name="invalid" />
<value value="0x000700" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x008000" >
+ </tqmask>
+ <tqmask name="IESO" value="0x008000" >
<value value="0x000000" name="Off" />
<value value="0x008000" name="On" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ64GA006.xml b/src/devices/pic/xml_data/24FJ64GA006.xml
index 6492f51..dab1819 100644
--- a/src/devices/pic/xml_data/24FJ64GA006.xml
+++ b/src/devices/pic/xml_data/24FJ64GA006.xml
@@ -24,13 +24,13 @@
<memory name="code" start="0x000200" end="0x00ABFB" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0x00ABFC" end="0x00ABFF" />
-<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8007EF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
- <mask name="WDTPOST" value="0x00000F" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+ <tqmask name="WDTPOST" value="0x00000F" >
<value value="0x000000" name="1:1" />
<value value="0x000001" name="1:2" />
<value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
<value value="0x00000D" name="1:8192" />
<value value="0x00000E" name="1:16384" />
<value value="0x00000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x000010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x000010" >
<value value="0x000000" name="1:32" />
<value value="0x000010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x000040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x000040" >
<value value="0x000000" name="On" />
<value value="0x000040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x000080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x000080" >
<value value="0x000000" name="Software" />
<value value="0x000080" name="On" />
- </mask>
- <mask name="ICS" value="0x000100" >
+ </tqmask>
+ <tqmask name="ICS" value="0x000100" >
<value value="0x000000" name="EMUC1, EMUD1" />
<value value="0x000100" name="EMUC2, EMUD2" />
- </mask>
- <mask name="DEBUG" value="0x000800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x000800" >
<value value="0x000000" name="On" />
<value value="0x000800" name="Off" />
- </mask>
- <mask name="GWRP" value="0x001000" >
+ </tqmask>
+ <tqmask name="GWRP" value="0x001000" >
<value value="0x000000" name="All" />
<value value="0x001000" name="Off" />
- </mask>
- <mask name="GCP" value="0x002000" >
+ </tqmask>
+ <tqmask name="GCP" value="0x002000" >
<value value="0x000000" name="All" />
<value value="0x002000" name="Off" />
- </mask>
- <mask name="JTAGEN" value="0x004000" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x004000" >
<value value="0x000000" name="Off" />
<value value="0x004000" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
- <mask name="POSCMD" value="0x000003" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+ <tqmask name="POSCMD" value="0x000003" >
<value value="0x000000" name="EC" />
<value value="0x000001" name="XT" />
<value value="0x000002" name="HS" />
<value value="0x000003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x000020" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x000020" >
<value value="0x000000" name="IO" />
<value value="0x000020" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0x0000C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x0000C0" >
<value value="0x000000" name="Switching on, monitor on" />
<value value="0x000040" name="Switching on, monitor off" />
<value value="0x000080" name="Switching off, monitor off" />
<value value="0x0000C0" name="Switching off, monitor off" />
- </mask>
- <mask name="FNOSC" value="0x000700" >
+ </tqmask>
+ <tqmask name="FNOSC" value="0x000700" >
<value value="0x000000" name="EXTRC_F" />
<value value="0x000100" name="INTRC_F_PLL" />
<value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
<value value="0x000500" name="EXTRC_LP" />
<value value="0x000600" name="invalid" />
<value value="0x000700" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x008000" >
+ </tqmask>
+ <tqmask name="IESO" value="0x008000" >
<value value="0x000000" name="Off" />
<value value="0x008000" name="On" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ64GA008.xml b/src/devices/pic/xml_data/24FJ64GA008.xml
index 2ead302..5149c82 100644
--- a/src/devices/pic/xml_data/24FJ64GA008.xml
+++ b/src/devices/pic/xml_data/24FJ64GA008.xml
@@ -24,13 +24,13 @@
<memory name="code" start="0x000200" end="0x00ABFB" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0x00ABFC" end="0x00ABFF" />
-<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8007EF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
- <mask name="WDTPOST" value="0x00000F" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+ <tqmask name="WDTPOST" value="0x00000F" >
<value value="0x000000" name="1:1" />
<value value="0x000001" name="1:2" />
<value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
<value value="0x00000D" name="1:8192" />
<value value="0x00000E" name="1:16384" />
<value value="0x00000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x000010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x000010" >
<value value="0x000000" name="1:32" />
<value value="0x000010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x000040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x000040" >
<value value="0x000000" name="On" />
<value value="0x000040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x000080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x000080" >
<value value="0x000000" name="Software" />
<value value="0x000080" name="On" />
- </mask>
- <mask name="ICS" value="0x000100" >
+ </tqmask>
+ <tqmask name="ICS" value="0x000100" >
<value value="0x000000" name="EMUC1, EMUD1" />
<value value="0x000100" name="EMUC2, EMUD2" />
- </mask>
- <mask name="DEBUG" value="0x000800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x000800" >
<value value="0x000000" name="On" />
<value value="0x000800" name="Off" />
- </mask>
- <mask name="GWRP" value="0x001000" >
+ </tqmask>
+ <tqmask name="GWRP" value="0x001000" >
<value value="0x000000" name="All" />
<value value="0x001000" name="Off" />
- </mask>
- <mask name="GCP" value="0x002000" >
+ </tqmask>
+ <tqmask name="GCP" value="0x002000" >
<value value="0x000000" name="All" />
<value value="0x002000" name="Off" />
- </mask>
- <mask name="JTAGEN" value="0x004000" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x004000" >
<value value="0x000000" name="Off" />
<value value="0x004000" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
- <mask name="POSCMD" value="0x000003" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+ <tqmask name="POSCMD" value="0x000003" >
<value value="0x000000" name="EC" />
<value value="0x000001" name="XT" />
<value value="0x000002" name="HS" />
<value value="0x000003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x000020" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x000020" >
<value value="0x000000" name="IO" />
<value value="0x000020" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0x0000C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x0000C0" >
<value value="0x000000" name="Switching on, monitor on" />
<value value="0x000040" name="Switching on, monitor off" />
<value value="0x000080" name="Switching off, monitor off" />
<value value="0x0000C0" name="Switching off, monitor off" />
- </mask>
- <mask name="FNOSC" value="0x000700" >
+ </tqmask>
+ <tqmask name="FNOSC" value="0x000700" >
<value value="0x000000" name="EXTRC_F" />
<value value="0x000100" name="INTRC_F_PLL" />
<value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
<value value="0x000500" name="EXTRC_LP" />
<value value="0x000600" name="invalid" />
<value value="0x000700" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x008000" >
+ </tqmask>
+ <tqmask name="IESO" value="0x008000" >
<value value="0x000000" name="Off" />
<value value="0x008000" name="On" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ64GA010.xml b/src/devices/pic/xml_data/24FJ64GA010.xml
index 627da04..43f2806 100644
--- a/src/devices/pic/xml_data/24FJ64GA010.xml
+++ b/src/devices/pic/xml_data/24FJ64GA010.xml
@@ -24,13 +24,13 @@
<memory name="code" start="0x000200" end="0x00ABFB" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0x00ABFC" end="0x00ABFF" />
-<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8007EF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
- <mask name="WDTPOST" value="0x00000F" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+ <tqmask name="WDTPOST" value="0x00000F" >
<value value="0x000000" name="1:1" />
<value value="0x000001" name="1:2" />
<value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
<value value="0x00000D" name="1:8192" />
<value value="0x00000E" name="1:16384" />
<value value="0x00000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x000010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x000010" >
<value value="0x000000" name="1:32" />
<value value="0x000010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x000040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x000040" >
<value value="0x000000" name="On" />
<value value="0x000040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x000080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x000080" >
<value value="0x000000" name="Software" />
<value value="0x000080" name="On" />
- </mask>
- <mask name="ICS" value="0x000100" >
+ </tqmask>
+ <tqmask name="ICS" value="0x000100" >
<value value="0x000000" name="EMUC1, EMUD1" />
<value value="0x000100" name="EMUC2, EMUD2" />
- </mask>
- <mask name="DEBUG" value="0x000800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x000800" >
<value value="0x000000" name="On" />
<value value="0x000800" name="Off" />
- </mask>
- <mask name="GWRP" value="0x001000" >
+ </tqmask>
+ <tqmask name="GWRP" value="0x001000" >
<value value="0x000000" name="All" />
<value value="0x001000" name="Off" />
- </mask>
- <mask name="GCP" value="0x002000" >
+ </tqmask>
+ <tqmask name="GCP" value="0x002000" >
<value value="0x000000" name="All" />
<value value="0x002000" name="Off" />
- </mask>
- <mask name="JTAGEN" value="0x004000" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x004000" >
<value value="0x000000" name="Off" />
<value value="0x004000" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
- <mask name="POSCMD" value="0x000003" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+ <tqmask name="POSCMD" value="0x000003" >
<value value="0x000000" name="EC" />
<value value="0x000001" name="XT" />
<value value="0x000002" name="HS" />
<value value="0x000003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x000020" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x000020" >
<value value="0x000000" name="IO" />
<value value="0x000020" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0x0000C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x0000C0" >
<value value="0x000000" name="Switching on, monitor on" />
<value value="0x000040" name="Switching on, monitor off" />
<value value="0x000080" name="Switching off, monitor off" />
<value value="0x0000C0" name="Switching off, monitor off" />
- </mask>
- <mask name="FNOSC" value="0x000700" >
+ </tqmask>
+ <tqmask name="FNOSC" value="0x000700" >
<value value="0x000000" name="EXTRC_F" />
<value value="0x000100" name="INTRC_F_PLL" />
<value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
<value value="0x000500" name="EXTRC_LP" />
<value value="0x000600" name="invalid" />
<value value="0x000700" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x008000" >
+ </tqmask>
+ <tqmask name="IESO" value="0x008000" >
<value value="0x000000" name="Off" />
<value value="0x008000" name="On" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ96GA006.xml b/src/devices/pic/xml_data/24FJ96GA006.xml
index 9f02be4..2b17512 100644
--- a/src/devices/pic/xml_data/24FJ96GA006.xml
+++ b/src/devices/pic/xml_data/24FJ96GA006.xml
@@ -24,13 +24,13 @@
<memory name="code" start="0x000200" end="0x00FFFB" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0x00FFFC" end="0x00FFFF" />
-<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8007EF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
- <mask name="WDTPOST" value="0x00000F" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+ <tqmask name="WDTPOST" value="0x00000F" >
<value value="0x000000" name="1:1" />
<value value="0x000001" name="1:2" />
<value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
<value value="0x00000D" name="1:8192" />
<value value="0x00000E" name="1:16384" />
<value value="0x00000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x000010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x000010" >
<value value="0x000000" name="1:32" />
<value value="0x000010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x000040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x000040" >
<value value="0x000000" name="On" />
<value value="0x000040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x000080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x000080" >
<value value="0x000000" name="Software" />
<value value="0x000080" name="On" />
- </mask>
- <mask name="ICS" value="0x000100" >
+ </tqmask>
+ <tqmask name="ICS" value="0x000100" >
<value value="0x000000" name="EMUC1, EMUD1" />
<value value="0x000100" name="EMUC2, EMUD2" />
- </mask>
- <mask name="DEBUG" value="0x000800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x000800" >
<value value="0x000000" name="On" />
<value value="0x000800" name="Off" />
- </mask>
- <mask name="GWRP" value="0x001000" >
+ </tqmask>
+ <tqmask name="GWRP" value="0x001000" >
<value value="0x000000" name="All" />
<value value="0x001000" name="Off" />
- </mask>
- <mask name="GCP" value="0x002000" >
+ </tqmask>
+ <tqmask name="GCP" value="0x002000" >
<value value="0x000000" name="All" />
<value value="0x002000" name="Off" />
- </mask>
- <mask name="JTAGEN" value="0x004000" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x004000" >
<value value="0x000000" name="Off" />
<value value="0x004000" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
- <mask name="POSCMD" value="0x000003" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+ <tqmask name="POSCMD" value="0x000003" >
<value value="0x000000" name="EC" />
<value value="0x000001" name="XT" />
<value value="0x000002" name="HS" />
<value value="0x000003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x000020" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x000020" >
<value value="0x000000" name="IO" />
<value value="0x000020" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0x0000C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x0000C0" >
<value value="0x000000" name="Switching on, monitor on" />
<value value="0x000040" name="Switching on, monitor off" />
<value value="0x000080" name="Switching off, monitor off" />
<value value="0x0000C0" name="Switching off, monitor off" />
- </mask>
- <mask name="FNOSC" value="0x000700" >
+ </tqmask>
+ <tqmask name="FNOSC" value="0x000700" >
<value value="0x000000" name="EXTRC_F" />
<value value="0x000100" name="INTRC_F_PLL" />
<value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
<value value="0x000500" name="EXTRC_LP" />
<value value="0x000600" name="invalid" />
<value value="0x000700" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x008000" >
+ </tqmask>
+ <tqmask name="IESO" value="0x008000" >
<value value="0x000000" name="Off" />
<value value="0x008000" name="On" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ96GA008.xml b/src/devices/pic/xml_data/24FJ96GA008.xml
index eeba6d2..ee3212e 100644
--- a/src/devices/pic/xml_data/24FJ96GA008.xml
+++ b/src/devices/pic/xml_data/24FJ96GA008.xml
@@ -24,13 +24,13 @@
<memory name="code" start="0x000200" end="0x00FFFB" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0x00FFFC" end="0x00FFFF" />
-<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8007EF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
- <mask name="WDTPOST" value="0x00000F" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+ <tqmask name="WDTPOST" value="0x00000F" >
<value value="0x000000" name="1:1" />
<value value="0x000001" name="1:2" />
<value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
<value value="0x00000D" name="1:8192" />
<value value="0x00000E" name="1:16384" />
<value value="0x00000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x000010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x000010" >
<value value="0x000000" name="1:32" />
<value value="0x000010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x000040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x000040" >
<value value="0x000000" name="On" />
<value value="0x000040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x000080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x000080" >
<value value="0x000000" name="Software" />
<value value="0x000080" name="On" />
- </mask>
- <mask name="ICS" value="0x000100" >
+ </tqmask>
+ <tqmask name="ICS" value="0x000100" >
<value value="0x000000" name="EMUC1, EMUD1" />
<value value="0x000100" name="EMUC2, EMUD2" />
- </mask>
- <mask name="DEBUG" value="0x000800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x000800" >
<value value="0x000000" name="On" />
<value value="0x000800" name="Off" />
- </mask>
- <mask name="GWRP" value="0x001000" >
+ </tqmask>
+ <tqmask name="GWRP" value="0x001000" >
<value value="0x000000" name="All" />
<value value="0x001000" name="Off" />
- </mask>
- <mask name="GCP" value="0x002000" >
+ </tqmask>
+ <tqmask name="GCP" value="0x002000" >
<value value="0x000000" name="All" />
<value value="0x002000" name="Off" />
- </mask>
- <mask name="JTAGEN" value="0x004000" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x004000" >
<value value="0x000000" name="Off" />
<value value="0x004000" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
- <mask name="POSCMD" value="0x000003" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+ <tqmask name="POSCMD" value="0x000003" >
<value value="0x000000" name="EC" />
<value value="0x000001" name="XT" />
<value value="0x000002" name="HS" />
<value value="0x000003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x000020" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x000020" >
<value value="0x000000" name="IO" />
<value value="0x000020" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0x0000C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x0000C0" >
<value value="0x000000" name="Switching on, monitor on" />
<value value="0x000040" name="Switching on, monitor off" />
<value value="0x000080" name="Switching off, monitor off" />
<value value="0x0000C0" name="Switching off, monitor off" />
- </mask>
- <mask name="FNOSC" value="0x000700" >
+ </tqmask>
+ <tqmask name="FNOSC" value="0x000700" >
<value value="0x000000" name="EXTRC_F" />
<value value="0x000100" name="INTRC_F_PLL" />
<value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
<value value="0x000500" name="EXTRC_LP" />
<value value="0x000600" name="invalid" />
<value value="0x000700" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x008000" >
+ </tqmask>
+ <tqmask name="IESO" value="0x008000" >
<value value="0x000000" name="Off" />
<value value="0x008000" name="On" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24FJ96GA010.xml b/src/devices/pic/xml_data/24FJ96GA010.xml
index 700d288..e609719 100644
--- a/src/devices/pic/xml_data/24FJ96GA010.xml
+++ b/src/devices/pic/xml_data/24FJ96GA010.xml
@@ -24,13 +24,13 @@
<memory name="code" start="0x000200" end="0x00FFFB" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0x00FFFC" end="0x00FFFF" />
-<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFFFF" /> -->
+<!-- <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFFFF" /> -->
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8007EF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="CONFIG1" wmask="0xFFFFFF" bvalue="0x007DDF" >
- <mask name="WDTPOST" value="0x00000F" >
+ <config offset="0x0" name="CONFIG1" wtqmask="0xFFFFFF" bvalue="0x007DDF" >
+ <tqmask name="WDTPOST" value="0x00000F" >
<value value="0x000000" name="1:1" />
<value value="0x000001" name="1:2" />
<value value="0x000002" name="1:4" />
@@ -47,59 +47,59 @@
<value value="0x00000D" name="1:8192" />
<value value="0x00000E" name="1:16384" />
<value value="0x00000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x000010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x000010" >
<value value="0x000000" name="1:32" />
<value value="0x000010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x000040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x000040" >
<value value="0x000000" name="On" />
<value value="0x000040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x000080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x000080" >
<value value="0x000000" name="Software" />
<value value="0x000080" name="On" />
- </mask>
- <mask name="ICS" value="0x000100" >
+ </tqmask>
+ <tqmask name="ICS" value="0x000100" >
<value value="0x000000" name="EMUC1, EMUD1" />
<value value="0x000100" name="EMUC2, EMUD2" />
- </mask>
- <mask name="DEBUG" value="0x000800" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x000800" >
<value value="0x000000" name="On" />
<value value="0x000800" name="Off" />
- </mask>
- <mask name="GWRP" value="0x001000" >
+ </tqmask>
+ <tqmask name="GWRP" value="0x001000" >
<value value="0x000000" name="All" />
<value value="0x001000" name="Off" />
- </mask>
- <mask name="GCP" value="0x002000" >
+ </tqmask>
+ <tqmask name="GCP" value="0x002000" >
<value value="0x000000" name="All" />
<value value="0x002000" name="Off" />
- </mask>
- <mask name="JTAGEN" value="0x004000" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x004000" >
<value value="0x000000" name="Off" />
<value value="0x004000" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="CONFIG2" wmask="0xFFFFFF" bvalue="0x0087E3" >
- <mask name="POSCMD" value="0x000003" >
+ <config offset="0x2" name="CONFIG2" wtqmask="0xFFFFFF" bvalue="0x0087E3" >
+ <tqmask name="POSCMD" value="0x000003" >
<value value="0x000000" name="EC" />
<value value="0x000001" name="XT" />
<value value="0x000002" name="HS" />
<value value="0x000003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x000020" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x000020" >
<value value="0x000000" name="IO" />
<value value="0x000020" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0x0000C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x0000C0" >
<value value="0x000000" name="Switching on, monitor on" />
<value value="0x000040" name="Switching on, monitor off" />
<value value="0x000080" name="Switching off, monitor off" />
<value value="0x0000C0" name="Switching off, monitor off" />
- </mask>
- <mask name="FNOSC" value="0x000700" >
+ </tqmask>
+ <tqmask name="FNOSC" value="0x000700" >
<value value="0x000000" name="EXTRC_F" />
<value value="0x000100" name="INTRC_F_PLL" />
<value value="0x000200" name="PRIM" />
@@ -108,11 +108,11 @@
<value value="0x000500" name="EXTRC_LP" />
<value value="0x000600" name="invalid" />
<value value="0x000700" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x008000" >
+ </tqmask>
+ <tqmask name="IESO" value="0x008000" >
<value value="0x000000" name="Off" />
<value value="0x008000" name="On" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP206.xml b/src/devices/pic/xml_data/24HJ128GP206.xml
index c065e99..60c824c 100644
--- a/src/devices/pic/xml_data/24HJ128GP206.xml
+++ b/src/devices/pic/xml_data/24HJ128GP206.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x0157FF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="32768" />
<value value="0x02" name="16384" />
<value value="0x04" name="8192" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP210.xml b/src/devices/pic/xml_data/24HJ128GP210.xml
index b0922d0..6e1983d 100644
--- a/src/devices/pic/xml_data/24HJ128GP210.xml
+++ b/src/devices/pic/xml_data/24HJ128GP210.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x0157FF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="32768" />
<value value="0x02" name="16384" />
<value value="0x04" name="8192" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP306.xml b/src/devices/pic/xml_data/24HJ128GP306.xml
index 97f23e1..7e8f67e 100644
--- a/src/devices/pic/xml_data/24HJ128GP306.xml
+++ b/src/devices/pic/xml_data/24HJ128GP306.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x0157FF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="32768" />
<value value="0x02" name="16384" />
<value value="0x04" name="8192" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP310.xml b/src/devices/pic/xml_data/24HJ128GP310.xml
index a600601..8e148b0 100644
--- a/src/devices/pic/xml_data/24HJ128GP310.xml
+++ b/src/devices/pic/xml_data/24HJ128GP310.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x0157FF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="32768" />
<value value="0x02" name="16384" />
<value value="0x04" name="8192" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP506.xml b/src/devices/pic/xml_data/24HJ128GP506.xml
index ae2fd06..ddb2d13 100644
--- a/src/devices/pic/xml_data/24HJ128GP506.xml
+++ b/src/devices/pic/xml_data/24HJ128GP506.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x0157FF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="32768" />
<value value="0x02" name="16384" />
<value value="0x04" name="8192" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ128GP510.xml b/src/devices/pic/xml_data/24HJ128GP510.xml
index 7195e60..80a0f24 100644
--- a/src/devices/pic/xml_data/24HJ128GP510.xml
+++ b/src/devices/pic/xml_data/24HJ128GP510.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x0157FF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="32768" />
<value value="0x02" name="16384" />
<value value="0x04" name="8192" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ12GP201.xml b/src/devices/pic/xml_data/24HJ12GP201.xml
index b0c3357..3dccc43 100644
--- a/src/devices/pic/xml_data/24HJ12GP201.xml
+++ b/src/devices/pic/xml_data/24HJ12GP201.xml
@@ -21,46 +21,46 @@
<memory name="code" start="0x000200" end="0x001FFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="1792" />
<value value="0x02" name="768" />
<value value="0x04" name="256" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -69,38 +69,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="IOL1WAY" value="0x20" >
+ </tqmask>
+ <tqmask name="IOL1WAY" value="0x20" >
<value value="0x00" name="Multiple reconfigurations" />
<value value="0x20" name="One reconfiguration" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -117,23 +117,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -142,32 +142,32 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
- <mask name="ALTI2C" value="0x10" >
+ </tqmask>
+ <tqmask name="ALTI2C" value="0x10" >
<value value="0x00" name="ASDA1/ASCL1" />
<value value="0x10" name="SDA1/SCL1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ12GP202.xml b/src/devices/pic/xml_data/24HJ12GP202.xml
index 60fdce8..10dfdbb 100644
--- a/src/devices/pic/xml_data/24HJ12GP202.xml
+++ b/src/devices/pic/xml_data/24HJ12GP202.xml
@@ -21,46 +21,46 @@
<memory name="code" start="0x000200" end="0x001FFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="1792" />
<value value="0x02" name="768" />
<value value="0x04" name="256" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -69,38 +69,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="IOL1WAY" value="0x20" >
+ </tqmask>
+ <tqmask name="IOL1WAY" value="0x20" >
<value value="0x00" name="Multiple reconfigurations" />
<value value="0x20" name="One reconfiguration" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -117,23 +117,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -142,32 +142,32 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
- <mask name="ALTI2C" value="0x10" >
+ </tqmask>
+ <tqmask name="ALTI2C" value="0x10" >
<value value="0x00" name="ASDA1/ASCL1" />
<value value="0x10" name="SDA1/SCL1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ16GP304.xml b/src/devices/pic/xml_data/24HJ16GP304.xml
index f4d50d8..09096ec 100644
--- a/src/devices/pic/xml_data/24HJ16GP304.xml
+++ b/src/devices/pic/xml_data/24HJ16GP304.xml
@@ -24,46 +24,46 @@
<memory name="code" start="0x000200" end="0x002BFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="1792" />
<value value="0x02" name="768" />
<value value="0x04" name="256" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -72,38 +72,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="IOL1WAY" value="0x20" >
+ </tqmask>
+ <tqmask name="IOL1WAY" value="0x20" >
<value value="0x00" name="Multiple reconfigurations" />
<value value="0x20" name="One reconfiguration" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -120,23 +120,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -145,32 +145,32 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
- <mask name="ALTI2C" value="0x10" >
+ </tqmask>
+ <tqmask name="ALTI2C" value="0x10" >
<value value="0x00" name="ASDA1/ASCL1" />
<value value="0x10" name="SDA1/SCL1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ256GP206.xml b/src/devices/pic/xml_data/24HJ256GP206.xml
index d977b29..3335305 100644
--- a/src/devices/pic/xml_data/24HJ256GP206.xml
+++ b/src/devices/pic/xml_data/24HJ256GP206.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x02ABFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="32768" />
<value value="0x02" name="16384" />
<value value="0x04" name="8192" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ256GP210.xml b/src/devices/pic/xml_data/24HJ256GP210.xml
index 000bc00..60f9102 100644
--- a/src/devices/pic/xml_data/24HJ256GP210.xml
+++ b/src/devices/pic/xml_data/24HJ256GP210.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x02ABFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="32768" />
<value value="0x02" name="16384" />
<value value="0x04" name="8192" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ256GP610.xml b/src/devices/pic/xml_data/24HJ256GP610.xml
index 4c1e714..3189c39 100644
--- a/src/devices/pic/xml_data/24HJ256GP610.xml
+++ b/src/devices/pic/xml_data/24HJ256GP610.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x02ABFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="32768" />
<value value="0x02" name="16384" />
<value value="0x04" name="8192" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ32GP202.xml b/src/devices/pic/xml_data/24HJ32GP202.xml
index d93607a..6f67086 100644
--- a/src/devices/pic/xml_data/24HJ32GP202.xml
+++ b/src/devices/pic/xml_data/24HJ32GP202.xml
@@ -24,46 +24,46 @@
<memory name="code" start="0x000200" end="0x0057FF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="1792" />
<value value="0x02" name="768" />
<value value="0x04" name="256" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -72,38 +72,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="IOL1WAY" value="0x20" >
+ </tqmask>
+ <tqmask name="IOL1WAY" value="0x20" >
<value value="0x00" name="Multiple reconfigurations" />
<value value="0x20" name="One reconfiguration" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -120,23 +120,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -145,32 +145,32 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
- <mask name="ALTI2C" value="0x10" >
+ </tqmask>
+ <tqmask name="ALTI2C" value="0x10" >
<value value="0x00" name="ASDA1/ASCL1" />
<value value="0x10" name="SDA1/SCL1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ32GP204.xml b/src/devices/pic/xml_data/24HJ32GP204.xml
index 5a9e126..40d90b2 100644
--- a/src/devices/pic/xml_data/24HJ32GP204.xml
+++ b/src/devices/pic/xml_data/24HJ32GP204.xml
@@ -24,46 +24,46 @@
<memory name="code" start="0x000200" end="0x0057FF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0x0F" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0x0F" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="1792" />
<value value="0x02" name="768" />
<value value="0x04" name="256" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="reserved" wmask="0xFF" bvalue="0x00" >
+ <config offset="0x2" name="reserved" wtqmask="0xFF" bvalue="0x00" >
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0x87" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0x87" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -72,38 +72,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="IOL1WAY" value="0x20" >
+ </tqmask>
+ <tqmask name="IOL1WAY" value="0x20" >
<value value="0x00" name="Multiple reconfigurations" />
<value value="0x20" name="One reconfiguration" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -120,23 +120,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x17" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x17" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -145,32 +145,32 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
- <mask name="ALTI2C" value="0x10" >
+ </tqmask>
+ <tqmask name="ALTI2C" value="0x10" >
<value value="0x00" name="ASDA1/ASCL1" />
<value value="0x10" name="SDA1/SCL1" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ64GP206.xml b/src/devices/pic/xml_data/24HJ64GP206.xml
index a3266fa..42b47d2 100644
--- a/src/devices/pic/xml_data/24HJ64GP206.xml
+++ b/src/devices/pic/xml_data/24HJ64GP206.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x00ABFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="16384" />
<value value="0x02" name="8192" />
<value value="0x04" name="4096" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ64GP210.xml b/src/devices/pic/xml_data/24HJ64GP210.xml
index 630a12a..734ce51 100644
--- a/src/devices/pic/xml_data/24HJ64GP210.xml
+++ b/src/devices/pic/xml_data/24HJ64GP210.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x00ABFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="16384" />
<value value="0x02" name="8192" />
<value value="0x04" name="4096" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ64GP506.xml b/src/devices/pic/xml_data/24HJ64GP506.xml
index 372c767..74a6cfa 100644
--- a/src/devices/pic/xml_data/24HJ64GP506.xml
+++ b/src/devices/pic/xml_data/24HJ64GP506.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x00ABFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="16384" />
<value value="0x02" name="8192" />
<value value="0x04" name="4096" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/24HJ64GP510.xml b/src/devices/pic/xml_data/24HJ64GP510.xml
index 8711793..099ab2a 100644
--- a/src/devices/pic/xml_data/24HJ64GP510.xml
+++ b/src/devices/pic/xml_data/24HJ64GP510.xml
@@ -21,72 +21,72 @@
<memory name="code" start="0x000200" end="0x00ABFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0xF80010" end="0xF80018" rmask="0xFF" />
+ <memory name="user_ids" start="0xF80010" end="0xF80018" rtqmask="0xFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x800FFF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FBS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTBS" value="0x01" >
+ <config offset="0x0" name="FBS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTBS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x06" >
<value value="0x00" name="8192" />
<value value="0x02" name="4096" />
<value value="0x04" name="1024" />
<value value="0x06" name="0" />
- </mask>
- <mask name="BSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RBSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0xC0" >
<value value="0x00" name="1024" />
<value value="0x40" name="256" />
<value value="0x80" name="128" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FSS" wmask="0xFF" bvalue="0xCF" >
- <mask name="WRTSS" value="0x01" >
+ <config offset="0x2" name="FSS" wtqmask="0xFF" bvalue="0xCF" >
+ <tqmask name="WRTSS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="SSSIZ" value="0x06" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x06" >
<value value="0x00" name="16384" />
<value value="0x02" name="8192" />
<value value="0x04" name="4096" />
<value value="0x06" name="0" />
- </mask>
- <mask name="SSSEC" value="0x08" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x08" >
<value value="0x00" name="High Security" />
<value value="0x08" name="Standard Security" />
- </mask>
- <mask name="RSSSIZ" value="0xC0" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0xC0" >
<value value="0x00" name="4096" />
<value value="0x40" name="2048" />
<value value="0x80" name="256" />
<value value="0xC0" name="0" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FGS" wmask="0xFF" bvalue="0x07" >
- <mask name="WRTGS" value="0x01" >
+ <config offset="0x4" name="FGS" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="WRTGS" value="0x01" >
<value value="0x00" name="All" />
<value value="0x01" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x06" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x06" >
<value value="0x00" name="High Security" />
<value value="0x02" name="High Security" />
<value value="0x04" name="Standard Security" />
<value value="0x06" name="Off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FOSCSEL" wmask="0xFF" bvalue="0xA7" >
- <mask name="FNOSC" value="0x07" >
+ <config offset="0x6" name="FOSCSEL" wtqmask="0xFF" bvalue="0xA7" >
+ <tqmask name="FNOSC" value="0x07" >
<value value="0x00" name="EXTRC_F" />
<value value="0x01" name="INTRC_F_PLL" />
<value value="0x02" name="PRIM" />
@@ -95,38 +95,38 @@
<value value="0x05" name="EXTRC_LP" />
<value value="0x06" name="invalid" />
<value value="0x07" name="INTRC_F_POST" />
- </mask>
- <mask name="TEMP" value="0x20" >
+ </tqmask>
+ <tqmask name="TEMP" value="0x20" >
<value value="0x00" name="On" />
<value value="0x20" name="Off" />
- </mask>
- <mask name="IESO" value="0x80" >
+ </tqmask>
+ <tqmask name="IESO" value="0x80" >
<value value="0x00" name="Off" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FOSC" wmask="0xFF" bvalue="0xC7" >
- <mask name="POSCMD" value="0x03" >
+ <config offset="0x8" name="FOSC" wtqmask="0xFF" bvalue="0xC7" >
+ <tqmask name="POSCMD" value="0x03" >
<value value="0x00" name="EC" />
<value value="0x01" name="XT" />
<value value="0x02" name="HS" />
<value value="0x03" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x04" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x04" >
<value value="0x00" name="IO" />
<value value="0x04" name="Clock" />
- </mask>
- <mask name="FCKSM" value="0xC0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC0" >
<value value="0x00" name="Switching on, monitor on" />
<value value="0x40" name="Switching on, monitor off" />
<value value="0x80" name="Switching off, monitor off" />
<value value="0xC0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FWDT" wmask="0xFF" bvalue="0xDF">
- <mask name="WDTPOST" value="0x0F" >
+ <config offset="0xA" name="FWDT" wtqmask="0xFF" bvalue="0xDF">
+ <tqmask name="WDTPOST" value="0x0F" >
<value value="0x00" name="1:1" />
<value value="0x01" name="1:2" />
<value value="0x02" name="1:4" />
@@ -143,23 +143,23 @@
<value value="0x0D" name="1:8192" />
<value value="0x0E" name="1:16384" />
<value value="0x0F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x10" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x10" >
<value value="0x00" name="1:32" />
<value value="0x10" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x40" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x80" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x80" >
<value value="0x00" name="Software" />
<value value="0x80" name="On" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="FPOR" wmask="0xFF" bvalue="0x07" >
- <mask name="FPWRT" value="0x07" >
+ <config offset="0xC" name="FPOR" wtqmask="0xFF" bvalue="0x07" >
+ <tqmask name="FPWRT" value="0x07" >
<value value="0x00" name="0" />
<value value="0x01" name="2" />
<value value="0x02" name="4" />
@@ -168,28 +168,28 @@
<value value="0x05" name="32" />
<value value="0x06" name="64" />
<value value="0x07" name="128" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xE" name="FICD" wmask="0xFF" bvalue="0xE3" >
- <mask name="ICS" value="0x03" >
+ <config offset="0xE" name="FICD" wtqmask="0xFF" bvalue="0xE3" >
+ <tqmask name="ICS" value="0x03" >
<value value="0x00" name="EMUC3, EMUD3" />
<value value="0x01" name="EMUC2, EMUD2" />
<value value="0x02" name="EMUC1, EMUD1" />
<value value="0x03" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="JTAGEN" value="0x20" >
+ </tqmask>
+ <tqmask name="JTAGEN" value="0x20" >
<value value="0x00" name="Off" />
<value value="0x20" name="On" />
- </mask>
- <mask name="COE" value="0x40" >
+ </tqmask>
+ <tqmask name="COE" value="0x40" >
<value value="0x00" name="On" />
<value value="0x40" name="Off" />
- </mask>
- <mask name="DEBUG" value="0x80" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x80" >
<value value="0x00" name="On" />
<value value="0x80" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F1010.xml b/src/devices/pic/xml_data/30F1010.xml
index 1d59008..7aa7c07 100644
--- a/src/devices/pic/xml_data/30F1010.xml
+++ b/src/devices/pic/xml_data/30F1010.xml
@@ -27,77 +27,77 @@
<memory name="code" start="0x000000" end="0x000FFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
-<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x000F" >
- <mask name="WRTBS" value="0x0001" >
+<config offset="0x0" name="FBS" wtqmask="0xFFFF" bvalue="0x000F" >
+ <tqmask name="WRTBS" value="0x0001" >
<value value="0x0000" name="All" />
<value value="0x0001" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x0006" >
<value value="0x0000" name="0" />
<value value="0x0002" name="invalid" />
<value value="0x0004" name="1024" />
<value value="0x0006" name="0" />
- </mask>
- <mask name="BSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x0008" >
<value value="0x0000" name="High Security" />
<value value="0x0008" name="Standard Security" />
- </mask>
+ </tqmask>
</config>
-<config offset="0x2" name="reserved" wmask="0xFFFF" bvalue="0x0000" ></config>
+<config offset="0x2" name="reserved" wtqmask="0xFFFF" bvalue="0x0000" ></config>
-<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
- <mask name="WRTGS" value="0x0001" >
+<config offset="0x4" name="FGS" wtqmask="0xFFFF" bvalue="0x0007" >
+ <tqmask name="WRTGS" value="0x0001" >
<value value="0x0000" name="All" />
<value value="0x0001" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x0006" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x0006" >
<value value="0x0000" name="High Security" />
<value value="0x0002" name="High Security" />
<value value="0x0004" name="Standard Security" />
<value value="0x0006" name="Off" />
- </mask>
+ </tqmask>
</config>
-<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0003" >
- <mask name="FNOSC" value="0x0003" >
+<config offset="0x6" name="FOSCSEL" wtqmask="0xFFFF" bvalue="0x0003" >
+ <tqmask name="FNOSC" value="0x0003" >
<value value="0x0000" name="INTRC_F" />
<value value="0x0001" name="INTRC_F_PLL" />
<value value="0x0002" name="PRIM" />
<value value="0x0003" name="PRIM_PLL" />
- </mask>
+ </tqmask>
</config>
-<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
- <mask name="POSCMD" value="0x0003" >
+<config offset="0x8" name="FOSC" wtqmask="0xFFFF" bvalue="0x00E7" >
+ <tqmask name="POSCMD" value="0x0003" >
<value value="0x0000" name="EC" />
<value value="0x0001" name="invalid" />
<value value="0x0002" name="HS" />
<value value="0x0003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x0004" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x0004" >
<value value="0x0000" name="IO" />
<value value="0x0004" name="Clock" />
- </mask>
- <mask name="FRANGE" value="0x0020" >
+ </tqmask>
+ <tqmask name="FRANGE" value="0x0020" >
<value value="0x0000" name="Low range" />
<value value="0x0020" name="High range" />
- </mask>
- <mask name="FCKSM" value="0x00C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x00C0" >
<value value="0x0000" name="Switching on, monitor on" />
<value value="0x0040" name="Switching on, monitor off" />
<value value="0x0080" name="Switching off, monitor off" />
<value value="0x00C0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
-<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
- <mask name="WDTPOST" value="0x000F" >
+<config offset="0xA" name="FWDT" wtqmask="0xFFFF" bvalue="0x00DF">
+ <tqmask name="WDTPOST" value="0x000F" >
<value value="0x0000" name="1:1" />
<value value="0x0001" name="1:2" />
<value value="0x0002" name="1:4" />
@@ -114,23 +114,23 @@
<value value="0x000D" name="1:8192" />
<value value="0x000E" name="1:16384" />
<value value="0x000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x0010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x0010" >
<value value="0x0000" name="1:32" />
<value value="0x0010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x0040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x0040" >
<value value="0x0000" name="On" />
<value value="0x0040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x0080" >
<value value="0x0000" name="Software" />
<value value="0x0080" name="On" />
- </mask>
+ </tqmask>
</config>
-<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x0007" >
- <mask name="FPWRT" value="0x0007" >
+<config offset="0xC" name="FPOR" wtqmask="0xFFFF" bvalue="0x0007" >
+ <tqmask name="FPWRT" value="0x0007" >
<value value="0x0000" name="0" />
<value value="0x0001" name="2" />
<value value="0x0002" name="4" />
@@ -139,20 +139,20 @@
<value value="0x0005" name="32" />
<value value="0x0006" name="64" />
<value value="0x0007" name="128" />
- </mask>
+ </tqmask>
</config>
-<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x0083" >
- <mask name="ICS" value="0x0003" >
+<config offset="0xE" name="FICD" wtqmask="0xFFFF" bvalue="0x0083" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="invalid" />
<value value="0x0001" name="EMUC2, EMUD2" />
<value value="0x0002" name="EMUC1, EMUD1" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="DEBUG" value="0x0080" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0080" >
<value value="0x0000" name="On" />
<value value="0x0080" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F2010.xml b/src/devices/pic/xml_data/30F2010.xml
index f252785..85ec165 100644
--- a/src/devices/pic/xml_data/30F2010.xml
+++ b/src/devices/pic/xml_data/30F2010.xml
@@ -36,13 +36,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
- <mask name="FPR" value="0x000F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+ <tqmask name="FPR" value="0x000F" >
<value value="0x0000" name="XTL" cname="XTL" />
<value value="0x0001" name="XTL" cname="XTL" />
<value value="0x0002" name="HS" cname="HS" />
@@ -59,22 +59,22 @@
<value value="0x000D" name="EC4" cname="EC_PLL4" />
<value value="0x000E" name="EC8" cname="EC_PLL8" />
<value value="0x000F" name="EC16" cname="EC_PLL16" />
- </mask>
- <mask name="FOS" value="0x0300" >
+ </tqmask>
+ <tqmask name="FOS" value="0x0300" >
<value value="0x0000" name="TMR1" cname="LP" />
<value value="0x0100" name="INTRC_F" cname="FRC" />
<value value="0x0200" name="INTRC_LP" cname="LPRC" />
<value value="0x0300" name="PRIM" cname="_" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -91,84 +91,84 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="LPOL" value="0x0100" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x0100" >
<value value="0x0000" name="low" cname="PWMxL_ACT_LO" />
<value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
- </mask>
- <mask name="HPOL" value="0x0200" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x0200" >
<value value="0x0000" name="low" cname="PWMxH_ACT_LO" />
<value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
- </mask>
- <mask name="PWMPIN" value="0x0400" >
+ </tqmask>
+ <tqmask name="PWMPIN" value="0x0400" >
<value value="0x0000" name="On" cname="RST_PWMPIN" />
<value value="0x0400" name="Off" cname="RST_IOPIN" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F2011.xml b/src/devices/pic/xml_data/30F2011.xml
index a767855..54886ed 100644
--- a/src/devices/pic/xml_data/30F2011.xml
+++ b/src/devices/pic/xml_data/30F2011.xml
@@ -27,13 +27,13 @@
<memory name="code" start="0x000000" end="0x001FFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -53,16 +53,16 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -79,72 +79,72 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F2012.xml b/src/devices/pic/xml_data/30F2012.xml
index 6da9eb7..3f0d7ec 100644
--- a/src/devices/pic/xml_data/30F2012.xml
+++ b/src/devices/pic/xml_data/30F2012.xml
@@ -27,13 +27,13 @@
<memory name="code" start="0x000000" end="0x001FFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -53,16 +53,16 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -79,72 +79,72 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F2020.xml b/src/devices/pic/xml_data/30F2020.xml
index 3aa30e9..cad9c22 100644
--- a/src/devices/pic/xml_data/30F2020.xml
+++ b/src/devices/pic/xml_data/30F2020.xml
@@ -27,77 +27,77 @@
<memory name="code" start="0x000000" end="0x001FFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
-<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x000F" >
- <mask name="WRTBS" value="0x0001" >
+<config offset="0x0" name="FBS" wtqmask="0xFFFF" bvalue="0x000F" >
+ <tqmask name="WRTBS" value="0x0001" >
<value value="0x0000" name="All" />
<value value="0x0001" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x0006" >
<value value="0x0000" name="0" />
<value value="0x0002" name="4096" />
<value value="0x0004" name="1024" />
<value value="0x0006" name="0" />
- </mask>
- <mask name="BSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x0008" >
<value value="0x0000" name="High Security" />
<value value="0x0008" name="Standard Security" />
- </mask>
+ </tqmask>
</config>
-<config offset="0x2" name="reserved" wmask="0xFFFF" bvalue="0x0000" ></config>
+<config offset="0x2" name="reserved" wtqmask="0xFFFF" bvalue="0x0000" ></config>
-<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
- <mask name="WRTGS" value="0x0001" >
+<config offset="0x4" name="FGS" wtqmask="0xFFFF" bvalue="0x0007" >
+ <tqmask name="WRTGS" value="0x0001" >
<value value="0x0000" name="All" />
<value value="0x0001" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x0006" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x0006" >
<value value="0x0000" name="High Security" />
<value value="0x0002" name="High Security" />
<value value="0x0004" name="Standard Security" />
<value value="0x0006" name="Off" />
- </mask>
+ </tqmask>
</config>
-<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0003" >
- <mask name="FNOSC" value="0x0003" >
+<config offset="0x6" name="FOSCSEL" wtqmask="0xFFFF" bvalue="0x0003" >
+ <tqmask name="FNOSC" value="0x0003" >
<value value="0x0000" name="INTRC_F" />
<value value="0x0001" name="INTRC_F_PLL" />
<value value="0x0002" name="PRIM" />
<value value="0x0003" name="PRIM_PLL" />
- </mask>
+ </tqmask>
</config>
-<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
- <mask name="POSCMD" value="0x0003" >
+<config offset="0x8" name="FOSC" wtqmask="0xFFFF" bvalue="0x00E7" >
+ <tqmask name="POSCMD" value="0x0003" >
<value value="0x0000" name="EC" />
<value value="0x0001" name="invalid" />
<value value="0x0002" name="HS" />
<value value="0x0003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x0004" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x0004" >
<value value="0x0000" name="IO" />
<value value="0x0004" name="Clock" />
- </mask>
- <mask name="FRANGE" value="0x0020" >
+ </tqmask>
+ <tqmask name="FRANGE" value="0x0020" >
<value value="0x0000" name="Low range" />
<value value="0x0020" name="High range" />
- </mask>
- <mask name="FCKSM" value="0x00C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x00C0" >
<value value="0x0000" name="Switching on, monitor on" />
<value value="0x0040" name="Switching on, monitor off" />
<value value="0x0080" name="Switching off, monitor off" />
<value value="0x00C0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
-<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
- <mask name="WDTPOST" value="0x000F" >
+<config offset="0xA" name="FWDT" wtqmask="0xFFFF" bvalue="0x00DF">
+ <tqmask name="WDTPOST" value="0x000F" >
<value value="0x0000" name="1:1" />
<value value="0x0001" name="1:2" />
<value value="0x0002" name="1:4" />
@@ -114,23 +114,23 @@
<value value="0x000D" name="1:8192" />
<value value="0x000E" name="1:16384" />
<value value="0x000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x0010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x0010" >
<value value="0x0000" name="1:32" />
<value value="0x0010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x0040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x0040" >
<value value="0x0000" name="On" />
<value value="0x0040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x0080" >
<value value="0x0000" name="Software" />
<value value="0x0080" name="On" />
- </mask>
+ </tqmask>
</config>
-<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x0007" >
- <mask name="FPWRT" value="0x0007" >
+<config offset="0xC" name="FPOR" wtqmask="0xFFFF" bvalue="0x0007" >
+ <tqmask name="FPWRT" value="0x0007" >
<value value="0x0000" name="0" />
<value value="0x0001" name="2" />
<value value="0x0002" name="4" />
@@ -139,20 +139,20 @@
<value value="0x0005" name="32" />
<value value="0x0006" name="64" />
<value value="0x0007" name="128" />
- </mask>
+ </tqmask>
</config>
-<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x0083" >
- <mask name="ICS" value="0x0003" >
+<config offset="0xE" name="FICD" wtqmask="0xFFFF" bvalue="0x0083" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="invalid" />
<value value="0x0001" name="EMUC2, EMUD2" />
<value value="0x0002" name="EMUC1, EMUD1" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="DEBUG" value="0x0080" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0080" >
<value value="0x0000" name="On" />
<value value="0x0080" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F2023.xml b/src/devices/pic/xml_data/30F2023.xml
index 8241600..6871678 100644
--- a/src/devices/pic/xml_data/30F2023.xml
+++ b/src/devices/pic/xml_data/30F2023.xml
@@ -27,77 +27,77 @@
<memory name="code" start="0x000000" end="0x001FFF" />
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000F" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
-<config offset="0x0" name="FBS" wmask="0xFFFF" bvalue="0x000F" >
- <mask name="WRTBS" value="0x0001" >
+<config offset="0x0" name="FBS" wtqmask="0xFFFF" bvalue="0x000F" >
+ <tqmask name="WRTBS" value="0x0001" >
<value value="0x0000" name="All" />
<value value="0x0001" name="Off" />
- </mask>
- <mask name="BSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x0006" >
<value value="0x0000" name="0" />
<value value="0x0002" name="4096" />
<value value="0x0004" name="1024" />
<value value="0x0006" name="0" />
- </mask>
- <mask name="BSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x0008" >
<value value="0x0000" name="High Security" />
<value value="0x0008" name="Standard Security" />
- </mask>
+ </tqmask>
</config>
-<config offset="0x2" name="reserved" wmask="0xFFFF" bvalue="0x0000" ></config>
+<config offset="0x2" name="reserved" wtqmask="0xFFFF" bvalue="0x0000" ></config>
-<config offset="0x4" name="FGS" wmask="0xFFFF" bvalue="0x0007" >
- <mask name="WRTGS" value="0x0001" >
+<config offset="0x4" name="FGS" wtqmask="0xFFFF" bvalue="0x0007" >
+ <tqmask name="WRTGS" value="0x0001" >
<value value="0x0000" name="All" />
<value value="0x0001" name="Off" />
- </mask>
- <mask name="GSSEC" value="0x0006" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x0006" >
<value value="0x0000" name="High Security" />
<value value="0x0002" name="High Security" />
<value value="0x0004" name="Standard Security" />
<value value="0x0006" name="Off" />
- </mask>
+ </tqmask>
</config>
-<config offset="0x6" name="FOSCSEL" wmask="0xFFFF" bvalue="0x0003" >
- <mask name="FNOSC" value="0x0003" >
+<config offset="0x6" name="FOSCSEL" wtqmask="0xFFFF" bvalue="0x0003" >
+ <tqmask name="FNOSC" value="0x0003" >
<value value="0x0000" name="INTRC_F" />
<value value="0x0001" name="INTRC_F_PLL" />
<value value="0x0002" name="PRIM" />
<value value="0x0003" name="PRIM_PLL" />
- </mask>
+ </tqmask>
</config>
-<config offset="0x8" name="FOSC" wmask="0xFFFF" bvalue="0x00E7" >
- <mask name="POSCMD" value="0x0003" >
+<config offset="0x8" name="FOSC" wtqmask="0xFFFF" bvalue="0x00E7" >
+ <tqmask name="POSCMD" value="0x0003" >
<value value="0x0000" name="EC" />
<value value="0x0001" name="invalid" />
<value value="0x0002" name="HS" />
<value value="0x0003" name="Off" />
- </mask>
- <mask name="OSCIOFNC" value="0x0004" >
+ </tqmask>
+ <tqmask name="OSCIOFNC" value="0x0004" >
<value value="0x0000" name="IO" />
<value value="0x0004" name="Clock" />
- </mask>
- <mask name="FRANGE" value="0x0020" >
+ </tqmask>
+ <tqmask name="FRANGE" value="0x0020" >
<value value="0x0000" name="Low range" />
<value value="0x0020" name="High range" />
- </mask>
- <mask name="FCKSM" value="0x00C0" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0x00C0" >
<value value="0x0000" name="Switching on, monitor on" />
<value value="0x0040" name="Switching on, monitor off" />
<value value="0x0080" name="Switching off, monitor off" />
<value value="0x00C0" name="Switching off, monitor off" />
- </mask>
+ </tqmask>
</config>
-<config offset="0xA" name="FWDT" wmask="0xFFFF" bvalue="0x00DF">
- <mask name="WDTPOST" value="0x000F" >
+<config offset="0xA" name="FWDT" wtqmask="0xFFFF" bvalue="0x00DF">
+ <tqmask name="WDTPOST" value="0x000F" >
<value value="0x0000" name="1:1" />
<value value="0x0001" name="1:2" />
<value value="0x0002" name="1:4" />
@@ -114,23 +114,23 @@
<value value="0x000D" name="1:8192" />
<value value="0x000E" name="1:16384" />
<value value="0x000F" name="1:32768" />
- </mask>
- <mask name="WDTPRE" value="0x0010" >
+ </tqmask>
+ <tqmask name="WDTPRE" value="0x0010" >
<value value="0x0000" name="1:32" />
<value value="0x0010" name="1:128" />
- </mask>
- <mask name="WINDIS" value="0x0040" >
+ </tqmask>
+ <tqmask name="WINDIS" value="0x0040" >
<value value="0x0000" name="On" />
<value value="0x0040" name="Off" />
- </mask>
- <mask name="FWDTEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x0080" >
<value value="0x0000" name="Software" />
<value value="0x0080" name="On" />
- </mask>
+ </tqmask>
</config>
-<config offset="0xC" name="FPOR" wmask="0xFFFF" bvalue="0x0007" >
- <mask name="FPWRT" value="0x0007" >
+<config offset="0xC" name="FPOR" wtqmask="0xFFFF" bvalue="0x0007" >
+ <tqmask name="FPWRT" value="0x0007" >
<value value="0x0000" name="0" />
<value value="0x0001" name="2" />
<value value="0x0002" name="4" />
@@ -139,20 +139,20 @@
<value value="0x0005" name="32" />
<value value="0x0006" name="64" />
<value value="0x0007" name="128" />
- </mask>
+ </tqmask>
</config>
-<config offset="0xE" name="FICD" wmask="0xFFFF" bvalue="0x0083" >
- <mask name="ICS" value="0x0003" >
+<config offset="0xE" name="FICD" wtqmask="0xFFFF" bvalue="0x0083" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="invalid" />
<value value="0x0001" name="EMUC2, EMUD2" />
<value value="0x0002" name="EMUC1, EMUD1" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" />
- </mask>
- <mask name="DEBUG" value="0x0080" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x0080" >
<value value="0x0000" name="On" />
<value value="0x0080" name="Off" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F3010.xml b/src/devices/pic/xml_data/30F3010.xml
index 1041c86..2d4170d 100644
--- a/src/devices/pic/xml_data/30F3010.xml
+++ b/src/devices/pic/xml_data/30F3010.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,16 +54,16 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -80,84 +80,84 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="LPOL" value="0x0100" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x0100" >
<value value="0x0000" name="low" cname="PWMxL_ACT_LO" />
<value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
- </mask>
- <mask name="HPOL" value="0x0200" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x0200" >
<value value="0x0000" name="low" cname="PWMxH_ACT_LO" />
<value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
- </mask>
- <mask name="PWMPIN" value="0x0400" >
+ </tqmask>
+ <tqmask name="PWMPIN" value="0x0400" >
<value value="0x0000" name="On" cname="RST_PWMPIN" />
<value value="0x0400" name="Off" cname="RST_IOPIN" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F3011.xml b/src/devices/pic/xml_data/30F3011.xml
index b092d8b..6f84490 100644
--- a/src/devices/pic/xml_data/30F3011.xml
+++ b/src/devices/pic/xml_data/30F3011.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,17 +54,17 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -81,84 +81,84 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="LPOL" value="0x0100" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x0100" >
<value value="0x0000" name="low" cname="PWMxL_ACT_LO" />
<value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
- </mask>
- <mask name="HPOL" value="0x0200" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x0200" >
<value value="0x0000" name="low" cname="PWMxH_ACT_LO" />
<value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
- </mask>
- <mask name="PWMPIN" value="0x0400" >
+ </tqmask>
+ <tqmask name="PWMPIN" value="0x0400" >
<value value="0x0000" name="On" cname="RST_PWMPIN" />
<value value="0x0400" name="Off" cname="RST_IOPIN" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F3012.xml b/src/devices/pic/xml_data/30F3012.xml
index b87d96a..4ecc5d3 100644
--- a/src/devices/pic/xml_data/30F3012.xml
+++ b/src/devices/pic/xml_data/30F3012.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,16 +54,16 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -80,72 +80,72 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F3013.xml b/src/devices/pic/xml_data/30F3013.xml
index 702e415..337316c 100644
--- a/src/devices/pic/xml_data/30F3013.xml
+++ b/src/devices/pic/xml_data/30F3013.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,16 +54,16 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -80,72 +80,72 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F3014.xml b/src/devices/pic/xml_data/30F3014.xml
index 13bd387..870b30b 100644
--- a/src/devices/pic/xml_data/30F3014.xml
+++ b/src/devices/pic/xml_data/30F3014.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,16 +54,16 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="default" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -80,72 +80,72 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F4011.xml b/src/devices/pic/xml_data/30F4011.xml
index 89791c2..91f6d83 100644
--- a/src/devices/pic/xml_data/30F4011.xml
+++ b/src/devices/pic/xml_data/30F4011.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
- <mask name="FPR" value="0x000F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+ <tqmask name="FPR" value="0x000F" >
<value value="0x0000" name="XTL" cname="XTL" />
<value value="0x0001" name="XTL" cname="XTL" />
<value value="0x0002" name="HS" cname="HS" />
@@ -51,23 +51,23 @@
<value value="0x000D" name="EC4" cname="EC_PLL4" />
<value value="0x000E" name="EC8" cname="EC_PLL8" />
<value value="0x000F" name="EC16" cname="EC_PLL16" />
- </mask>
- <mask name="FOS" value="0x0300" >
+ </tqmask>
+ <tqmask name="FOS" value="0x0300" >
<value value="0x0000" name="TMR1" cname="EXT" />
<value value="0x0100" name="INTRC_F" cname="FRC" />
<value value="0x0200" name="INTRC_LP" cname="LP" />
<value value="0x0300" name="PRIM" cname="_" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -84,84 +84,84 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="LPOL" value="0x0100" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x0100" >
<value value="0x0000" name="low" cname="PWMxL_ACT_LO" />
<value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
- </mask>
- <mask name="HPOL" value="0x0200" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x0200" >
<value value="0x0000" name="low" cname="PWMxH_ACT_LO" />
<value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
- </mask>
- <mask name="PWMPIN" value="0x0400" >
+ </tqmask>
+ <tqmask name="PWMPIN" value="0x0400" >
<value value="0x0000" name="On" cname="RST_PWMPIN" />
<value value="0x0400" name="Off" cname="RST_IOPIN" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F4012.xml b/src/devices/pic/xml_data/30F4012.xml
index e42b34c..3bc430b 100644
--- a/src/devices/pic/xml_data/30F4012.xml
+++ b/src/devices/pic/xml_data/30F4012.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
- <mask name="FPR" value="0x000F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+ <tqmask name="FPR" value="0x000F" >
<value value="0x0000" name="XTL" cname="XTL" />
<value value="0x0001" name="XTL" cname="XTL" />
<value value="0x0002" name="HS" cname="HS" />
@@ -51,23 +51,23 @@
<value value="0x000D" name="EC4" cname="EC_PLL4" />
<value value="0x000E" name="EC8" cname="EC_PLL8" />
<value value="0x000F" name="EC16" cname="EC_PLL16" />
- </mask>
- <mask name="FOS" value="0x0300" >
+ </tqmask>
+ <tqmask name="FOS" value="0x0300" >
<value value="0x0000" name="TMR1" cname="EXT" />
<value value="0x0100" name="INTRC_F" cname="FRC" />
<value value="0x0200" name="INTRC_LP" cname="LP" />
<value value="0x0300" name="PRIM" cname="_" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -84,84 +84,84 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="LPOL" value="0x0100" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x0100" >
<value value="0x0000" name="low" cname="PWMxL_ACT_LO" />
<value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
- </mask>
- <mask name="HPOL" value="0x0200" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x0200" >
<value value="0x0000" name="low" cname="PWMxH_ACT_LO" />
<value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
- </mask>
- <mask name="PWMPIN" value="0x0400" >
+ </tqmask>
+ <tqmask name="PWMPIN" value="0x0400" >
<value value="0x0000" name="On" cname="RST_PWMPIN" />
<value value="0x0400" name="Off" cname="RST_IOPIN" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F4013.xml b/src/devices/pic/xml_data/30F4013.xml
index 1732e6e..6177a81 100644
--- a/src/devices/pic/xml_data/30F4013.xml
+++ b/src/devices/pic/xml_data/30F4013.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,17 +54,17 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -81,72 +81,72 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F5011.xml b/src/devices/pic/xml_data/30F5011.xml
index a1f311d..dfd9f6f 100644
--- a/src/devices/pic/xml_data/30F5011.xml
+++ b/src/devices/pic/xml_data/30F5011.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
- <mask name="FPR" value="0x000F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+ <tqmask name="FPR" value="0x000F" >
<value value="0x0000" name="XTL" cname="XTL" />
<value value="0x0001" name="XTL" cname="XTL" />
<value value="0x0002" name="HS" cname="HS" />
@@ -51,23 +51,23 @@
<value value="0x000D" name="EC4" cname="EC_PLL4" />
<value value="0x000E" name="EC8" cname="EC_PLL8" />
<value value="0x000F" name="EC16" cname="EC_PLL16" />
- </mask>
- <mask name="FOS" value="0x0300" >
+ </tqmask>
+ <tqmask name="FOS" value="0x0300" >
<value value="0x0000" name="TMR1" cname="EXT" />
<value value="0x0100" name="INTRC_F" cname="FRC" />
<value value="0x0200" name="INTRC_LP" cname="LP" />
<value value="0x0300" name="PRIM" cname="_" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -84,125 +84,125 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" >
- <mask name="WRTBS" value="0x0001" >
+ <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" >
+ <tqmask name="WRTBS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
- </mask>
- <mask name="BSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="BSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x0006" >
<value value="0x0000" name="4196" cname="" />
<value value="0x0002" name="2048" cname="" />
<value value="0x0004" name="512" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="EBSSIZ" value="0x0100" >
+ </tqmask>
+ <tqmask name="EBSSIZ" value="0x0100" >
<value value="0x0000" name="128" cname="SMALL_BOOT_EEPROM" />
<value value="0x0100" name="0" cname="NO_BOOT_EEPROM" />
- </mask>
- <mask name="RBSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0x3000" >
<value value="0x0000" name="512" cname="LAR_BOOT_RAM" />
<value value="0x1000" name="256" cname="MED_BOOT_RAM" />
<value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
<value value="0x3000" name="0" cname="NO_BOOT_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" >
- <mask name="WRTSS" value="0x0001" >
+ <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" >
+ <tqmask name="WRTSS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
- </mask>
- <mask name="SSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="SSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x0006" >
<value value="0x0000" name="16384" cname="" />
<value value="0x0002" name="8192" cname="" />
<value value="0x0004" name="4096" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="ESSSIZ" value="0x0300" >
+ </tqmask>
+ <tqmask name="ESSSIZ" value="0x0300" >
<value value="0x0000" name="512" cname="LAR_SEC_EEPROM" />
<value value="0x0100" name="256" cname="MED_SEC_EEPROM" />
<value value="0x0200" name="128" cname="SMALL_SEC_EEPROM" />
<value value="0x0300" name="0" cname="NO_SEC_EEPROM" />
- </mask>
- <mask name="RSSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0x3000" >
<value value="0x0000" name="1024" cname="LAR_SEC_RAM" />
<value value="0x1000" name="768" cname="MED_SEC_RAM" />
<value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
<value value="0x3000" name="0" cname="NO_SEC_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" >
- <mask name="WRTGS" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" >
+ <tqmask name="WRTGS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
- </mask>
- <mask name="GSSEC" value="0x0006" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x0006" >
<value value="default" name="High Security" cname="HIGH_PROT" />
<value value="0x0004" name="Standard Security" cname="STAND_PROT" />
<value value="0x0006" name="Off" cname="GEN_PROT" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F5013.xml b/src/devices/pic/xml_data/30F5013.xml
index debd97f..2017b70 100644
--- a/src/devices/pic/xml_data/30F5013.xml
+++ b/src/devices/pic/xml_data/30F5013.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
- <mask name="FPR" value="0x000F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+ <tqmask name="FPR" value="0x000F" >
<value value="0x0000" name="XTL" cname="XTL" />
<value value="0x0001" name="XTL" cname="XTL" />
<value value="0x0002" name="HS" cname="HS" />
@@ -51,23 +51,23 @@
<value value="0x000D" name="EC4" cname="EC_PLL4" />
<value value="0x000E" name="EC8" cname="EC_PLL8" />
<value value="0x000F" name="EC16" cname="EC_PLL16" />
- </mask>
- <mask name="FOS" value="0x0300" >
+ </tqmask>
+ <tqmask name="FOS" value="0x0300" >
<value value="0x0000" name="TMR1" cname="EXT" />
<value value="0x0100" name="INTRC_F" cname="FRC" />
<value value="0x0200" name="INTRC_LP" cname="LP" />
<value value="0x0300" name="PRIM" cname="_" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -84,125 +84,125 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" >
- <mask name="WRTBS" value="0x0001" >
+ <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" >
+ <tqmask name="WRTBS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
- </mask>
- <mask name="BSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="BSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x0006" >
<value value="0x0000" name="4096" cname="" />
<value value="0x0002" name="2048" cname="" />
<value value="0x0004" name="512" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="EBSSIZ" value="0x0100" >
+ </tqmask>
+ <tqmask name="EBSSIZ" value="0x0100" >
<value value="0x0000" name="128" cname="SMALL_BOOT_EEPROM" />
<value value="0x0100" name="0" cname="NO_BOOT_EEPROM" />
- </mask>
- <mask name="RBSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0x3000" >
<value value="0x0000" name="512" cname="LAR_BOOT_RAM" />
<value value="0x1000" name="256" cname="MED_BOOT_RAM" />
<value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
<value value="0x3000" name="0" cname="NO_BOOT_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" >
- <mask name="WRTSS" value="0x0001" >
+ <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" >
+ <tqmask name="WRTSS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
- </mask>
- <mask name="SSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="SSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x0006" >
<value value="0x0000" name="16384" cname="" />
<value value="0x0002" name="8192" cname="" />
<value value="0x0004" name="4096" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="ESSSIZ" value="0x0300" >
+ </tqmask>
+ <tqmask name="ESSSIZ" value="0x0300" >
<value value="0x0000" name="512" cname="LAR_SEC_EEPROM" />
<value value="0x0100" name="256" cname="MED_SEC_EEPROM" />
<value value="0x0200" name="128" cname="SMALL_SEC_EEPROM" />
<value value="0x0300" name="0" cname="NO_SEC_EEPROM" />
- </mask>
- <mask name="RSSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0x3000" >
<value value="0x0000" name="1024" cname="LAR_SEC_RAM" />
<value value="0x1000" name="768" cname="MED_SEC_RAM" />
<value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
<value value="0x3000" name="0" cname="NO_SEC_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" >
- <mask name="WRTGS" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" >
+ <tqmask name="WRTGS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
- </mask>
- <mask name="GSSEC" value="0x0006" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x0006" >
<value value="default" name="High Security" cname="HIGH_PROT" />
<value value="0x0004" name="Standard Security" cname="STAND_PROT" />
<value value="0x0006" name="Off" cname="GEN_PROT" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F5015.xml b/src/devices/pic/xml_data/30F5015.xml
index af7c20a..489bed2 100644
--- a/src/devices/pic/xml_data/30F5015.xml
+++ b/src/devices/pic/xml_data/30F5015.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,17 +54,17 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -81,84 +81,84 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="LPOL" value="0x0100" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x0100" >
<value value="0x0000" name="low" cname="PWMxL_ACT_LO" />
<value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
- </mask>
- <mask name="HPOL" value="0x0200" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x0200" >
<value value="0x0000" name="low" cname="PWMxH_ACT_LO" />
<value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
- </mask>
- <mask name="PWMPIN" value="0x0400" >
+ </tqmask>
+ <tqmask name="PWMPIN" value="0x0400" >
<value value="0x0000" name="On" cname="RST_PWMPIN" />
<value value="0x0400" name="Off" cname="RST_IOPIN" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F5016.xml b/src/devices/pic/xml_data/30F5016.xml
index aa2e7e1..6aa3e0e 100644
--- a/src/devices/pic/xml_data/30F5016.xml
+++ b/src/devices/pic/xml_data/30F5016.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FFC00" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,17 +54,17 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -81,84 +81,84 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="LPOL" value="0x0100" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x0100" >
<value value="0x0000" name="low" cname="PWMxL_ACT_LO" />
<value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
- </mask>
- <mask name="HPOL" value="0x0200" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x0200" >
<value value="0x0000" name="low" cname="PWMxH_ACT_LO" />
<value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
- </mask>
- <mask name="PWMPIN" value="0x0400" >
+ </tqmask>
+ <tqmask name="PWMPIN" value="0x0400" >
<value value="0x0000" name="On" cname="RST_PWMPIN" />
<value value="0x0400" name="Off" cname="RST_IOPIN" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6010.xml b/src/devices/pic/xml_data/30F6010.xml
index 8b26c7c..1038327 100644
--- a/src/devices/pic/xml_data/30F6010.xml
+++ b/src/devices/pic/xml_data/30F6010.xml
@@ -29,13 +29,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FF000" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
- <mask name="FPR" value="0x000F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+ <tqmask name="FPR" value="0x000F" >
<value value="0x0000" name="XTL" cname="XTL" />
<value value="0x0001" name="XTL" cname="XTL" />
<value value="0x0002" name="HS" cname="HS" />
@@ -52,23 +52,23 @@
<value value="0x000D" name="EC4" cname="ECIO_PLL4" />
<value value="0x000E" name="EC8" cname="ECIO_PLL8" />
<value value="0x000F" name="EC16" cname="ECIO_PLL16" />
- </mask>
- <mask name="FOS" value="0x0300" >
+ </tqmask>
+ <tqmask name="FOS" value="0x0300" >
<value value="0x0000" name="TMR1" cname="EXT" />
<value value="0x0100" name="INTRC_F" cname="FRC" />
<value value="0x0200" name="INTRC_LP" cname="LP" />
<value value="0x0300" name="PRIM" cname="_" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -85,84 +85,84 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="LPOL" value="0x0100" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x0100" >
<value value="0x0000" name="low" cname="PWMxL_ACT_LO" />
<value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
- </mask>
- <mask name="HPOL" value="0x0200" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x0200" >
<value value="0x0000" name="low" cname="PWMxH_ACT_LO" />
<value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
- </mask>
- <mask name="PWMPIN" value="0x0400" >
+ </tqmask>
+ <tqmask name="PWMPIN" value="0x0400" >
<value value="0x0000" name="On" cname="RST_PWMPIN" />
<value value="0x0400" name="Off" cname="RST_IO" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6010A.xml b/src/devices/pic/xml_data/30F6010A.xml
index 2f5e976..4f477d2 100644
--- a/src/devices/pic/xml_data/30F6010A.xml
+++ b/src/devices/pic/xml_data/30F6010A.xml
@@ -35,13 +35,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FF000" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" cmask="0xC10F">
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" ctqmask="0xC10F">
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -61,17 +61,17 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -88,137 +88,137 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="LPOL" value="0x0100" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x0100" >
<value value="0x0000" name="low" cname="PWMxL_ACT_LO" />
<value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
- </mask>
- <mask name="HPOL" value="0x0200" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x0200" >
<value value="0x0000" name="low" cname="PWMxH_ACT_LO" />
<value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
- </mask>
- <mask name="PWMPIN" value="0x0400" >
+ </tqmask>
+ <tqmask name="PWMPIN" value="0x0400" >
<value value="0x0000" name="On" cname="RST_PWMPIN" />
<value value="0x0400" name="Off" cname="RST_IOPIN" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" >
- <mask name="WRTBS" value="0x0001" >
+ <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" >
+ <tqmask name="WRTBS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
- </mask>
- <mask name="BSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="BSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x0006" >
<value value="0x0000" name="4096" cname="" />
<value value="0x0002" name="2048" cname="" />
<value value="0x0004" name="512" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="EBSSIZ" value="0x0100" >
+ </tqmask>
+ <tqmask name="EBSSIZ" value="0x0100" >
<value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
<value value="0x0100" name="0" cname="NO_BOOT_EEPROM" />
- </mask>
- <mask name="RBSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0x3000" >
<value value="0x0000" name="1024" cname="LAR_BOOT_RAM" />
<value value="0x1000" name="256" cname="MED_BOOT_RAM" />
<value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
<value value="0x3000" name="0" cname="NO_BOOT_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" >
- <mask name="WRTSS" value="0x0001" >
+ <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" >
+ <tqmask name="WRTSS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
- </mask>
- <mask name="SSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="SSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x0006" >
<value value="0x0000" name="16384" cname="" />
<value value="0x0002" name="8192" cname="" />
<value value="0x0004" name="4096" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="ESSSIZ" value="0x0300" >
+ </tqmask>
+ <tqmask name="ESSSIZ" value="0x0300" >
<value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
<value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
<value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
<value value="0x0300" name="0" cname="NO_SEC_EEPROM" />
- </mask>
- <mask name="RSSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0x3000" >
<value value="0x0000" name="4096" cname="LAR_SEC_RAM" />
<value value="0x1000" name="2048" cname="MED_SEC_RAM" />
<value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
<value value="0x3000" name="0" cname="NO_SEC_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" >
- <mask name="WRTGS" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" >
+ <tqmask name="WRTGS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
- </mask>
- <mask name="GSSEC" value="0x0006" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x0006" >
<value value="default" name="High Security" cname="HIGH_PROT" />
<value value="0x0004" name="Standard Security" cname="STAND_PROT" />
<value value="0x0006" name="Off" cname="GEN_PROT" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6011.xml b/src/devices/pic/xml_data/30F6011.xml
index 60e6f5f..94a1ba1 100644
--- a/src/devices/pic/xml_data/30F6011.xml
+++ b/src/devices/pic/xml_data/30F6011.xml
@@ -29,13 +29,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FF800" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x8005BF" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
- <mask name="FPR" value="0x000F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+ <tqmask name="FPR" value="0x000F" >
<value value="0x0000" name="XTL" cname="XTL" />
<value value="0x0001" name="XTL" cname="XTL" />
<value value="0x0002" name="HS" cname="HS" />
@@ -52,23 +52,23 @@
<value value="0x000D" name="EC4" cname="ECIO_PLL4" />
<value value="0x000E" name="EC8" cname="ECIO_PLL8" />
<value value="0x000F" name="EC16" cname="ECIO_PLL16" />
- </mask>
- <mask name="FOS" value="0x0300" >
+ </tqmask>
+ <tqmask name="FOS" value="0x0300" >
<value value="0x0000" name="TMR1" cname="EXT" />
<value value="0x0100" name="INTRC_F" cname="FRC" />
<value value="0x0200" name="INTRC_LP" cname="LP" />
<value value="0x0300" name="PRIM" cname="_" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -85,72 +85,72 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6011A.xml b/src/devices/pic/xml_data/30F6011A.xml
index bb499b1..752f62b 100644
--- a/src/devices/pic/xml_data/30F6011A.xml
+++ b/src/devices/pic/xml_data/30F6011A.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FF800" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,17 +54,17 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -81,125 +81,125 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" >
- <mask name="WRTBS" value="0x0001" >
+ <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" >
+ <tqmask name="WRTBS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
- </mask>
- <mask name="BSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="BSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x0006" >
<value value="0x0000" name="4096" cname="" />
<value value="0x0002" name="2048" cname="" />
<value value="0x0004" name="512" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="EBSSIZ" value="0x0100" >
+ </tqmask>
+ <tqmask name="EBSSIZ" value="0x0100" >
<value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
<value value="0x0100" name="0" cname="NO_BOOT_EEPROM" />
- </mask>
- <mask name="RBSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0x3000" >
<value value="0x0000" name="1024" cname="LAR_BOOT_RAM" />
<value value="0x1000" name="256" cname="MED_BOOT_RAM" />
<value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
<value value="0x3000" name="0" cname="NO_BOOT_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" >
- <mask name="WRTSS" value="0x0001" >
+ <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" >
+ <tqmask name="WRTSS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
- </mask>
- <mask name="SSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="SSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x0006" >
<value value="0x0000" name="16384" cname="" />
<value value="0x0002" name="8192" cname="" />
<value value="0x0004" name="4096" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="ESSSIZ" value="0x0300" >
+ </tqmask>
+ <tqmask name="ESSSIZ" value="0x0300" >
<value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
<value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
<value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
<value value="0x0300" name="0" cname="NO_SEC_EEPROM" />
- </mask>
- <mask name="RSSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0x3000" >
<value value="0x0000" name="4096" cname="LAR_SEC_RAM" />
<value value="0x1000" name="2048" cname="MED_SEC_RAM" />
<value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
<value value="0x3000" name="0" cname="NO_SEC_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" >
- <mask name="WRTGS" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" >
+ <tqmask name="WRTGS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
- </mask>
- <mask name="GSSEC" value="0x0006" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x0006" >
<value value="default" name="High Security" cname="HIGH_PROT" />
<value value="0x0004" name="Standard Security" cname="STAND_PROT" />
<value value="0x0006" name="Off" cname="GEN_PROT" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6012.xml b/src/devices/pic/xml_data/30F6012.xml
index e7c1797..7d5f9b5 100644
--- a/src/devices/pic/xml_data/30F6012.xml
+++ b/src/devices/pic/xml_data/30F6012.xml
@@ -29,13 +29,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FF000" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
- <mask name="FPR" value="0x000F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+ <tqmask name="FPR" value="0x000F" >
<value value="0x0000" name="XTL" cname="XTL" />
<value value="0x0001" name="XTL" cname="XTL" />
<value value="0x0002" name="HS" cname="HS" />
@@ -52,23 +52,23 @@
<value value="0x000D" name="EC4" cname="ECIO_PLL4" />
<value value="0x000E" name="EC8" cname="ECIO_PLL8" />
<value value="0x000F" name="EC16" cname="ECIO_PLL16" />
- </mask>
- <mask name="FOS" value="0x0300" >
+ </tqmask>
+ <tqmask name="FOS" value="0x0300" >
<value value="0x0000" name="TMR1" cname="EXT" />
<value value="0x0100" name="INTRC_F" cname="FRC" />
<value value="0x0200" name="INTRC_LP" cname="LP" />
<value value="0x0300" name="PRIM" cname="_" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -85,72 +85,72 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6012A.xml b/src/devices/pic/xml_data/30F6012A.xml
index 6dd84fb..c2a0e42 100644
--- a/src/devices/pic/xml_data/30F6012A.xml
+++ b/src/devices/pic/xml_data/30F6012A.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FF000" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,17 +54,17 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -81,125 +81,125 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" >
- <mask name="WRTBS" value="0x0001" >
+ <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" >
+ <tqmask name="WRTBS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
- </mask>
- <mask name="BSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="BSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x0006" >
<value value="0x0000" name="4096" cname="" />
<value value="0x0002" name="2048" cname="" />
<value value="0x0004" name="512" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="EBSSIZ" value="0x0100" >
+ </tqmask>
+ <tqmask name="EBSSIZ" value="0x0100" >
<value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
<value value="0x0100" name="0" cname="NO_BOOT_EEPROM" />
- </mask>
- <mask name="RBSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0x3000" >
<value value="0x0000" name="1024" cname="LAR_BOOT_RAM" />
<value value="0x1000" name="256" cname="MED_BOOT_RAM" />
<value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
<value value="0x3000" name="0" cname="NO_BOOT_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" >
- <mask name="WRTSS" value="0x0001" >
+ <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" >
+ <tqmask name="WRTSS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
- </mask>
- <mask name="SSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="SSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x0006" >
<value value="0x0000" name="16384" cname="" />
<value value="0x0002" name="8192" cname="" />
<value value="0x0004" name="4096" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="ESSSIZ" value="0x0300" >
+ </tqmask>
+ <tqmask name="ESSSIZ" value="0x0300" >
<value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
<value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
<value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
<value value="0x0300" name="0" cname="NO_SEC_EEPROM" />
- </mask>
- <mask name="RSSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0x3000" >
<value value="0x0000" name="4096" cname="LAR_SEC_RAM" />
<value value="0x1000" name="2048" cname="MED_SEC_RAM" />
<value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
<value value="0x3000" name="0" cname="NO_SEC_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" >
- <mask name="WRTGS" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" >
+ <tqmask name="WRTGS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
- </mask>
- <mask name="GSSEC" value="0x0006" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x0006" >
<value value="default" name="High Security" cname="HIGH_PROT" />
<value value="0x0004" name="Standard Security" cname="STAND_PROT" />
<value value="0x0006" name="Off" cname="GEN_PROT" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6013.xml b/src/devices/pic/xml_data/30F6013.xml
index 34b66cf..81451a6 100644
--- a/src/devices/pic/xml_data/30F6013.xml
+++ b/src/devices/pic/xml_data/30F6013.xml
@@ -29,13 +29,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FF800" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
- <mask name="FPR" value="0x000F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+ <tqmask name="FPR" value="0x000F" >
<value value="0x0000" name="XTL" cname="XTL" />
<value value="0x0001" name="XTL" cname="XTL" />
<value value="0x0002" name="HS" cname="HS" />
@@ -52,23 +52,23 @@
<value value="0x000D" name="EC4" cname="ECIO_PLL4" />
<value value="0x000E" name="EC8" cname="ECIO_PLL8" />
<value value="0x000F" name="EC16" cname="ECIO_PLL16" />
- </mask>
- <mask name="FOS" value="0x0300" >
+ </tqmask>
+ <tqmask name="FOS" value="0x0300" >
<value value="0x0000" name="TMR1" cname="EXT" />
<value value="0x0100" name="INTRC_F" cname="FRC" />
<value value="0x0200" name="INTRC_LP" cname="LP" />
<value value="0x0300" name="PRIM" cname="_" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -85,72 +85,72 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6013A.xml b/src/devices/pic/xml_data/30F6013A.xml
index e0a5758..ff382ea 100644
--- a/src/devices/pic/xml_data/30F6013A.xml
+++ b/src/devices/pic/xml_data/30F6013A.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FF800" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,17 +54,17 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -81,125 +81,125 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" >
- <mask name="WRTBS" value="0x0001" >
+ <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" >
+ <tqmask name="WRTBS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
- </mask>
- <mask name="BSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="BSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x0006" >
<value value="0x0000" name="4096" cname="" />
<value value="0x0002" name="2048" cname="" />
<value value="0x0004" name="512" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="EBSSIZ" value="0x0100" >
+ </tqmask>
+ <tqmask name="EBSSIZ" value="0x0100" >
<value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
<value value="0x0100" name="0" cname="NO_BOOT_EEPROM" />
- </mask>
- <mask name="RBSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0x3000" >
<value value="0x0000" name="1024" cname="LAR_BOOT_RAM" />
<value value="0x1000" name="256" cname="MED_BOOT_RAM" />
<value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
<value value="0x3000" name="0" cname="NO_BOOT_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" >
- <mask name="WRTSS" value="0x0001" >
+ <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" >
+ <tqmask name="WRTSS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
- </mask>
- <mask name="SSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="SSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x0006" >
<value value="0x0000" name="16384" cname="" />
<value value="0x0002" name="8192" cname="" />
<value value="0x0004" name="4096" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="ESSSIZ" value="0x0300" >
+ </tqmask>
+ <tqmask name="ESSSIZ" value="0x0300" >
<value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
<value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
<value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
<value value="0x0300" name="0" cname="NO_SEC_EEPROM" />
- </mask>
- <mask name="RSSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0x3000" >
<value value="0x0000" name="4096" cname="LAR_SEC_RAM" />
<value value="0x1000" name="2048" cname="MED_SEC_RAM" />
<value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
<value value="0x3000" name="0" cname="NO_SEC_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" >
- <mask name="WRTGS" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" >
+ <tqmask name="WRTGS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
- </mask>
- <mask name="GSSEC" value="0x0006" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x0006" >
<value value="default" name="High Security" cname="HIGH_PROT" />
<value value="0x0004" name="Standard Security" cname="STAND_PROT" />
<value value="0x0006" name="Off" cname="GEN_PROT" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6014.xml b/src/devices/pic/xml_data/30F6014.xml
index 8cf7766..2e5353e 100644
--- a/src/devices/pic/xml_data/30F6014.xml
+++ b/src/devices/pic/xml_data/30F6014.xml
@@ -29,13 +29,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FF000" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC30F" bvalue="0xC30F" cmask="0xC10F" >
- <mask name="FPR" value="0x000F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC30F" bvalue="0xC30F" ctqmask="0xC10F" >
+ <tqmask name="FPR" value="0x000F" >
<value value="0x0000" name="XTL" cname="XTL" />
<value value="0x0001" name="XTL" cname="XTL" />
<value value="0x0002" name="HS" cname="HS" />
@@ -52,23 +52,23 @@
<value value="0x000D" name="EC4" cname="ECIO_PLL4" />
<value value="0x000E" name="EC8" cname="ECIO_PLL8" />
<value value="0x000F" name="EC16" cname="ECIO_PLL16" />
- </mask>
- <mask name="FOS" value="0x0300" >
+ </tqmask>
+ <tqmask name="FOS" value="0x0300" >
<value value="0x0000" name="TMR1" cname="EXT" />
<value value="0x0100" name="INTRC_F" cname="FRC" />
<value value="0x0200" name="INTRC_LP" cname="LP" />
<value value="0x0300" name="PRIM" cname="_" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -85,72 +85,72 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="RESERVED1" wmask="0x310F" bvalue="0x0000" cmask="0x310F" />
+ <config offset="0x6" name="RESERVED1" wtqmask="0x310F" bvalue="0x0000" ctqmask="0x310F" />
- <config offset="0x8" name="RESERVED2" wmask="0x330F" bvalue="0x0000" cmask="0x330F" />
+ <config offset="0x8" name="RESERVED2" wtqmask="0x330F" bvalue="0x0000" ctqmask="0x330F" />
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0003" cmask="0x0007" >
- <mask name="GWRP" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0003" ctqmask="0x0007" >
+ <tqmask name="GWRP" value="0x0001" >
<value value="0x0000" name="All" cname="0xFFFE" />
<value value="0x0001" name="Off" cname="_" />
- </mask>
- <mask name="GCP" value="0x0002" >
+ </tqmask>
+ <tqmask name="GCP" value="0x0002" >
<value value="0x0000" name="All" cname="CODE_PROT_ON" />
<value value="0x0002" name="Off" cname="CODE_PROT_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6014A.xml b/src/devices/pic/xml_data/30F6014A.xml
index c6a6efe..6396aed 100644
--- a/src/devices/pic/xml_data/30F6014A.xml
+++ b/src/devices/pic/xml_data/30F6014A.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FF000" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,17 +54,17 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -81,125 +81,125 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x80B3" cmask="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x80B3" ctqmask="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" >
- <mask name="WRTBS" value="0x0001" >
+ <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" >
+ <tqmask name="WRTBS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
- </mask>
- <mask name="BSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="BSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x0006" >
<value value="0x0000" name="4096" cname="" />
<value value="0x0002" name="2048" cname="" />
<value value="0x0004" name="512" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="EBSSIZ" value="0x0100" >
+ </tqmask>
+ <tqmask name="EBSSIZ" value="0x0100" >
<value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
<value value="0x0100" name="0" cname="NO_BOOT_EEPROM" />
- </mask>
- <mask name="RBSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0x3000" >
<value value="0x0000" name="1024" cname="LAR_BOOT_RAM" />
<value value="0x1000" name="256" cname="MED_BOOT_RAM" />
<value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
<value value="0x3000" name="0" cname="NO_BOOT_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" >
- <mask name="WRTSS" value="0x0001" >
+ <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" >
+ <tqmask name="WRTSS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
- </mask>
- <mask name="SSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="SSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x0006" >
<value value="0x0000" name="16384" cname="" />
<value value="0x0002" name="8192" cname="" />
<value value="0x0004" name="4096" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="ESSSIZ" value="0x0300" >
+ </tqmask>
+ <tqmask name="ESSSIZ" value="0x0300" >
<value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
<value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
<value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
<value value="0x0300" name="0" cname="NO_SEC_EEPROM" />
- </mask>
- <mask name="RSSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0x3000" >
<value value="0x0000" name="4096" cname="LAR_SEC_RAM" />
<value value="0x1000" name="2048" cname="MED_SEC_RAM" />
<value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
<value value="0x3000" name="0" cname="NO_SEC_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" >
- <mask name="WRTGS" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" >
+ <tqmask name="WRTGS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
- </mask>
- <mask name="GSSEC" value="0x0006" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x0006" >
<value value="default" name="High Security" cname="HIGH_PROT" />
<value value="0x0004" name="Standard Security" cname="STAND_PROT" />
<value value="0x0006" name="Off" cname="GEN_PROT" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/30F6015.xml b/src/devices/pic/xml_data/30F6015.xml
index 784f38d..4b5b5bd 100644
--- a/src/devices/pic/xml_data/30F6015.xml
+++ b/src/devices/pic/xml_data/30F6015.xml
@@ -28,13 +28,13 @@
<memory name="device_id" start="0xFF0000" end="0xFF0004" />
<memory name="config" start="0xF80000" end="0xF8000D" />
<memory name="eeprom" start="0x7FF000" end="0x7FFFFF" />
- <memory name="user_ids" start="0x8005C0" end="0x8005FF" rmask="0xFFFFFF" />
+ <memory name="user_ids" start="0x8005C0" end="0x8005FF" rtqmask="0xFFFFFF" />
<memory name="debug_vector" start="0x800000" end="0x800007" />
<memory name="program_executive" start="0x800000" end="0x80053F" />
<!--* Configuration bits ***************************************************-->
- <config offset="0x0" name="FOSC" wmask="0xC71F" bvalue="0xC71F" >
- <mask name="FOSFPR" value="0x071F" >
+ <config offset="0x0" name="FOSC" wtqmask="0xC71F" bvalue="0xC71F" >
+ <tqmask name="FOSFPR" value="0x071F" >
<value value="default" name="invalid" />
<value value="0x001F" name="TMR1" cname="LP" />
<value value="0x011F" name="INTRC_F" cname="FRC" />
@@ -54,17 +54,17 @@
<value value="0x0715" name="HS3_4" cname="HS3_PLL4" />
<value value="0x0716" name="HS3_8" cname="HS3_PLL8" />
<value value="0x0717" name="HS3_16" cname="HS3_PLL16" />
- </mask>
- <mask name="FCKSM" value="0xC000" >
+ </tqmask>
+ <tqmask name="FCKSM" value="0xC000" >
<value value="0x0000" name="Switching on, monitor on" cname="CSW_FSCM_ON" />
<value value="0x4000" name="Switching on, monitor off" cname="CSW_ON_FSCM_OFF" />
<value value="0x8000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
<value value="0xC000" name="Switching off, monitor off" cname="CSW_FSCM_OFF" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x2" name="FWDT" wmask="0x803F" bvalue="0x803F" >
- <mask name="FWPSB" value="0x000F" >
+ <config offset="0x2" name="FWDT" wtqmask="0x803F" bvalue="0x803F" >
+ <tqmask name="FWPSB" value="0x000F" >
<value value="0x0000" name="1:1" cname="WDTPSB_1" />
<value value="0x0001" name="1:2" cname="WDTPSB_2" />
<value value="0x0002" name="1:3" cname="WDTPSB_3" />
@@ -81,137 +81,137 @@
<value value="0x000D" name="1:14" cname="WDTPSB_14" />
<value value="0x000E" name="1:15" cname="WDTPSB_15" />
<value value="0x000F" name="1:16" cname="WDTPSB_16" />
- </mask>
- <mask name="FWPSA" value="0x0030" >
+ </tqmask>
+ <tqmask name="FWPSA" value="0x0030" >
<value value="0x0000" name="1:1" cname="WDTPSA_1" />
<value value="0x0010" name="1:8" cname="WDTPSA_8" />
<value value="0x0020" name="1:64" cname="WDTPSA_64" />
<value value="0x0030" name="1:512" cname="WDTPSA_512" />
- </mask>
- <mask name="FWDTEN" value="0x8000" >
+ </tqmask>
+ <tqmask name="FWDTEN" value="0x8000" >
<value value="0x0000" name="Off" cname="WDT_OFF" />
<value value="0x8000" name="On" cname="WDT_ON" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x4" name="FBORPOR" wmask="0x87B3" bvalue="0x87B3" >
- <mask name="FPWRT" value="0x0003" >
+ <config offset="0x4" name="FBORPOR" wtqmask="0x87B3" bvalue="0x87B3" >
+ <tqmask name="FPWRT" value="0x0003" >
<value value="0x0000" name="0" cname="PWRT_OFF" />
<value value="0x0001" name="4" cname="PWRT_4" />
<value value="0x0002" name="16" cname="PWRT_16" />
<value value="0x0003" name="64" cname="PWRT_64" />
- </mask>
- <mask name="BORV" value="0x0030" >
+ </tqmask>
+ <tqmask name="BORV" value="0x0030" >
<value value="0x0000" name="4.5" cname="BORV_45" />
<value value="0x0010" name="4.2" cname="BORV_42" />
<value value="0x0020" name="2.7" cname="BORV_27" />
<value value="0x0030" name="2.0" cname="BORV_20" />
- </mask>
- <mask name="BODEN" value="0x0080" >
+ </tqmask>
+ <tqmask name="BODEN" value="0x0080" >
<value value="0x0000" name="Off" cname="PBOR_OFF" />
<value value="0x0080" name="On" cname="PBOR_ON" />
- </mask>
- <mask name="LPOL" value="0x0100" >
+ </tqmask>
+ <tqmask name="LPOL" value="0x0100" >
<value value="0x0000" name="low" cname="PWMxL_ACT_LO" />
<value value="0x0100" name="high" cname="PWMxL_ACT_HI" />
- </mask>
- <mask name="HPOL" value="0x0200" >
+ </tqmask>
+ <tqmask name="HPOL" value="0x0200" >
<value value="0x0000" name="low" cname="PWMxH_ACT_LO" />
<value value="0x0200" name="high" cname="PWMxH_ACT_HI" />
- </mask>
- <mask name="PWMPIN" value="0x0400" >
+ </tqmask>
+ <tqmask name="PWMPIN" value="0x0400" >
<value value="0x0000" name="On" cname="RST_PWMPIN" />
<value value="0x0400" name="Off" cname="RST_IOPIN" />
- </mask>
- <mask name="MCLRE" value="0x8000" >
+ </tqmask>
+ <tqmask name="MCLRE" value="0x8000" >
<value value="0x0000" name="Internal" cname="MCLR_DIS" />
<value value="0x8000" name="External" cname="MCLR_EN" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x6" name="FBS" wmask="0x310F" bvalue="0x310F" >
- <mask name="WRTBS" value="0x0001" >
+ <config offset="0x6" name="FBS" wtqmask="0x310F" bvalue="0x310F" >
+ <tqmask name="WRTBS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_BOOT_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_BOOT_OFF" />
- </mask>
- <mask name="BSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="BSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="BSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="BSSIZ" value="0x0006" >
<value value="0x0000" name="4096" cname="" />
<value value="0x0002" name="2048" cname="" />
<value value="0x0004" name="512" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="EBSSIZ" value="0x0100" >
+ </tqmask>
+ <tqmask name="EBSSIZ" value="0x0100" >
<value value="0x0000" name="256" cname="SMALL_BOOT_EEPROM" />
<value value="0x0100" name="0" cname="NO_BOOT_EEPROM" />
- </mask>
- <mask name="RBSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RBSSIZ" value="0x3000" >
<value value="0x0000" name="1024" cname="LAR_BOOT_RAM" />
<value value="0x1000" name="256" cname="MED_BOOT_RAM" />
<value value="0x2000" name="128" cname="SMALL_BOOT_RAM" />
<value value="0x3000" name="0" cname="NO_BOOT_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0x8" name="FSS" wmask="0x330F" bvalue="0x330F" >
- <mask name="WRTSS" value="0x0001" >
+ <config offset="0x8" name="FSS" wtqmask="0x330F" bvalue="0x330F" >
+ <tqmask name="WRTSS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_SEC_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_SEC_OFF" />
- </mask>
- <mask name="SSSEC" value="0x0008" >
+ </tqmask>
+ <tqmask name="SSSEC" value="0x0008" >
<value value="0x0000" name="High Security" cname="" />
<value value="0x0008" name="Standard Security" cname="" />
- </mask>
- <mask name="SSSIZ" value="0x0006" >
+ </tqmask>
+ <tqmask name="SSSIZ" value="0x0006" >
<value value="0x0000" name="16384" cname="" />
<value value="0x0002" name="8192" cname="" />
<value value="0x0004" name="4096" cname="" />
<value value="0x0006" name="0" cname="" />
- </mask>
- <mask name="ESSSIZ" value="0x0300" >
+ </tqmask>
+ <tqmask name="ESSSIZ" value="0x0300" >
<value value="0x0000" name="1024" cname="LAR_SEC_EEPROM" />
<value value="0x0100" name="512" cname="MED_SEC_EEPROM" />
<value value="0x0200" name="256" cname="SMALL_SEC_EEPROM" />
<value value="0x0300" name="0" cname="NO_SEC_EEPROM" />
- </mask>
- <mask name="RSSSIZ" value="0x3000" >
+ </tqmask>
+ <tqmask name="RSSSIZ" value="0x3000" >
<value value="0x0000" name="4096" cname="LAR_SEC_RAM" />
<value value="0x1000" name="2048" cname="MED_SEC_RAM" />
<value value="0x2000" name="256" cname="SMALL_SEC_RAM" />
<value value="0x3000" name="0" cname="NO_SEC_RAM" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xA" name="FGS" wmask="0x0007" bvalue="0x0007" >
- <mask name="WRTGS" value="0x0001" >
+ <config offset="0xA" name="FGS" wtqmask="0x0007" bvalue="0x0007" >
+ <tqmask name="WRTGS" value="0x0001" >
<value value="0x0000" name="All" cname="WR_PROT_GEN_ON" />
<value value="0x0001" name="Off" cname="WR_PROT_GEN_OFF" />
- </mask>
- <mask name="GSSEC" value="0x0006" >
+ </tqmask>
+ <tqmask name="GSSEC" value="0x0006" >
<value value="default" name="High Security" cname="HIGH_PROT" />
<value value="0x0004" name="Standard Security" cname="STAND_PROT" />
<value value="0x0006" name="Off" cname="GEN_PROT" />
- </mask>
+ </tqmask>
</config>
- <config offset="0xC" name="ICD" wmask="0xC003" bvalue="0xC003" >
- <mask name="ICS" value="0x0003" >
+ <config offset="0xC" name="ICD" wtqmask="0xC003" bvalue="0xC003" >
+ <tqmask name="ICS" value="0x0003" >
<value value="0x0000" name="EMUC3, EMUD3" cname="0xFFFC" />
<value value="0x0001" name="EMUC2, EMUD2" cname="0xFFFD" />
<value value="0x0002" name="EMUC1, EMUD1" cname="0xFFFE" />
<value value="0x0003" name="PGC/EMUC, PGD/EMUD" cname="_" />
- </mask>
- <mask name="COE" value="0x4000" >
+ </tqmask>
+ <tqmask name="COE" value="0x4000" >
<value value="0x0000" name="On" cname="0xBFFF" />
<value value="0x4000" name="Off" cname="_" />
- </mask>
- <mask name="DEBUG" value="0x8000" >
+ </tqmask>
+ <tqmask name="DEBUG" value="0x8000" >
<value value="0x0000" name="On" cname="0x7FFF" />
<value value="0x8000" name="Off" cname="_" />
- </mask>
+ </tqmask>
</config>
<!--* Packages *************************************************************-->
diff --git a/src/devices/pic/xml_data/pic.xsd b/src/devices/pic/xml_data/pic.xsd
index f358f68..52d1bb2 100644
--- a/src/devices/pic/xml_data/pic.xsd
+++ b/src/devices/pic/xml_data/pic.xsd
@@ -225,9 +225,9 @@
<xs:attribute name="name" type="memory_type" use="required"/>
<xs:attribute name="start" type="hex" use="required"/>
<xs:attribute name="end" type="hex" use="required"/>
- <xs:attribute name="cal_opmask" type="hex" />
+ <xs:attribute name="cal_optqmask" type="hex" />
<xs:attribute name="cal_opcode" type="hex" />
- <xs:attribute name="rmask" type="hex" />
+ <xs:attribute name="rtqmask" type="hex" />
<xs:attribute name="hexfile_offset" type="hexfile_offset" />
</xs:complexType>
@@ -246,14 +246,14 @@
</xs:complexType>
<xs:complexType name="ConfigType">
<xs:sequence>
- <xs:element name="mask" type="MaskType" maxOccurs="unbounded"/>
+ <xs:element name="tqmask" type="MaskType" maxOccurs="unbounded"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string" use="required"/>
<xs:attribute name="offset" type="hex" use="required"/>
- <xs:attribute name="wmask" type="hex" use="required"/>
+ <xs:attribute name="wtqmask" type="hex" use="required"/>
<xs:attribute name="bvalue" type="hex" use="required"/>
- <xs:attribute name="cmask" type="hex" />
- <xs:attribute name="pmask" type="hex" />
+ <xs:attribute name="ctqmask" type="hex" />
+ <xs:attribute name="ptqmask" type="hex" />
<xs:attribute name="icnames" type="cnames" />
</xs:complexType>
diff --git a/src/devices/pic/xml_data/registers/registers.xml b/src/devices/pic/xml_data/registers/registers.xml
index d7c0884..509e4ff 100644
--- a/src/devices/pic/xml_data/registers/registers.xml
+++ b/src/devices/pic/xml_data/registers/registers.xml
@@ -20769,7 +20769,7 @@
<sfr address="0x0018" access="11111111" name="PRODL" mclr="33333333" por="00000000" />
<sfr address="0x0019" access="11111111" name="PRODH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18C242" unused_bank_mask="0x7FFC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18C242" unused_bank_tqmask="0x7FFC" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F83" />
<unused end="0x0F91" start="0x0F8C" />
@@ -20885,7 +20885,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18C252" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18C252" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F83" />
<unused end="0x0F91" start="0x0F8C" />
@@ -21001,7 +21001,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18C442" unused_bank_mask="0x7FFC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18C442" unused_bank_tqmask="0x7FFC" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -21123,7 +21123,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18C452" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18C452" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -21245,7 +21245,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18C601" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18C601" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F87" />
<unused end="0x0F91" start="0x0F90" />
@@ -21376,7 +21376,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18C658" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18C658" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F2F" start="0x0F2F" />
<unused end="0x0F3F" start="0x0F3F" />
<unused end="0x0F4F" start="0x0F4F" />
@@ -21628,7 +21628,7 @@
<sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18C801" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18C801" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F9B" start="0x0F9B" />
<unused end="0x0FA5" start="0x0FA3" />
@@ -21763,7 +21763,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18C858" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18C858" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F2F" start="0x0F2F" />
<unused end="0x0F3F" start="0x0F3F" />
<unused end="0x0F4F" start="0x0F4F" />
@@ -22021,7 +22021,7 @@
<sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F1220" unused_bank_mask="0x7FFE" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F1220" unused_bank_tqmask="0x7FFE" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F82" />
<unused end="0x0F91" start="0x0F8B" />
@@ -22135,7 +22135,7 @@
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
<sfr address="0x0FAA" access="01033033" name="BAUDCTL" mclr="02021011" por="02021011" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F1230" unused_bank_mask="0x7FFE" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F1230" unused_bank_tqmask="0x7FFE" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0FBF" start="0x0FBA" />
<unused end="0x0FCC" start="0x0FC5" />
@@ -22254,7 +22254,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F1320" unused_bank_mask="0x7FFE" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F1320" unused_bank_tqmask="0x7FFE" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F82" />
<unused end="0x0F91" start="0x0F8B" />
@@ -22368,7 +22368,7 @@
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
<sfr address="0x0FAA" access="01033033" name="BAUDCTL" mclr="02021011" por="02021011" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F1330" unused_bank_mask="0x7FFE" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F1330" unused_bank_tqmask="0x7FFE" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0FBF" start="0x0FBA" />
<unused end="0x0FCC" start="0x0FC5" />
@@ -22487,7 +22487,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2220" unused_bank_mask="0x7FFC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2220" unused_bank_tqmask="0x7FFC" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F83" start="0x0F83" />
<unused end="0x0F88" start="0x0F85" />
@@ -22612,7 +22612,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2221" unused_bank_mask="0x7FFC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2221" unused_bank_tqmask="0x7FFC" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -22740,7 +22740,7 @@
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
<sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2320" unused_bank_mask="0x7FFC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2320" unused_bank_tqmask="0x7FFC" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F83" start="0x0F83" />
<unused end="0x0F88" start="0x0F85" />
@@ -22865,7 +22865,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2321" unused_bank_mask="0x7FFC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2321" unused_bank_tqmask="0x7FFC" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -22993,7 +22993,7 @@
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
<sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F2331" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F2331" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F86" start="0x0F84" />
<unused end="0x0F8F" start="0x0F8E" />
@@ -23163,7 +23163,7 @@
<sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" />
<sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2410" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2410" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
<unused end="0x0F9A" start="0x0F97" />
@@ -23286,7 +23286,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F242" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F242" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F83" />
<unused end="0x0F91" start="0x0F8C" />
@@ -23406,7 +23406,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2420" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2420" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -23534,7 +23534,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2423" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2423" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -23662,7 +23662,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F2431" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F2431" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F86" start="0x0F84" />
<unused end="0x0F8F" start="0x0F8E" />
@@ -23832,7 +23832,7 @@
<sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" />
<sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2439" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2439" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F83" />
<unused end="0x0F91" start="0x0F8C" />
@@ -23944,7 +23944,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2450" unused_bank_mask="0x7FEC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2450" unused_bank_tqmask="0x7FEC" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F88" start="0x0F83" />
<unused end="0x0F91" start="0x0F8C" />
@@ -24078,7 +24078,7 @@
<sfr address="0x0FA7" access="22222222" name="EECON2" mclr="00000000" por="00000000" />
<sfr address="0x0FA6" access="03033390" name="EECON1" mclr="03013110" por="00010110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F2455" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F2455" unused_bank_tqmask="0x7F00" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F83" start="0x0F83" />
@@ -24241,7 +24241,7 @@
<sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" />
<sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F248" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F248" unused_bank_tqmask="0x7FF8" >
<mirror>
<range end="0x0F2E" start="0x0F2E" />
<range end="0x0F3E" start="0x0F3E" />
@@ -24484,7 +24484,7 @@
<sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F2480" unused_bank_mask="0x1FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F2480" unused_bank_tqmask="0x1FF8" >
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
<unused end="0x0D8F" start="0x0D8C" />
@@ -24902,7 +24902,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F24J10" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F24J10" unused_bank_tqmask="0x7FF0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -25025,7 +25025,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2510" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2510" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F83" start="0x0F83" />
<unused end="0x0F88" start="0x0F85" />
@@ -25153,7 +25153,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2515" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2515" unused_bank_tqmask="0x0000" >
<unused end="0x0F83" start="0x0F83" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8C" />
@@ -25276,7 +25276,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F252" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F252" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F83" />
<unused end="0x0F91" start="0x0F8C" />
@@ -25396,7 +25396,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2520" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2520" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F83" start="0x0F83" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F8D" start="0x0F8C" />
@@ -25526,7 +25526,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2523" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2523" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F83" start="0x0F83" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F8D" start="0x0F8C" />
@@ -25656,7 +25656,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2525" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2525" unused_bank_tqmask="0x0000" >
<unused end="0x0F83" start="0x0F83" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8C" />
@@ -25784,7 +25784,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2539" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2539" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F83" />
<unused end="0x0F91" start="0x0F8C" />
@@ -25896,7 +25896,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F2550" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F2550" unused_bank_tqmask="0x7F00" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F83" start="0x0F83" />
@@ -26059,7 +26059,7 @@
<sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" />
<sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F258" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F258" unused_bank_tqmask="0x7FC0" >
<mirror>
<range end="0x0F2E" start="0x0F2E" />
<range end="0x0F3E" start="0x0F3E" />
@@ -26302,7 +26302,7 @@
<sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F2580" unused_bank_mask="0x1FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F2580" unused_bank_tqmask="0x1FC0" >
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
<unused end="0x0D8F" start="0x0D8C" />
@@ -26720,7 +26720,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F2585" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F2585" unused_bank_tqmask="0x0000" >
<unused end="0x0D59" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -27133,7 +27133,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F25J10" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F25J10" unused_bank_tqmask="0x7FF0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -27256,7 +27256,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2610" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2610" unused_bank_tqmask="0x0000" >
<unused end="0x0F83" start="0x0F83" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8C" />
@@ -27379,7 +27379,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F2620" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F2620" unused_bank_tqmask="0x0000" >
<unused end="0x0F83" start="0x0F83" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8C" />
@@ -27507,7 +27507,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F2680" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F2680" unused_bank_tqmask="0x0000" >
<unused end="0x0D59" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -27920,7 +27920,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F2682" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F2682" unused_bank_tqmask="0x0000" >
<unused end="0x0D59" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -28333,7 +28333,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F2685" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F2685" unused_bank_tqmask="0x0000" >
<unused end="0x0D59" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -28746,7 +28746,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4220" unused_bank_mask="0x7FFC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4220" unused_bank_tqmask="0x7FFC" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -28878,7 +28878,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4221" unused_bank_mask="0x7FFC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4221" unused_bank_tqmask="0x7FFC" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -29012,7 +29012,7 @@
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
<sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4320" unused_bank_mask="0x7FFC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4320" unused_bank_tqmask="0x7FFC" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -29144,7 +29144,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4321" unused_bank_mask="0x7FFC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4321" unused_bank_tqmask="0x7FFC" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -29278,7 +29278,7 @@
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
<sfr address="0x0FB8" access="31333033" name="BAUDCON" mclr="12111011" por="12111011" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F4331" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F4331" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F86" start="0x0F85" />
<unused end="0x0F8F" start="0x0F8E" />
@@ -29454,7 +29454,7 @@
<sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" />
<sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4410" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4410" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
<unused end="0x0F9A" start="0x0F97" />
@@ -29582,7 +29582,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F442" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F442" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -29708,7 +29708,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4420" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4420" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
<unused end="0x0F9A" start="0x0F97" />
@@ -29840,7 +29840,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4423" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4423" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
<unused end="0x0F9A" start="0x0F97" />
@@ -29972,7 +29972,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F4431" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F4431" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F86" start="0x0F85" />
<unused end="0x0F8F" start="0x0F8E" />
@@ -30148,7 +30148,7 @@
<sfr address="0x0F64" access="33333333" name="CAP3BUFL" mclr="33333333" por="00000000" />
<sfr address="0x0F64" access="33333333" name="MAXCNTL" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4439" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4439" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -30266,7 +30266,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4450" unused_bank_mask="0x7FEC" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4450" unused_bank_tqmask="0x7FEC" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -30406,7 +30406,7 @@
<sfr address="0x0FA7" access="22222222" name="EECON2" mclr="00000000" por="00000000" />
<sfr address="0x0FA6" access="03033390" name="EECON1" mclr="03013110" por="00010110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F4455" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F4455" unused_bank_tqmask="0x7F00" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F88" start="0x0F85" />
@@ -30571,7 +30571,7 @@
<sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" />
<sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F448" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F448" unused_bank_tqmask="0x7FF8" >
<mirror>
<range end="0x0F2E" start="0x0F2E" />
<range end="0x0F3E" start="0x0F3E" />
@@ -30828,7 +30828,7 @@
<sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F4480" unused_bank_mask="0x1FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F4480" unused_bank_tqmask="0x1FF8" >
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
<unused end="0x0D8F" start="0x0D8C" />
@@ -31260,7 +31260,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F44J10" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F44J10" unused_bank_tqmask="0x7FF0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F91" start="0x0F8F" />
<unused end="0x0F9A" start="0x0F97" />
@@ -31393,7 +31393,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4510" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4510" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -31523,7 +31523,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4515" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4515" unused_bank_tqmask="0x0000" >
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
<unused end="0x0F9A" start="0x0F97" />
@@ -31650,7 +31650,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F452" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F452" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -31776,7 +31776,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4520" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4520" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
<unused end="0x0F9A" start="0x0F97" />
@@ -31908,7 +31908,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4523" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4523" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
<unused end="0x0F9A" start="0x0F97" />
@@ -32040,7 +32040,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4525" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4525" unused_bank_tqmask="0x0000" >
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
<unused end="0x0F9A" start="0x0F97" />
@@ -32172,7 +32172,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4539" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4539" unused_bank_tqmask="0x7FC0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
@@ -32290,7 +32290,7 @@
<sfr address="0x0FAC" access="33330313" name="TXSTA" mclr="11110121" por="11110121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F4550" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F4550" unused_bank_tqmask="0x7F00" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F88" start="0x0F85" />
@@ -32455,7 +32455,7 @@
<sfr address="0x0F67" access="00000111" name="UFRMH" mclr="00000000" por="00000000" />
<sfr address="0x0F66" access="11111111" name="UFRML" mclr="00000000" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F458" unused_bank_mask="0x7FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F458" unused_bank_tqmask="0x7FC0" >
<mirror>
<range end="0x0F2E" start="0x0F2E" />
<range end="0x0F3E" start="0x0F3E" />
@@ -32712,7 +32712,7 @@
<sfr address="0x0F01" access="33303033" name="RXF0SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0F00" access="33333333" name="RXF0SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F4580" unused_bank_mask="0x1FC0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F4580" unused_bank_tqmask="0x1FC0" >
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
<unused end="0x0D8F" start="0x0D8C" />
@@ -33144,7 +33144,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33333033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F4585" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F4585" unused_bank_tqmask="0x0000" >
<unused end="0x0D59" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -33568,7 +33568,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F45J10" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F45J10" unused_bank_tqmask="0x7FF0" >
<unused end="0x0F7F" start="0x0F00" />
<unused end="0x0F91" start="0x0F8F" />
<unused end="0x0F9A" start="0x0F97" />
@@ -33701,7 +33701,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4610" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4610" unused_bank_tqmask="0x0000" >
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
<unused end="0x0F9A" start="0x0F97" />
@@ -33828,7 +33828,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x80" name="18F4620" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x80" name="18F4620" unused_bank_tqmask="0x0000" >
<unused end="0x0F88" start="0x0F85" />
<unused end="0x0F91" start="0x0F8E" />
<unused end="0x0F9A" start="0x0F97" />
@@ -33960,7 +33960,7 @@
<sfr address="0x0FAC" access="33333313" name="TXSTA" mclr="11111121" por="11111121" />
<sfr address="0x0FAB" access="33333111" name="RCSTA" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F4680" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F4680" unused_bank_tqmask="0x0000" >
<unused end="0x0D59" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -34384,7 +34384,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F4682" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F4682" unused_bank_tqmask="0x0000" >
<unused end="0x0D59" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -34808,7 +34808,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F4685" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F4685" unused_bank_tqmask="0x0000" >
<unused end="0x0D59" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -35232,7 +35232,7 @@
<sfr address="0x0D61" access="33303033" name="RXF6SIDL" mclr="33303033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6310" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6310" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F6A" start="0x0F40" />
<unused end="0x0F7C" start="0x0F70" />
<unused end="0x0F7D" start="0x0F7D" />
@@ -35379,7 +35379,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6390" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6390" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F57" start="0x0F40" />
<unused end="0x0F5F" start="0x0F5E" />
<unused end="0x0F7D" start="0x0F7D" />
@@ -35552,7 +35552,7 @@
<sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" />
<sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J11" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J11" unused_bank_tqmask="0x7FF0" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0F88" start="0x0F87" />
<unused end="0x0F9A" start="0x0F99" />
@@ -35689,7 +35689,7 @@
<sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J90" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F63J90" unused_bank_tqmask="0x7FF0" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0F88" start="0x0F87" />
<unused end="0x0F9A" start="0x0F99" />
@@ -35857,7 +35857,7 @@
<sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" />
<sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6410" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6410" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F6A" start="0x0F00" />
<unused end="0x0F7C" start="0x0F70" />
<unused end="0x0F7D" start="0x0F7D" />
@@ -36004,7 +36004,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6490" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6490" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F57" start="0x0F40" />
<unused end="0x0F5F" start="0x0F5E" />
<unused end="0x0F7D" start="0x0F7D" />
@@ -36177,7 +36177,7 @@
<sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" />
<sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J11" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J11" unused_bank_tqmask="0x7FF0" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0F88" start="0x0F87" />
<unused end="0x0F9A" start="0x0F99" />
@@ -36314,7 +36314,7 @@
<sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J90" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F64J90" unused_bank_tqmask="0x7FF0" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0F88" start="0x0F87" />
<unused end="0x0F9A" start="0x0F99" />
@@ -36482,7 +36482,7 @@
<sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" />
<sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6520" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6520" unused_bank_tqmask="0x7F00" >
<unused end="0x0F6A" start="0x0F00" />
<unused end="0x0F7F" start="0x0F79" />
<unused end="0x0F88" start="0x0F87" />
@@ -36641,7 +36641,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6525" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6525" unused_bank_tqmask="0x0000" >
<unused end="0x0F66" start="0x0F00" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F88" start="0x0F87" />
@@ -36807,7 +36807,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6527" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6527" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F88" start="0x0F87" />
@@ -36981,7 +36981,7 @@
<sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6585" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6585" unused_bank_tqmask="0x0000" >
<unused end="0x0D5F" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -37409,7 +37409,7 @@
<sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J10" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J10" unused_bank_tqmask="0x7F00" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
@@ -37581,7 +37581,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J11" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J11" unused_bank_tqmask="0x7F00" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0F88" start="0x0F87" />
<unused end="0x0F9A" start="0x0F99" />
@@ -37718,7 +37718,7 @@
<sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J15" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J15" unused_bank_tqmask="0x7F00" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
@@ -37890,7 +37890,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J50" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J50" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -38076,7 +38076,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J90" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F65J90" unused_bank_tqmask="0x7F00" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0F88" start="0x0F87" />
<unused end="0x0F9A" start="0x0F99" />
@@ -38244,7 +38244,7 @@
<sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" />
<sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6620" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6620" unused_bank_tqmask="0x0000" >
<unused end="0x0F6A" start="0x0F00" />
<unused end="0x0F7F" start="0x0F79" />
<unused end="0x0F88" start="0x0F87" />
@@ -38403,7 +38403,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6621" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6621" unused_bank_tqmask="0x0000" >
<unused end="0x0F66" start="0x0F00" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F88" start="0x0F87" />
@@ -38569,7 +38569,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6622" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6622" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F88" start="0x0F87" />
@@ -38743,7 +38743,7 @@
<sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6627" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6627" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F88" start="0x0F87" />
@@ -38917,7 +38917,7 @@
<sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6680" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6680" unused_bank_tqmask="0x0000" >
<unused end="0x0D5F" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -39345,7 +39345,7 @@
<sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J10" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J10" unused_bank_tqmask="0x7F00" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
@@ -39517,7 +39517,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J11" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J11" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -39704,7 +39704,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J15" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J15" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0FAA" start="0x0FA8" />
@@ -39875,7 +39875,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J16" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J16" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -40062,7 +40062,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J50" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J50" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -40249,7 +40249,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J55" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J55" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -40436,7 +40436,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J60" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J60" unused_bank_tqmask="0x0000" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FAA" start="0x0FA8" />
<unused end="0x0EFF" start="0x0EFF" />
@@ -40689,7 +40689,7 @@
<sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
<sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J65" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F66J65" unused_bank_tqmask="0x0000" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FAA" start="0x0FA8" />
<unused end="0x0EFF" start="0x0EFF" />
@@ -40942,7 +40942,7 @@
<sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
<sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6720" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6720" unused_bank_tqmask="0x0000" >
<unused end="0x0F6A" start="0x0F00" />
<unused end="0x0F7F" start="0x0F79" />
<unused end="0x0F88" start="0x0F87" />
@@ -41101,7 +41101,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F6722" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F6722" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F88" start="0x0F87" />
@@ -41275,7 +41275,7 @@
<sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J10" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J10" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F88" start="0x0F87" />
@@ -41446,7 +41446,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J11" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J11" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -41633,7 +41633,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J50" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J50" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -41820,7 +41820,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J60" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F67J60" unused_bank_tqmask="0x0000" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FAA" start="0x0FA8" />
<unused end="0x0EFF" start="0x0EFF" />
@@ -42073,7 +42073,7 @@
<sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
<sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x40" name="18F8310" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x40" name="18F8310" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F57" start="0x0F00" />
<unused end="0x0F7C" start="0x0F70" />
<unused end="0x0F7D" start="0x0F7D" />
@@ -42223,7 +42223,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8390" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8390" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F57" start="0x0F40" />
<unused end="0x0F7D" start="0x0F7D" />
<unused end="0x0FAA" start="0x0FA6" />
@@ -42400,7 +42400,7 @@
<sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" />
<sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J11" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J11" unused_bank_tqmask="0x7FF0" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FBF" start="0x0F6B" />
<combined address="0x0FFD" size="3" name="TOS" />
@@ -42540,7 +42540,7 @@
<sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J90" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F83J90" unused_bank_tqmask="0x7FF0" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FB0" start="0x0FB0" />
<combined address="0x0FFD" size="3" name="TOS" />
@@ -42711,7 +42711,7 @@
<sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" />
<sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8410" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8410" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F6A" start="0x0F00" />
<unused end="0x0F7C" start="0x0F70" />
<unused end="0x0F7D" start="0x0F7D" />
@@ -42861,7 +42861,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8490" unused_bank_mask="0x7FF8" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8490" unused_bank_tqmask="0x7FF8" >
<unused end="0x0F57" start="0x0F40" />
<unused end="0x0F7D" start="0x0F7D" />
<unused end="0x0FAA" start="0x0FA6" />
@@ -43038,7 +43038,7 @@
<sfr address="0x0F59" access="33303333" name="LCDCON" mclr="11101111" por="11101111" />
<sfr address="0x0F58" access="33333333" name="LCDPS" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J11" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J11" unused_bank_tqmask="0x7FF0" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FBF" start="0x0F6B" />
<combined address="0x0FFD" size="3" name="TOS" />
@@ -43178,7 +43178,7 @@
<sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J90" unused_bank_mask="0x7FF0" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F84J90" unused_bank_tqmask="0x7FF0" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FB0" start="0x0FB0" />
<combined address="0x0FFD" size="3" name="TOS" />
@@ -43349,7 +43349,7 @@
<sfr address="0x0F6C" access="33333333" name="LCDD6" mclr="33333333" por="00000000" />
<sfr address="0x0F6B" access="33333333" name="LCDD5" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8520" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8520" unused_bank_tqmask="0x7F00" >
<unused end="0x0F6A" start="0x0F00" />
<unused end="0x0F7F" start="0x0F79" />
<unused end="0x0F9B" start="0x0F9B" />
@@ -43511,7 +43511,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8525" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8525" unused_bank_tqmask="0x0000" >
<unused end="0x0F66" start="0x0F00" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F9B" start="0x0F9B" />
@@ -43682,7 +43682,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8527" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8527" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F9C" start="0x0F9C" />
@@ -43859,7 +43859,7 @@
<sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8585" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8585" unused_bank_tqmask="0x0000" >
<unused end="0x0D5F" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -44292,7 +44292,7 @@
<sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J10" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J10" unused_bank_tqmask="0x7F00" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
@@ -44467,7 +44467,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J11" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J11" unused_bank_tqmask="0x7F00" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FBF" start="0x0F6B" />
<combined address="0x0FFD" size="3" name="TOS" />
@@ -44607,7 +44607,7 @@
<sfr address="0x0F61" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F60" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J15" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J15" unused_bank_tqmask="0x7F00" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
@@ -44782,7 +44782,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J50" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J50" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -44975,7 +44975,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J90" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F85J90" unused_bank_tqmask="0x7F00" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FB0" start="0x0FB0" />
<combined address="0x0FFD" size="3" name="TOS" />
@@ -45147,7 +45147,7 @@
<sfr address="0x0F6C" access="33333333" name="LCDDATA6" mclr="33333333" por="00000000" />
<sfr address="0x0F6B" access="33333333" name="LCDDATA5" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8620" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8620" unused_bank_tqmask="0x0000" >
<unused end="0x0F6A" start="0x0F00" />
<unused end="0x0F7F" start="0x0F79" />
<unused end="0x0F9B" start="0x0F9B" />
@@ -45309,7 +45309,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8621" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8621" unused_bank_tqmask="0x0000" >
<unused end="0x0F66" start="0x0F00" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F9B" start="0x0F9B" />
@@ -45480,7 +45480,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8622" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8622" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F9C" start="0x0F9C" />
@@ -45657,7 +45657,7 @@
<sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8627" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8627" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F9C" start="0x0F9C" />
@@ -45834,7 +45834,7 @@
<sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8680" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8680" unused_bank_tqmask="0x0000" >
<unused end="0x0D5F" start="0x0D00" />
<unused end="0x0D6F" start="0x0D6C" />
<unused end="0x0D7F" start="0x0D7C" />
@@ -46267,7 +46267,7 @@
<sfr address="0x0D61" access="33333033" name="RXF6SIDL" mclr="33333033" por="00000000" />
<sfr address="0x0D60" access="33333333" name="RXF6SIDH" mclr="33333333" por="00000000" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J10" unused_bank_mask="0x7F00" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J10" unused_bank_tqmask="0x7F00" >
<unused end="0x0F5F" start="0x0F00" />
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
@@ -46442,7 +46442,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J11" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J11" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -46635,7 +46635,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J15" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J15" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0FAA" start="0x0FA8" />
@@ -46809,7 +46809,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J16" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J16" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -47002,7 +47002,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J50" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J50" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -47195,7 +47195,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J55" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J55" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -47388,7 +47388,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J60" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J60" unused_bank_tqmask="0x0000" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FAA" start="0x0FA8" />
<unused end="0x0EFF" start="0x0EFF" />
@@ -47649,7 +47649,7 @@
<sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
<sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J65" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F86J65" unused_bank_tqmask="0x0000" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FAA" start="0x0FA8" />
<unused end="0x0EFF" start="0x0EFF" />
@@ -47910,7 +47910,7 @@
<sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
<sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8720" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8720" unused_bank_tqmask="0x0000" >
<unused end="0x0F6A" start="0x0F00" />
<unused end="0x0F7F" start="0x0F79" />
<unused end="0x0F9B" start="0x0F9B" />
@@ -48072,7 +48072,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F8722" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F8722" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0F9C" start="0x0F9C" />
@@ -48249,7 +48249,7 @@
<sfr address="0x0F6C" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J10" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J10" unused_bank_tqmask="0x0000" >
<unused end="0x0F61" start="0x0F60" />
<unused end="0x0F7B" start="0x0F7A" />
<unused end="0x0FAA" start="0x0FA8" />
@@ -48423,7 +48423,7 @@
<sfr address="0x0F6C" access="33330313" name="TXSTA2" mclr="11110121" por="11110121" />
<sfr address="0x0F6B" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J11" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J11" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -48616,7 +48616,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J50" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J50" unused_bank_tqmask="0x0000" >
<unused end="0x0F59" start="0x0F40" />
<combined address="0x0FFD" size="3" name="TOS" />
<sfr address="0x0FFF" access="00033333" name="TOSU" mclr="00011111" por="00011111" />
@@ -48809,7 +48809,7 @@
<sfr address="0x0FA8" access="33333313" name="TXSTA2" mclr="11111121" por="11111121" />
<sfr address="0x0F9C" access="33333111" name="RCSTA2" mclr="11111110" por="11111110" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J60" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F87J60" unused_bank_tqmask="0x0000" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FAA" start="0x0FA8" />
<unused end="0x0EFF" start="0x0EFF" />
@@ -49070,7 +49070,7 @@
<sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
<sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J60" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J60" unused_bank_tqmask="0x0000" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FAA" start="0x0FA8" />
<unused end="0x0EFF" start="0x0EFF" />
@@ -49335,7 +49335,7 @@
<sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
<sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J65" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F96J65" unused_bank_tqmask="0x0000" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FAA" start="0x0FA8" />
<unused end="0x0EFF" start="0x0EFF" />
@@ -49600,7 +49600,7 @@
<sfr address="0x0E81" access="33333333" name="MAADR6" mclr="11111111" por="11111111" />
<sfr address="0x0E80" access="33333333" name="MAADR5" mclr="11111111" por="11111111" />
</device>
- <device nb_banks="16" access_bank_split_offset="0x60" name="18F97J60" unused_bank_mask="0x0000" >
+ <device nb_banks="16" access_bank_split_offset="0x60" name="18F97J60" unused_bank_tqmask="0x0000" >
<unused end="0x0FD4" start="0x0FD4" />
<unused end="0x0FAA" start="0x0FA8" />
<unused end="0x0EFF" start="0x0EFF" />