Merge duplicate registers into a single record and merge they bitfields.

tools/gen-device-avr/gen-device-avr.go

@@ -213,12 +213,15 @@ func readATDF(path string) (*Device, error) {
 				})
 			}
 
-			if _, ok := allRegisters[regEl.Name]; ok {
+			if firstReg, ok := allRegisters[regEl.Name]; ok {
-				firstReg := allRegisters[regEl.Name]
+				// merge bit fields with previous register
-				for i := 0; i < len(firstReg.peripheral.Registers); i++ {
+				merged := append(firstReg.Bitfields, reg.Bitfields...)
-					if firstReg.peripheral.Registers[i] == firstReg {
+				firstReg.Bitfields = make([]Bitfield, 0, len(merged))
-						firstReg.peripheral.Registers = append(firstReg.peripheral.Registers[:i], firstReg.peripheral.Registers[i+1:]...)
+				m := make(map[string]interface{})
-						break
+				for _, field := range merged {
+					if _, ok := m[field.Name]; !ok {
+						m[field.Name] = nil
+						firstReg.Bitfields = append(firstReg.Bitfields, field)
 					}
 				}
 				continue