diff --git a/buildroot/share/PlatformIO/boards/marlin_FYSETC_CHEETAH_V20.json b/buildroot/share/PlatformIO/boards/marlin_FYSETC_CHEETAH_V20.json
index 6c2e093c3b..7dd7542c6d 100644
--- a/buildroot/share/PlatformIO/boards/marlin_FYSETC_CHEETAH_V20.json
+++ b/buildroot/share/PlatformIO/boards/marlin_FYSETC_CHEETAH_V20.json
@@ -55,7 +55,7 @@
       "dfu",
       "jlink"
     ],
-	"offset_address": "0x8008000",
+    "offset_address": "0x8008000",
     "require_upload_port": true,
     "use_1200bps_touch": false,
     "wait_for_upload_port": false
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARCHIM/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_ARCHIM/variant.h
index 11f8f63bfb..c073e9bbdd 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_ARCHIM/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARCHIM/variant.h
@@ -24,10 +24,10 @@
  *----------------------------------------------------------------------------*/
 
 /** Frequency of the board main oscillator */
-#define VARIANT_MAINOSC		12000000
+#define VARIANT_MAINOSC   12000000
 
 /** Master clock frequency */
-#define VARIANT_MCK			84000000
+#define VARIANT_MCK     84000000
 
 /*----------------------------------------------------------------------------
  *        Headers
@@ -119,13 +119,13 @@ extern "C"{
 #define BOARD_SPI_DEFAULT_SS BOARD_SPI_SS3
 
 #define BOARD_PIN_TO_SPI_PIN(x) \
-	(x==BOARD_SPI_SS0 ? PIN_SPI_SS0 : \
-	(x==BOARD_SPI_SS1 ? PIN_SPI_SS1 : \
-	(x==BOARD_SPI_SS2 ? PIN_SPI_SS2 : PIN_SPI_SS3 )))
+  (x==BOARD_SPI_SS0 ? PIN_SPI_SS0 : \
+  (x==BOARD_SPI_SS1 ? PIN_SPI_SS1 : \
+  (x==BOARD_SPI_SS2 ? PIN_SPI_SS2 : PIN_SPI_SS3 )))
 #define BOARD_PIN_TO_SPI_CHANNEL(x) \
-	(x==BOARD_SPI_SS0 ? 0 : \
-	(x==BOARD_SPI_SS1 ? 1 : \
-	(x==BOARD_SPI_SS2 ? 2 : 3)))
+  (x==BOARD_SPI_SS0 ? 0 : \
+  (x==BOARD_SPI_SS1 ? 1 : \
+  (x==BOARD_SPI_SS2 ? 2 : 3)))
 
 static const uint8_t SS   = BOARD_SPI_SS0;
 static const uint8_t SS1  = BOARD_SPI_SS1;
@@ -195,7 +195,7 @@ static const uint8_t DAC0 = 66;
 static const uint8_t DAC1 = 67;
 static const uint8_t CANRX = 68;
 static const uint8_t CANTX = 69;
-#define ADC_RESOLUTION		12
+#define ADC_RESOLUTION    12
 
 /*
  * Complementary CAN pins
@@ -212,21 +212,21 @@ static const uint8_t CAN1TX = 89;
 /*
  * DACC
  */
-#define DACC_INTERFACE		DACC
-#define DACC_INTERFACE_ID	ID_DACC
-#define DACC_RESOLUTION		12
+#define DACC_INTERFACE    DACC
+#define DACC_INTERFACE_ID ID_DACC
+#define DACC_RESOLUTION   12
 #define DACC_ISR_HANDLER    DACC_Handler
 #define DACC_ISR_ID         DACC_IRQn
 
 /*
  * PWM
  */
-#define PWM_INTERFACE		PWM
-#define PWM_INTERFACE_ID	ID_PWM
-#define PWM_FREQUENCY		31000
-#define PWM_MAX_DUTY_CYCLE	255
-#define PWM_MIN_DUTY_CYCLE	0
-#define PWM_RESOLUTION		8
+#define PWM_INTERFACE   PWM
+#define PWM_INTERFACE_ID  ID_PWM
+#define PWM_FREQUENCY   31000
+#define PWM_MAX_DUTY_CYCLE  255
+#define PWM_MIN_DUTY_CYCLE  0
+#define PWM_RESOLUTION    8
 
 /*
  * TC
@@ -236,7 +236,7 @@ static const uint8_t CAN1TX = 89;
 #define TC_FREQUENCY        100000
 #define TC_MAX_DUTY_CYCLE   255
 #define TC_MIN_DUTY_CYCLE   0
-#define TC_RESOLUTION		8
+#define TC_RESOLUTION   8
 
 #ifdef __cplusplus
 }
@@ -281,4 +281,3 @@ extern USARTClass Serial3;
 #define SERIAL_PORT_HARDWARE3       Serial3
 
 #endif /* _VARIANT_ARDUINO_DUE_X_ */
-
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h
index ca7a53d782..f32ff3c28d 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_ARTILLERY_RUBY/variant.h
@@ -121,6 +121,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
index 068d0b9ee5..88b6e45292 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_BTT002/variant.h
@@ -272,6 +272,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h
index edc1c91c53..90e9998d10 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_E3_RRF/variant.h
@@ -267,6 +267,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
index d39e665d53..01f19a7933 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_GTR_V1/variant.h
@@ -295,6 +295,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
index c30d7ecc77..56bc3bdd9e 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BIGTREE_SKR_PRO_11/variant.h
@@ -295,6 +295,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h
index 285ad662e0..f03ba32637 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_BTT_SKR_SE_BX/variant.h
@@ -195,6 +195,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.h
index 595601aae0..722a29d00d 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_CREALITY_STM32F401RC/variant.h
@@ -123,6 +123,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
index 8f17d052bb..4a0245e7e9 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Rx/variant.h
@@ -148,6 +148,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
index 8e4f248c2e..3fac64958c 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103VE_LONGER/variant.h
@@ -148,6 +148,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld
index 3013b09607..ac7ac2e904 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/ldscript.ld
@@ -4,7 +4,7 @@
 
 **  File        : LinkerScript.ld
 **
-**  Author		: Auto-generated by STM32CubeIDE
+**  Author    : Auto-generated by STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32F103V(8/B/C/E/F/GTx Device from STM32F1 series
 **                      64/128/256/512/768/1024Kbytes FLASH
@@ -54,15 +54,15 @@
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = 0x20000000 + LD_MAX_DATA_SIZE;	/* end of "RAM" Ram type memory */
+_estack = 0x20000000 + LD_MAX_DATA_SIZE;  /* end of "RAM" Ram type memory */
 _Min_Heap_Size = 0x200;      /* required amount of heap  */
 _Min_Stack_Size = 0x400; /* required amount of stack */
 
 /* Memories definition */
 MEMORY
 {
-    RAM	(xrw)	: ORIGIN = 0x20000000,	LENGTH = LD_MAX_DATA_SIZE
-    FLASH	(rx)	: ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+    RAM (xrw) : ORIGIN = 0x20000000,  LENGTH = LD_MAX_DATA_SIZE
+    FLASH (rx)  : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
 }
 
 /* Sections */
@@ -103,9 +103,9 @@ SECTIONS
   } >FLASH
 
   .ARM.extab   : {
-  	. = ALIGN(4);
-  	*(.ARM.extab* .gnu.linkonce.armextab.*)
-  	. = ALIGN(4);
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
   } >FLASH
   .ARM : {
     . = ALIGN(4);
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h
index e01d67fd59..4061db4e26 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Vx/variant.h
@@ -158,6 +158,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld
index cac12da5c2..d995458f95 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/ldscript.ld
@@ -1,10 +1,9 @@
 /*
 ******************************************************************************
 **
-
 **  File        : LinkerScript.ld
 **
-**  Author		: Auto-generated by STM32CubeIDE
+**  Author    : Auto-generated by STM32CubeIDE
 **
 **  Abstract    : Linker script for STM32F103Z(C/D/E/G/GTx Device from STM32F1 series
 **                      256/386/512K/786/1024bytes FLASH
@@ -54,7 +53,7 @@
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = 0x20000000 + LD_MAX_DATA_SIZE;	/* end of "RAM" Ram type memory */
+_estack = 0x20000000 + LD_MAX_DATA_SIZE;  /* end of "RAM" Ram type memory */
 _Min_Heap_Size = 0x200;      /* required amount of heap  */
 _Min_Stack_Size = 0x400; /* required amount of stack */
 
@@ -62,7 +61,7 @@ _Min_Stack_Size = 0x400; /* required amount of stack */
 MEMORY
 {
   RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE
-  FLASH	(rx)	: ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
+  FLASH (rx)  : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET
 }
 
 /* Sections */
@@ -103,9 +102,9 @@ SECTIONS
   } >FLASH
 
   .ARM.extab   : {
-  	. = ALIGN(4);
-  	*(.ARM.extab* .gnu.linkonce.armextab.*)
-  	. = ALIGN(4);
+    . = ALIGN(4);
+    *(.ARM.extab* .gnu.linkonce.armextab.*)
+    . = ALIGN(4);
   } >FLASH
   .ARM : {
     . = ALIGN(4);
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h
index 330a7efbf8..8de1e062f9 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F103Zx/variant.h
@@ -205,6 +205,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld
index c7e67d311e..d028dfc000 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F401RC/ldscript.ld
@@ -28,10 +28,10 @@
 ENTRY(Reset_Handler)
 
 /* Highest address of the user mode stack */
-_estack = ORIGIN(RAM) + LENGTH(RAM);	/* end of "RAM" Ram type memory */
+_estack = ORIGIN(RAM) + LENGTH(RAM);  /* end of "RAM" Ram type memory */
 
-_Min_Heap_Size = 0x200;	/* required amount of heap  */
-_Min_Stack_Size = 0x400;	/* required amount of stack */
+_Min_Heap_Size = 0x200; /* required amount of heap  */
+_Min_Stack_Size = 0x400;  /* required amount of stack */
 
 /* Memories definition */
 MEMORY
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h
index df8bf064fc..df45a5dbbb 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F407VE/variant.h
@@ -326,6 +326,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F446VE/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F446VE/variant.h
index 855616f66b..b2111d04f2 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F446VE/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F446VE/variant.h
@@ -159,6 +159,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h
index 0b78be627f..d6f8e9fe83 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_F4x7Vx/variant.h
@@ -176,6 +176,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
index 2bfce85e21..80d5d3e009 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FLY_F407ZG/variant.h
@@ -37,121 +37,120 @@ extern "C" {
  *        Pins
  *----------------------------------------------------------------------------*/
 
-
-#define PA1 	0
-#define PA2 	1
-#define PA3 	2
-#define PA4 	3
-#define PA5 	4
-#define PA6 	5
-#define PA7 	6
-#define PA8 	7
-#define PA9   	8
-#define PA10	9
-#define PA11	10
-#define PA12	11
-#define PA13	12
-#define PA14	13
-#define PA15	14
-#define PB0	    15
-#define PB1   	16
-#define PB2	    17
-#define PB3	    18
-#define PB4    	19
-#define PB5   	20
-#define PB6	    21
-#define PB7	    22
-#define PB8	    23
-#define PB9   	24
-#define PB10	25
-#define PB11	26
-#define PB12	27
-#define PB13	28
-#define PB14	29
-#define PB15	30
-#define PC2 	31
-#define PC3 	32
-#define PC4 	33
-#define PC5 	34
-#define PC6 	35
-#define PC7 	36
-#define PC8 	37
-#define PC9 	38
-#define PC10	39
-#define PC11	40
-#define PC12	41
-#define PC13	42
-#define PC14	43
-#define PC15	44
-#define PD0 	45
-#define PD1 	46
-#define PD2 	47
-#define PD3 	48
-#define PD4 	49
-#define PD5 	50
-#define PD6 	51
-#define PD7 	52
-#define PD8 	53
-#define PD9 	54
-#define PD10	55
-#define PD11	56
-#define PD12	57
-#define PD13	58
-#define PD14	59
-#define PD15	60
-#define PE0 	61
-#define PE1 	62
-#define PE11 	63
-#define PE3 	64
-#define PE4 	65
-#define PE5 	66
-#define PE6 	67
-#define PE7 	68
-#define PE8 	69
-#define PE9 	70
-#define PE10	71
+#define PA1     0
+#define PA2     1
+#define PA3     2
+#define PA4     3
+#define PA5     4
+#define PA6     5
+#define PA7     6
+#define PA8     7
+#define PA9     8
+#define PA10    9
+#define PA11    10
+#define PA12    11
+#define PA13    12
+#define PA14    13
+#define PA15    14
+#define PB0     15
+#define PB1     16
+#define PB2     17
+#define PB3     18
+#define PB4     19
+#define PB5     20
+#define PB6     21
+#define PB7     22
+#define PB8     23
+#define PB9     24
+#define PB10    25
+#define PB11    26
+#define PB12    27
+#define PB13    28
+#define PB14    29
+#define PB15    30
+#define PC2     31
+#define PC3     32
+#define PC4     33
+#define PC5     34
+#define PC6     35
+#define PC7     36
+#define PC8     37
+#define PC9     38
+#define PC10    39
+#define PC11    40
+#define PC12    41
+#define PC13    42
+#define PC14    43
+#define PC15    44
+#define PD0     45
+#define PD1     46
+#define PD2     47
+#define PD3     48
+#define PD4     49
+#define PD5     50
+#define PD6     51
+#define PD7     52
+#define PD8     53
+#define PD9     54
+#define PD10    55
+#define PD11    56
+#define PD12    57
+#define PD13    58
+#define PD14    59
+#define PD15    60
+#define PE0     61
+#define PE1     62
+#define PE11    63
+#define PE3     64
+#define PE4     65
+#define PE5     66
+#define PE6     67
+#define PE7     68
+#define PE8     69
+#define PE9     70
+#define PE10    71
 #define PE2     72
-#define PE12	73
-#define PE13	74
-#define PE14	75
-#define PE15	76
-#define PF0 	77
-#define PF1 	78
-#define PF2 	79
-#define PF6 	80
-#define PF7 	81
-#define PF8 	82
-#define PF9 	83
-#define PF11	84
-#define PF12	85
-#define PF13	86
-#define PF14	87
-#define PF15	88
-#define PG0 	89
-#define PG1 	90
-#define PG2 	91
-#define PG3 	92
-#define PG4 	93
-#define PG5 	94
-#define PG6 	95
-#define PG7 	96
-#define PG8 	97
-#define PG9 	98
-#define PG10	99
-#define PG11	100
-#define PG12	101
-#define PG13	102
-#define PG14	103
-#define PG15	104
-#define PH0 	105
-#define PH1	    106
-#define PA0   	107
-#define PC1 	108
-#define PC0 	109
-#define PF10	110
-#define PF5 	111
-#define PF4 	112
-#define PF3 	113
+#define PE12    73
+#define PE13    74
+#define PE14    75
+#define PE15    76
+#define PF0     77
+#define PF1     78
+#define PF2     79
+#define PF6     80
+#define PF7     81
+#define PF8     82
+#define PF9     83
+#define PF11    84
+#define PF12    85
+#define PF13    86
+#define PF14    87
+#define PF15    88
+#define PG0     89
+#define PG1     90
+#define PG2     91
+#define PG3     92
+#define PG4     93
+#define PG5     94
+#define PG6     95
+#define PG7     96
+#define PG8     97
+#define PG9     98
+#define PG10    99
+#define PG11    100
+#define PG12    101
+#define PG13    102
+#define PG14    103
+#define PG15    104
+#define PH0     105
+#define PH1     106
+#define PA0     107
+#define PC1     108
+#define PC0     109
+#define PF10    110
+#define PF5     111
+#define PF4     112
+#define PF3     113
 
 // This must be a literal
 #define NUM_DIGITAL_PINS        114
@@ -212,6 +211,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
@@ -234,5 +234,5 @@ extern "C" {
 //                            pins are NOT connected to anything by default.
 #define SERIAL_PORT_MONITOR     Serial
 #define SERIAL_PORT_HARDWARE    Serial1
-#endif
 
+#endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
index 041c43b55f..ca3664daa1 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_CHEETAH_V20/variant.h
@@ -121,6 +121,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c
index 4c0a7e4fa1..f8ec838146 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/PeripheralPins.c
@@ -47,10 +47,10 @@ WEAK const PinMap PinMap_ADC[] = {
   //{PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
   //{PA_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
   //{PA_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1
-  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2			LCD RX
+  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)},   // ADC1_IN2  LCD RX
   //{PA_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
   //{PA_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2
-  {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3			LCD TX
+  {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)},   // ADC1_IN3  LCD TX
   //{PA_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
   //{PA_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3
   //{PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.h
index c3a0c16811..abcbba8595 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_FYSETC_SPIDER_KING407/variant.h
@@ -37,121 +37,120 @@ extern "C" {
  *        Pins
  *----------------------------------------------------------------------------*/
 
-
-#define PA1 	0
-#define PA2 	1
-#define PA3 	2
-#define PA4 	3
-#define PA5 	4
-#define PA6 	5
-#define PA7 	6
-#define PA8 	7
-#define PA9   	8
-#define PA10	9
-#define PA11	10
-#define PA12	11
-#define PA13	12
-#define PA14	13
-#define PA15	14
-#define PB0 	15
-#define PB1 	16
-#define PB2 	17
-#define PB3 	18
-#define PB4 	19
-#define PB5 	20
-#define PB6 	21
-#define PB7 	22
-#define PB8 	23
-#define PB9 	24
-#define PB10	25
-#define PB11	26
-#define PB12	27
-#define PB13	28
-#define PB14	29
-#define PB15	30
-#define PC2 	31
-#define PC3 	32
-#define PC4 	33
-#define PC5 	34
-#define PC6 	35
-#define PC7 	36
-#define PC8 	37
-#define PC9 	38
-#define PC10	39
-#define PC11	40
-#define PC12	41
-#define PC13	42
-#define PC14	43
-#define PC15	44
-#define PD0 	45
-#define PD1 	46
-#define PD2 	47
-#define PD3 	48
-#define PD4 	49
-#define PD5 	50
-#define PD6 	51
-#define PD7 	52
-#define PD8 	53
-#define PD9 	54
-#define PD10	55
-#define PD11	56
-#define PD12	57
-#define PD13	58
-#define PD14	59
-#define PD15	60
-#define PE0 	61
-#define PE1 	62
-#define PE11 	63
-#define PE3 	64
-#define PE4 	65
-#define PE5 	66
-#define PE6 	67
-#define PE7 	68
-#define PE8 	69
-#define PE9 	70
-#define PE10	71
+#define PA1     0
+#define PA2     1
+#define PA3     2
+#define PA4     3
+#define PA5     4
+#define PA6     5
+#define PA7     6
+#define PA8     7
+#define PA9     8
+#define PA10    9
+#define PA11    10
+#define PA12    11
+#define PA13    12
+#define PA14    13
+#define PA15    14
+#define PB0     15
+#define PB1     16
+#define PB2     17
+#define PB3     18
+#define PB4     19
+#define PB5     20
+#define PB6     21
+#define PB7     22
+#define PB8     23
+#define PB9     24
+#define PB10    25
+#define PB11    26
+#define PB12    27
+#define PB13    28
+#define PB14    29
+#define PB15    30
+#define PC2     31
+#define PC3     32
+#define PC4     33
+#define PC5     34
+#define PC6     35
+#define PC7     36
+#define PC8     37
+#define PC9     38
+#define PC10    39
+#define PC11    40
+#define PC12    41
+#define PC13    42
+#define PC14    43
+#define PC15    44
+#define PD0     45
+#define PD1     46
+#define PD2     47
+#define PD3     48
+#define PD4     49
+#define PD5     50
+#define PD6     51
+#define PD7     52
+#define PD8     53
+#define PD9     54
+#define PD10    55
+#define PD11    56
+#define PD12    57
+#define PD13    58
+#define PD14    59
+#define PD15    60
+#define PE0     61
+#define PE1     62
+#define PE11    63
+#define PE3     64
+#define PE4     65
+#define PE5     66
+#define PE6     67
+#define PE7     68
+#define PE8     69
+#define PE9     70
+#define PE10    71
 #define PE2     72
-#define PE12	73
-#define PE13	74
-#define PE14	75
-#define PE15	76
-#define PF0 	77
-#define PF1 	78
-#define PF2 	79
-#define PF6 	80
-#define PF7 	81
-#define PF8 	82
-#define PF9 	83
-#define PF11	84
-#define PF12	85
-#define PF13	86
-#define PF14	87
-#define PF15	88
-#define PG0 	89
-#define PG1 	90
-#define PG2 	91
-#define PG3 	92
-#define PG4 	93
-#define PG5 	94
-#define PG6 	95
-#define PG7 	96
-#define PG8 	97
-#define PG9 	98
-#define PG10	99
-#define PG11	100
-#define PG12	101
-#define PG13	102
-#define PG14	103
-#define PG15	104
-#define PH0 	105
-#define PH1 	106
-#define PA0   	107
-#define PC1 	108
-#define PC0 	109
-#define PF10	110
-#define PF5 	111
-#define PF4 	112
-#define PF3 	113
+#define PE12    73
+#define PE13    74
+#define PE14    75
+#define PE15    76
+#define PF0     77
+#define PF1     78
+#define PF2     79
+#define PF6     80
+#define PF7     81
+#define PF8     82
+#define PF9     83
+#define PF11    84
+#define PF12    85
+#define PF13    86
+#define PF14    87
+#define PF15    88
+#define PG0     89
+#define PG1     90
+#define PG2     91
+#define PG3     92
+#define PG4     93
+#define PG5     94
+#define PG6     95
+#define PG7     96
+#define PG8     97
+#define PG9     98
+#define PG10    99
+#define PG11    100
+#define PG12    101
+#define PG13    102
+#define PG14    103
+#define PG15    104
+#define PH0     105
+#define PH1     106
+#define PA0     107
+#define PC1     108
+#define PC0     109
+#define PF10    110
+#define PF5     111
+#define PF4     112
+#define PF3     113
 
 // This must be a literal
 #define NUM_DIGITAL_PINS        114
@@ -210,6 +209,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
@@ -230,8 +230,7 @@ extern "C" {
 //
 // SERIAL_PORT_HARDWARE_OPEN  Hardware serial ports which are open for use.  Their RX & TX
 //                            pins are NOT connected to anything by default.
-#define SERIAL_PORT_MONITOR     	Serial
-#define SERIAL_PORT_HARDWARE    	Serial1
+#define SERIAL_PORT_MONITOR         Serial
+#define SERIAL_PORT_HARDWARE        Serial1
 #define SERIAL_PORT_HARDWARE_OPEN   Serial2
 #endif
-
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
index e7bc7c0bc1..e71bb1c5c8 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_LERDGE/variant.h
@@ -218,6 +218,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MEGA_EXTENDED/pins_arduino.h b/buildroot/share/PlatformIO/variants/MARLIN_MEGA_EXTENDED/pins_arduino.h
index 1129f8edae..f6bc62d57b 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_MEGA_EXTENDED/pins_arduino.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MEGA_EXTENDED/pins_arduino.h
@@ -118,324 +118,324 @@ static const uint8_t A15 = PIN_A15;
 #ifdef ARDUINO_MAIN
 
 const uint16_t PROGMEM port_to_mode_PGM[] = {
-	NOT_A_PORT,
-	(uint16_t) &DDRA,
-	(uint16_t) &DDRB,
-	(uint16_t) &DDRC,
-	(uint16_t) &DDRD,
-	(uint16_t) &DDRE,
-	(uint16_t) &DDRF,
-	(uint16_t) &DDRG,
-	(uint16_t) &DDRH,
-	NOT_A_PORT,
-	(uint16_t) &DDRJ,
-	(uint16_t) &DDRK,
-	(uint16_t) &DDRL,
+  NOT_A_PORT,
+  (uint16_t) &DDRA,
+  (uint16_t) &DDRB,
+  (uint16_t) &DDRC,
+  (uint16_t) &DDRD,
+  (uint16_t) &DDRE,
+  (uint16_t) &DDRF,
+  (uint16_t) &DDRG,
+  (uint16_t) &DDRH,
+  NOT_A_PORT,
+  (uint16_t) &DDRJ,
+  (uint16_t) &DDRK,
+  (uint16_t) &DDRL,
 };
 
 const uint16_t PROGMEM port_to_output_PGM[] = {
-	NOT_A_PORT,
-	(uint16_t) &PORTA,
-	(uint16_t) &PORTB,
-	(uint16_t) &PORTC,
-	(uint16_t) &PORTD,
-	(uint16_t) &PORTE,
-	(uint16_t) &PORTF,
-	(uint16_t) &PORTG,
-	(uint16_t) &PORTH,
-	NOT_A_PORT,
-	(uint16_t) &PORTJ,
-	(uint16_t) &PORTK,
-	(uint16_t) &PORTL,
+  NOT_A_PORT,
+  (uint16_t) &PORTA,
+  (uint16_t) &PORTB,
+  (uint16_t) &PORTC,
+  (uint16_t) &PORTD,
+  (uint16_t) &PORTE,
+  (uint16_t) &PORTF,
+  (uint16_t) &PORTG,
+  (uint16_t) &PORTH,
+  NOT_A_PORT,
+  (uint16_t) &PORTJ,
+  (uint16_t) &PORTK,
+  (uint16_t) &PORTL,
 };
 
 const uint16_t PROGMEM port_to_input_PGM[] = {
-	NOT_A_PIN,
-	(uint16_t) &PINA,
-	(uint16_t) &PINB,
-	(uint16_t) &PINC,
-	(uint16_t) &PIND,
-	(uint16_t) &PINE,
-	(uint16_t) &PINF,
-	(uint16_t) &PING,
-	(uint16_t) &PINH,
-	NOT_A_PIN,
-	(uint16_t) &PINJ,
-	(uint16_t) &PINK,
-	(uint16_t) &PINL,
+  NOT_A_PIN,
+  (uint16_t) &PINA,
+  (uint16_t) &PINB,
+  (uint16_t) &PINC,
+  (uint16_t) &PIND,
+  (uint16_t) &PINE,
+  (uint16_t) &PINF,
+  (uint16_t) &PING,
+  (uint16_t) &PINH,
+  NOT_A_PIN,
+  (uint16_t) &PINJ,
+  (uint16_t) &PINK,
+  (uint16_t) &PINL,
 };
 
 const uint8_t PROGMEM digital_pin_to_port_PGM[] = {
-	// PORTLIST
-	// -------------------------------------------
-	PE	, // PE 0 ** 0 ** USART0_RX
-	PE	, // PE 1 ** 1 ** USART0_TX
-	PE	, // PE 4 ** 2 ** PWM2
-	PE	, // PE 5 ** 3 ** PWM3
-	PG	, // PG 5 ** 4 ** PWM4
-	PE	, // PE 3 ** 5 ** PWM5
-	PH	, // PH 3 ** 6 ** PWM6
-	PH	, // PH 4 ** 7 ** PWM7
-	PH	, // PH 5 ** 8 ** PWM8
-	PH	, // PH 6 ** 9 ** PWM9
-	PB	, // PB 4 ** 10 ** PWM10
-	PB	, // PB 5 ** 11 ** PWM11
-	PB	, // PB 6 ** 12 ** PWM12
-	PB	, // PB 7 ** 13 ** PWM13
-	PJ	, // PJ 1 ** 14 ** USART3_TX
-	PJ	, // PJ 0 ** 15 ** USART3_RX
-	PH	, // PH 1 ** 16 ** USART2_TX
-	PH	, // PH 0 ** 17 ** USART2_RX
-	PD	, // PD 3 ** 18 ** USART1_TX
-	PD	, // PD 2 ** 19 ** USART1_RX
-	PD	, // PD 1 ** 20 ** I2C_SDA
-	PD	, // PD 0 ** 21 ** I2C_SCL
-	PA	, // PA 0 ** 22 ** D22
-	PA	, // PA 1 ** 23 ** D23
-	PA	, // PA 2 ** 24 ** D24
-	PA	, // PA 3 ** 25 ** D25
-	PA	, // PA 4 ** 26 ** D26
-	PA	, // PA 5 ** 27 ** D27
-	PA	, // PA 6 ** 28 ** D28
-	PA	, // PA 7 ** 29 ** D29
-	PC	, // PC 7 ** 30 ** D30
-	PC	, // PC 6 ** 31 ** D31
-	PC	, // PC 5 ** 32 ** D32
-	PC	, // PC 4 ** 33 ** D33
-	PC	, // PC 3 ** 34 ** D34
-	PC	, // PC 2 ** 35 ** D35
-	PC	, // PC 1 ** 36 ** D36
-	PC	, // PC 0 ** 37 ** D37
-	PD	, // PD 7 ** 38 ** D38
-	PG	, // PG 2 ** 39 ** D39
-	PG	, // PG 1 ** 40 ** D40
-	PG	, // PG 0 ** 41 ** D41
-	PL	, // PL 7 ** 42 ** D42
-	PL	, // PL 6 ** 43 ** D43
-	PL	, // PL 5 ** 44 ** D44
-	PL	, // PL 4 ** 45 ** D45
-	PL	, // PL 3 ** 46 ** D46
-	PL	, // PL 2 ** 47 ** D47
-	PL	, // PL 1 ** 48 ** D48
-	PL	, // PL 0 ** 49 ** D49
-	PB	, // PB 3 ** 50 ** SPI_MISO
-	PB	, // PB 2 ** 51 ** SPI_MOSI
-	PB	, // PB 1 ** 52 ** SPI_SCK
-	PB	, // PB 0 ** 53 ** SPI_SS
-	PF	, // PF 0 ** 54 ** A0
-	PF	, // PF 1 ** 55 ** A1
-	PF	, // PF 2 ** 56 ** A2
-	PF	, // PF 3 ** 57 ** A3
-	PF	, // PF 4 ** 58 ** A4
-	PF	, // PF 5 ** 59 ** A5
-	PF	, // PF 6 ** 60 ** A6
-	PF	, // PF 7 ** 61 ** A7
-	PK	, // PK 0 ** 62 ** A8
-	PK	, // PK 1 ** 63 ** A9
-	PK	, // PK 2 ** 64 ** A10
-	PK	, // PK 3 ** 65 ** A11
-	PK	, // PK 4 ** 66 ** A12
-	PK	, // PK 5 ** 67 ** A13
-	PK	, // PK 6 ** 68 ** A14
-	PK	, // PK 7 ** 69 ** A15
-	PG 	, // PG 4 ** 70 ** D70
-	PG 	, // PG 3 ** 71 ** D71
-	PJ 	, // PJ 2 ** 72 ** D72
-	PJ 	, // PJ 3 ** 73 ** D73
-	PJ 	, // PJ 7 ** 74 ** D74
-	PJ 	, // PJ 4 ** 75 ** D75
-	PJ 	, // PJ 5 ** 76 ** D76
-	PJ 	, // PJ 6 ** 77 ** D77
-	PE 	, // PE 2 ** 78 ** D78
-	PE 	, // PE 6 ** 79 ** D79
-	PE 	, // PE 7 ** 80 ** D80
-	PD 	, // PD 4 ** 81 ** D81
-	PD 	, // PD 5 ** 82 ** D82
-	PD 	, // PD 6 ** 83 ** D83
-	PH 	, // PH 2 ** 84 ** D84
-	PH 	, // PH 7 ** 85 ** D85
+  // PORTLIST
+  // -------------------------------------------
+  PE  , // PE 0 ** 0 ** USART0_RX
+  PE  , // PE 1 ** 1 ** USART0_TX
+  PE  , // PE 4 ** 2 ** PWM2
+  PE  , // PE 5 ** 3 ** PWM3
+  PG  , // PG 5 ** 4 ** PWM4
+  PE  , // PE 3 ** 5 ** PWM5
+  PH  , // PH 3 ** 6 ** PWM6
+  PH  , // PH 4 ** 7 ** PWM7
+  PH  , // PH 5 ** 8 ** PWM8
+  PH  , // PH 6 ** 9 ** PWM9
+  PB  , // PB 4 ** 10 ** PWM10
+  PB  , // PB 5 ** 11 ** PWM11
+  PB  , // PB 6 ** 12 ** PWM12
+  PB  , // PB 7 ** 13 ** PWM13
+  PJ  , // PJ 1 ** 14 ** USART3_TX
+  PJ  , // PJ 0 ** 15 ** USART3_RX
+  PH  , // PH 1 ** 16 ** USART2_TX
+  PH  , // PH 0 ** 17 ** USART2_RX
+  PD  , // PD 3 ** 18 ** USART1_TX
+  PD  , // PD 2 ** 19 ** USART1_RX
+  PD  , // PD 1 ** 20 ** I2C_SDA
+  PD  , // PD 0 ** 21 ** I2C_SCL
+  PA  , // PA 0 ** 22 ** D22
+  PA  , // PA 1 ** 23 ** D23
+  PA  , // PA 2 ** 24 ** D24
+  PA  , // PA 3 ** 25 ** D25
+  PA  , // PA 4 ** 26 ** D26
+  PA  , // PA 5 ** 27 ** D27
+  PA  , // PA 6 ** 28 ** D28
+  PA  , // PA 7 ** 29 ** D29
+  PC  , // PC 7 ** 30 ** D30
+  PC  , // PC 6 ** 31 ** D31
+  PC  , // PC 5 ** 32 ** D32
+  PC  , // PC 4 ** 33 ** D33
+  PC  , // PC 3 ** 34 ** D34
+  PC  , // PC 2 ** 35 ** D35
+  PC  , // PC 1 ** 36 ** D36
+  PC  , // PC 0 ** 37 ** D37
+  PD  , // PD 7 ** 38 ** D38
+  PG  , // PG 2 ** 39 ** D39
+  PG  , // PG 1 ** 40 ** D40
+  PG  , // PG 0 ** 41 ** D41
+  PL  , // PL 7 ** 42 ** D42
+  PL  , // PL 6 ** 43 ** D43
+  PL  , // PL 5 ** 44 ** D44
+  PL  , // PL 4 ** 45 ** D45
+  PL  , // PL 3 ** 46 ** D46
+  PL  , // PL 2 ** 47 ** D47
+  PL  , // PL 1 ** 48 ** D48
+  PL  , // PL 0 ** 49 ** D49
+  PB  , // PB 3 ** 50 ** SPI_MISO
+  PB  , // PB 2 ** 51 ** SPI_MOSI
+  PB  , // PB 1 ** 52 ** SPI_SCK
+  PB  , // PB 0 ** 53 ** SPI_SS
+  PF  , // PF 0 ** 54 ** A0
+  PF  , // PF 1 ** 55 ** A1
+  PF  , // PF 2 ** 56 ** A2
+  PF  , // PF 3 ** 57 ** A3
+  PF  , // PF 4 ** 58 ** A4
+  PF  , // PF 5 ** 59 ** A5
+  PF  , // PF 6 ** 60 ** A6
+  PF  , // PF 7 ** 61 ** A7
+  PK  , // PK 0 ** 62 ** A8
+  PK  , // PK 1 ** 63 ** A9
+  PK  , // PK 2 ** 64 ** A10
+  PK  , // PK 3 ** 65 ** A11
+  PK  , // PK 4 ** 66 ** A12
+  PK  , // PK 5 ** 67 ** A13
+  PK  , // PK 6 ** 68 ** A14
+  PK  , // PK 7 ** 69 ** A15
+  PG  , // PG 4 ** 70 ** D70
+  PG  , // PG 3 ** 71 ** D71
+  PJ  , // PJ 2 ** 72 ** D72
+  PJ  , // PJ 3 ** 73 ** D73
+  PJ  , // PJ 7 ** 74 ** D74
+  PJ  , // PJ 4 ** 75 ** D75
+  PJ  , // PJ 5 ** 76 ** D76
+  PJ  , // PJ 6 ** 77 ** D77
+  PE  , // PE 2 ** 78 ** D78
+  PE  , // PE 6 ** 79 ** D79
+  PE  , // PE 7 ** 80 ** D80
+  PD  , // PD 4 ** 81 ** D81
+  PD  , // PD 5 ** 82 ** D82
+  PD  , // PD 6 ** 83 ** D83
+  PH  , // PH 2 ** 84 ** D84
+  PH  , // PH 7 ** 85 ** D85
 };
 
 const uint8_t PROGMEM digital_pin_to_bit_mask_PGM[] = {
-	// PIN IN PORT
-	// -------------------------------------------
-	_BV( 0 )	, // PE 0 ** 0 ** USART0_RX
-	_BV( 1 )	, // PE 1 ** 1 ** USART0_TX
-	_BV( 4 )	, // PE 4 ** 2 ** PWM2
-	_BV( 5 )	, // PE 5 ** 3 ** PWM3
-	_BV( 5 )	, // PG 5 ** 4 ** PWM4
-	_BV( 3 )	, // PE 3 ** 5 ** PWM5
-	_BV( 3 )	, // PH 3 ** 6 ** PWM6
-	_BV( 4 )	, // PH 4 ** 7 ** PWM7
-	_BV( 5 )	, // PH 5 ** 8 ** PWM8
-	_BV( 6 )	, // PH 6 ** 9 ** PWM9
-	_BV( 4 )	, // PB 4 ** 10 ** PWM10
-	_BV( 5 )	, // PB 5 ** 11 ** PWM11
-	_BV( 6 )	, // PB 6 ** 12 ** PWM12
-	_BV( 7 )	, // PB 7 ** 13 ** PWM13
-	_BV( 1 )	, // PJ 1 ** 14 ** USART3_TX
-	_BV( 0 )	, // PJ 0 ** 15 ** USART3_RX
-	_BV( 1 )	, // PH 1 ** 16 ** USART2_TX
-	_BV( 0 )	, // PH 0 ** 17 ** USART2_RX
-	_BV( 3 )	, // PD 3 ** 18 ** USART1_TX
-	_BV( 2 )	, // PD 2 ** 19 ** USART1_RX
-	_BV( 1 )	, // PD 1 ** 20 ** I2C_SDA
-	_BV( 0 )	, // PD 0 ** 21 ** I2C_SCL
-	_BV( 0 )	, // PA 0 ** 22 ** D22
-	_BV( 1 )	, // PA 1 ** 23 ** D23
-	_BV( 2 )	, // PA 2 ** 24 ** D24
-	_BV( 3 )	, // PA 3 ** 25 ** D25
-	_BV( 4 )	, // PA 4 ** 26 ** D26
-	_BV( 5 )	, // PA 5 ** 27 ** D27
-	_BV( 6 )	, // PA 6 ** 28 ** D28
-	_BV( 7 )	, // PA 7 ** 29 ** D29
-	_BV( 7 )	, // PC 7 ** 30 ** D30
-	_BV( 6 )	, // PC 6 ** 31 ** D31
-	_BV( 5 )	, // PC 5 ** 32 ** D32
-	_BV( 4 )	, // PC 4 ** 33 ** D33
-	_BV( 3 )	, // PC 3 ** 34 ** D34
-	_BV( 2 )	, // PC 2 ** 35 ** D35
-	_BV( 1 )	, // PC 1 ** 36 ** D36
-	_BV( 0 )	, // PC 0 ** 37 ** D37
-	_BV( 7 )	, // PD 7 ** 38 ** D38
-	_BV( 2 )	, // PG 2 ** 39 ** D39
-	_BV( 1 )	, // PG 1 ** 40 ** D40
-	_BV( 0 )	, // PG 0 ** 41 ** D41
-	_BV( 7 )	, // PL 7 ** 42 ** D42
-	_BV( 6 )	, // PL 6 ** 43 ** D43
-	_BV( 5 )	, // PL 5 ** 44 ** D44
-	_BV( 4 )	, // PL 4 ** 45 ** D45
-	_BV( 3 )	, // PL 3 ** 46 ** D46
-	_BV( 2 )	, // PL 2 ** 47 ** D47
-	_BV( 1 )	, // PL 1 ** 48 ** D48
-	_BV( 0 )	, // PL 0 ** 49 ** D49
-	_BV( 3 )	, // PB 3 ** 50 ** SPI_MISO
-	_BV( 2 )	, // PB 2 ** 51 ** SPI_MOSI
-	_BV( 1 )	, // PB 1 ** 52 ** SPI_SCK
-	_BV( 0 )	, // PB 0 ** 53 ** SPI_SS
-	_BV( 0 )	, // PF 0 ** 54 ** A0
-	_BV( 1 )	, // PF 1 ** 55 ** A1
-	_BV( 2 )	, // PF 2 ** 56 ** A2
-	_BV( 3 )	, // PF 3 ** 57 ** A3
-	_BV( 4 )	, // PF 4 ** 58 ** A4
-	_BV( 5 )	, // PF 5 ** 59 ** A5
-	_BV( 6 )	, // PF 6 ** 60 ** A6
-	_BV( 7 )	, // PF 7 ** 61 ** A7
-	_BV( 0 )	, // PK 0 ** 62 ** A8
-	_BV( 1 )	, // PK 1 ** 63 ** A9
-	_BV( 2 )	, // PK 2 ** 64 ** A10
-	_BV( 3 )	, // PK 3 ** 65 ** A11
-	_BV( 4 )	, // PK 4 ** 66 ** A12
-	_BV( 5 )	, // PK 5 ** 67 ** A13
-	_BV( 6 )	, // PK 6 ** 68 ** A14
-	_BV( 7 )	, // PK 7 ** 69 ** A15
-	_BV( 4 )	, // PG 4 ** 70 ** D70
-	_BV( 3 )	, // PG 3 ** 71 ** D71
-	_BV( 2 )	, // PJ 2 ** 72 ** D72
-	_BV( 3 )	, // PJ 3 ** 73 ** D73
-	_BV( 7 )	, // PJ 7 ** 74 ** D74
-	_BV( 4 )	, // PJ 4 ** 75 ** D75
-	_BV( 5 )	, // PJ 5 ** 76 ** D76
-	_BV( 6 )	, // PJ 6 ** 77 ** D77
-	_BV( 2 )	, // PE 2 ** 78 ** D78
-	_BV( 6 )	, // PE 6 ** 79 ** D79
-	_BV( 7 )	, // PE 7 ** 80 ** D80
-	_BV( 4 )	, // PD 4 ** 81 ** D81
-	_BV( 5 ) 	, // PD 5 ** 82 ** D82
-	_BV( 6 ) 	, // PD 6 ** 83 ** D83
-	_BV( 2 ) 	, // PH 2 ** 84 ** D84
-	_BV( 7 ) 	, // PH 7 ** 85 ** D85
+  // PIN IN PORT
+  // -------------------------------------------
+  _BV( 0 )  , // PE 0 ** 0 ** USART0_RX
+  _BV( 1 )  , // PE 1 ** 1 ** USART0_TX
+  _BV( 4 )  , // PE 4 ** 2 ** PWM2
+  _BV( 5 )  , // PE 5 ** 3 ** PWM3
+  _BV( 5 )  , // PG 5 ** 4 ** PWM4
+  _BV( 3 )  , // PE 3 ** 5 ** PWM5
+  _BV( 3 )  , // PH 3 ** 6 ** PWM6
+  _BV( 4 )  , // PH 4 ** 7 ** PWM7
+  _BV( 5 )  , // PH 5 ** 8 ** PWM8
+  _BV( 6 )  , // PH 6 ** 9 ** PWM9
+  _BV( 4 )  , // PB 4 ** 10 ** PWM10
+  _BV( 5 )  , // PB 5 ** 11 ** PWM11
+  _BV( 6 )  , // PB 6 ** 12 ** PWM12
+  _BV( 7 )  , // PB 7 ** 13 ** PWM13
+  _BV( 1 )  , // PJ 1 ** 14 ** USART3_TX
+  _BV( 0 )  , // PJ 0 ** 15 ** USART3_RX
+  _BV( 1 )  , // PH 1 ** 16 ** USART2_TX
+  _BV( 0 )  , // PH 0 ** 17 ** USART2_RX
+  _BV( 3 )  , // PD 3 ** 18 ** USART1_TX
+  _BV( 2 )  , // PD 2 ** 19 ** USART1_RX
+  _BV( 1 )  , // PD 1 ** 20 ** I2C_SDA
+  _BV( 0 )  , // PD 0 ** 21 ** I2C_SCL
+  _BV( 0 )  , // PA 0 ** 22 ** D22
+  _BV( 1 )  , // PA 1 ** 23 ** D23
+  _BV( 2 )  , // PA 2 ** 24 ** D24
+  _BV( 3 )  , // PA 3 ** 25 ** D25
+  _BV( 4 )  , // PA 4 ** 26 ** D26
+  _BV( 5 )  , // PA 5 ** 27 ** D27
+  _BV( 6 )  , // PA 6 ** 28 ** D28
+  _BV( 7 )  , // PA 7 ** 29 ** D29
+  _BV( 7 )  , // PC 7 ** 30 ** D30
+  _BV( 6 )  , // PC 6 ** 31 ** D31
+  _BV( 5 )  , // PC 5 ** 32 ** D32
+  _BV( 4 )  , // PC 4 ** 33 ** D33
+  _BV( 3 )  , // PC 3 ** 34 ** D34
+  _BV( 2 )  , // PC 2 ** 35 ** D35
+  _BV( 1 )  , // PC 1 ** 36 ** D36
+  _BV( 0 )  , // PC 0 ** 37 ** D37
+  _BV( 7 )  , // PD 7 ** 38 ** D38
+  _BV( 2 )  , // PG 2 ** 39 ** D39
+  _BV( 1 )  , // PG 1 ** 40 ** D40
+  _BV( 0 )  , // PG 0 ** 41 ** D41
+  _BV( 7 )  , // PL 7 ** 42 ** D42
+  _BV( 6 )  , // PL 6 ** 43 ** D43
+  _BV( 5 )  , // PL 5 ** 44 ** D44
+  _BV( 4 )  , // PL 4 ** 45 ** D45
+  _BV( 3 )  , // PL 3 ** 46 ** D46
+  _BV( 2 )  , // PL 2 ** 47 ** D47
+  _BV( 1 )  , // PL 1 ** 48 ** D48
+  _BV( 0 )  , // PL 0 ** 49 ** D49
+  _BV( 3 )  , // PB 3 ** 50 ** SPI_MISO
+  _BV( 2 )  , // PB 2 ** 51 ** SPI_MOSI
+  _BV( 1 )  , // PB 1 ** 52 ** SPI_SCK
+  _BV( 0 )  , // PB 0 ** 53 ** SPI_SS
+  _BV( 0 )  , // PF 0 ** 54 ** A0
+  _BV( 1 )  , // PF 1 ** 55 ** A1
+  _BV( 2 )  , // PF 2 ** 56 ** A2
+  _BV( 3 )  , // PF 3 ** 57 ** A3
+  _BV( 4 )  , // PF 4 ** 58 ** A4
+  _BV( 5 )  , // PF 5 ** 59 ** A5
+  _BV( 6 )  , // PF 6 ** 60 ** A6
+  _BV( 7 )  , // PF 7 ** 61 ** A7
+  _BV( 0 )  , // PK 0 ** 62 ** A8
+  _BV( 1 )  , // PK 1 ** 63 ** A9
+  _BV( 2 )  , // PK 2 ** 64 ** A10
+  _BV( 3 )  , // PK 3 ** 65 ** A11
+  _BV( 4 )  , // PK 4 ** 66 ** A12
+  _BV( 5 )  , // PK 5 ** 67 ** A13
+  _BV( 6 )  , // PK 6 ** 68 ** A14
+  _BV( 7 )  , // PK 7 ** 69 ** A15
+  _BV( 4 )  , // PG 4 ** 70 ** D70
+  _BV( 3 )  , // PG 3 ** 71 ** D71
+  _BV( 2 )  , // PJ 2 ** 72 ** D72
+  _BV( 3 )  , // PJ 3 ** 73 ** D73
+  _BV( 7 )  , // PJ 7 ** 74 ** D74
+  _BV( 4 )  , // PJ 4 ** 75 ** D75
+  _BV( 5 )  , // PJ 5 ** 76 ** D76
+  _BV( 6 )  , // PJ 6 ** 77 ** D77
+  _BV( 2 )  , // PE 2 ** 78 ** D78
+  _BV( 6 )  , // PE 6 ** 79 ** D79
+  _BV( 7 )  , // PE 7 ** 80 ** D80
+  _BV( 4 )  , // PD 4 ** 81 ** D81
+  _BV( 5 )  , // PD 5 ** 82 ** D82
+  _BV( 6 )  , // PD 6 ** 83 ** D83
+  _BV( 2 )  , // PH 2 ** 84 ** D84
+  _BV( 7 )  , // PH 7 ** 85 ** D85
 };
 
 const uint8_t PROGMEM digital_pin_to_timer_PGM[] = {
-	// TIMERS
-	// -------------------------------------------
-	NOT_ON_TIMER	, // PE 0 ** 0 ** USART0_RX
-	NOT_ON_TIMER	, // PE 1 ** 1 ** USART0_TX
-	TIMER3B	, // PE 4 ** 2 ** PWM2
-	TIMER3C	, // PE 5 ** 3 ** PWM3
-	TIMER0B	, // PG 5 ** 4 ** PWM4
-	TIMER3A	, // PE 3 ** 5 ** PWM5
-	TIMER4A	, // PH 3 ** 6 ** PWM6
-	TIMER4B	, // PH 4 ** 7 ** PWM7
-	TIMER4C	, // PH 5 ** 8 ** PWM8
-	TIMER2B	, // PH 6 ** 9 ** PWM9
-	TIMER2A	, // PB 4 ** 10 ** PWM10
-	TIMER1A	, // PB 5 ** 11 ** PWM11
-	TIMER1B	, // PB 6 ** 12 ** PWM12
-	TIMER0A	, // PB 7 ** 13 ** PWM13
-	NOT_ON_TIMER	, // PJ 1 ** 14 ** USART3_TX
-	NOT_ON_TIMER	, // PJ 0 ** 15 ** USART3_RX
-	NOT_ON_TIMER	, // PH 1 ** 16 ** USART2_TX
-	NOT_ON_TIMER	, // PH 0 ** 17 ** USART2_RX
-	NOT_ON_TIMER	, // PD 3 ** 18 ** USART1_TX
-	NOT_ON_TIMER	, // PD 2 ** 19 ** USART1_RX
-	NOT_ON_TIMER	, // PD 1 ** 20 ** I2C_SDA
-	NOT_ON_TIMER	, // PD 0 ** 21 ** I2C_SCL
-	NOT_ON_TIMER	, // PA 0 ** 22 ** D22
-	NOT_ON_TIMER	, // PA 1 ** 23 ** D23
-	NOT_ON_TIMER	, // PA 2 ** 24 ** D24
-	NOT_ON_TIMER	, // PA 3 ** 25 ** D25
-	NOT_ON_TIMER	, // PA 4 ** 26 ** D26
-	NOT_ON_TIMER	, // PA 5 ** 27 ** D27
-	NOT_ON_TIMER	, // PA 6 ** 28 ** D28
-	NOT_ON_TIMER	, // PA 7 ** 29 ** D29
-	NOT_ON_TIMER	, // PC 7 ** 30 ** D30
-	NOT_ON_TIMER	, // PC 6 ** 31 ** D31
-	NOT_ON_TIMER	, // PC 5 ** 32 ** D32
-	NOT_ON_TIMER	, // PC 4 ** 33 ** D33
-	NOT_ON_TIMER	, // PC 3 ** 34 ** D34
-	NOT_ON_TIMER	, // PC 2 ** 35 ** D35
-	NOT_ON_TIMER	, // PC 1 ** 36 ** D36
-	NOT_ON_TIMER	, // PC 0 ** 37 ** D37
-	NOT_ON_TIMER	, // PD 7 ** 38 ** D38
-	NOT_ON_TIMER	, // PG 2 ** 39 ** D39
-	NOT_ON_TIMER	, // PG 1 ** 40 ** D40
-	NOT_ON_TIMER	, // PG 0 ** 41 ** D41
-	NOT_ON_TIMER	, // PL 7 ** 42 ** D42
-	NOT_ON_TIMER	, // PL 6 ** 43 ** D43
-	TIMER5C	, // PL 5 ** 44 ** D44
-	TIMER5B	, // PL 4 ** 45 ** D45
-	TIMER5A	, // PL 3 ** 46 ** D46
-	NOT_ON_TIMER	, // PL 2 ** 47 ** D47
-	NOT_ON_TIMER	, // PL 1 ** 48 ** D48
-	NOT_ON_TIMER	, // PL 0 ** 49 ** D49
-	NOT_ON_TIMER	, // PB 3 ** 50 ** SPI_MISO
-	NOT_ON_TIMER	, // PB 2 ** 51 ** SPI_MOSI
-	NOT_ON_TIMER	, // PB 1 ** 52 ** SPI_SCK
-	NOT_ON_TIMER	, // PB 0 ** 53 ** SPI_SS
-	NOT_ON_TIMER	, // PF 0 ** 54 ** A0
-	NOT_ON_TIMER	, // PF 1 ** 55 ** A1
-	NOT_ON_TIMER	, // PF 2 ** 56 ** A2
-	NOT_ON_TIMER	, // PF 3 ** 57 ** A3
-	NOT_ON_TIMER	, // PF 4 ** 58 ** A4
-	NOT_ON_TIMER	, // PF 5 ** 59 ** A5
-	NOT_ON_TIMER	, // PF 6 ** 60 ** A6
-	NOT_ON_TIMER	, // PF 7 ** 61 ** A7
-	NOT_ON_TIMER	, // PK 0 ** 62 ** A8
-	NOT_ON_TIMER	, // PK 1 ** 63 ** A9
-	NOT_ON_TIMER	, // PK 2 ** 64 ** A10
-	NOT_ON_TIMER	, // PK 3 ** 65 ** A11
-	NOT_ON_TIMER	, // PK 4 ** 66 ** A12
-	NOT_ON_TIMER	, // PK 5 ** 67 ** A13
-	NOT_ON_TIMER	, // PK 6 ** 68 ** A14
-	NOT_ON_TIMER	, // PK 7 ** 69 ** A15
-	NOT_ON_TIMER	, // PG 4 ** 70 ** D70
-	NOT_ON_TIMER	, // PG 3 ** 71 ** D71
-	NOT_ON_TIMER	, // PJ 2 ** 72 ** D72
-	NOT_ON_TIMER	, // PJ 3 ** 73 ** D73
-	NOT_ON_TIMER	, // PJ 7 ** 74 ** D74
-	NOT_ON_TIMER	, // PJ 4 ** 75 ** D75
-	NOT_ON_TIMER	, // PJ 5 ** 76 ** D76
-	NOT_ON_TIMER	, // PJ 6 ** 77 ** D77
-	NOT_ON_TIMER	, // PE 2 ** 78 ** D78
-	NOT_ON_TIMER	, // PE 6 ** 79 ** D79
-	NOT_ON_TIMER	, // PE 7 ** 80 ** D80
-	NOT_ON_TIMER	, // PD 4 ** 81 ** D81
-	NOT_ON_TIMER 	, // PD 5 ** 82 ** D82
-	NOT_ON_TIMER 	, // PD 6 ** 83 ** D83
-	NOT_ON_TIMER 	, // PH 2 ** 84 ** D84
-	NOT_ON_TIMER 	, // PH 7 ** 85 ** D85
+  // TIMERS
+  // -------------------------------------------
+  NOT_ON_TIMER  , // PE 0 ** 0 ** USART0_RX
+  NOT_ON_TIMER  , // PE 1 ** 1 ** USART0_TX
+  TIMER3B , // PE 4 ** 2 ** PWM2
+  TIMER3C , // PE 5 ** 3 ** PWM3
+  TIMER0B , // PG 5 ** 4 ** PWM4
+  TIMER3A , // PE 3 ** 5 ** PWM5
+  TIMER4A , // PH 3 ** 6 ** PWM6
+  TIMER4B , // PH 4 ** 7 ** PWM7
+  TIMER4C , // PH 5 ** 8 ** PWM8
+  TIMER2B , // PH 6 ** 9 ** PWM9
+  TIMER2A , // PB 4 ** 10 ** PWM10
+  TIMER1A , // PB 5 ** 11 ** PWM11
+  TIMER1B , // PB 6 ** 12 ** PWM12
+  TIMER0A , // PB 7 ** 13 ** PWM13
+  NOT_ON_TIMER  , // PJ 1 ** 14 ** USART3_TX
+  NOT_ON_TIMER  , // PJ 0 ** 15 ** USART3_RX
+  NOT_ON_TIMER  , // PH 1 ** 16 ** USART2_TX
+  NOT_ON_TIMER  , // PH 0 ** 17 ** USART2_RX
+  NOT_ON_TIMER  , // PD 3 ** 18 ** USART1_TX
+  NOT_ON_TIMER  , // PD 2 ** 19 ** USART1_RX
+  NOT_ON_TIMER  , // PD 1 ** 20 ** I2C_SDA
+  NOT_ON_TIMER  , // PD 0 ** 21 ** I2C_SCL
+  NOT_ON_TIMER  , // PA 0 ** 22 ** D22
+  NOT_ON_TIMER  , // PA 1 ** 23 ** D23
+  NOT_ON_TIMER  , // PA 2 ** 24 ** D24
+  NOT_ON_TIMER  , // PA 3 ** 25 ** D25
+  NOT_ON_TIMER  , // PA 4 ** 26 ** D26
+  NOT_ON_TIMER  , // PA 5 ** 27 ** D27
+  NOT_ON_TIMER  , // PA 6 ** 28 ** D28
+  NOT_ON_TIMER  , // PA 7 ** 29 ** D29
+  NOT_ON_TIMER  , // PC 7 ** 30 ** D30
+  NOT_ON_TIMER  , // PC 6 ** 31 ** D31
+  NOT_ON_TIMER  , // PC 5 ** 32 ** D32
+  NOT_ON_TIMER  , // PC 4 ** 33 ** D33
+  NOT_ON_TIMER  , // PC 3 ** 34 ** D34
+  NOT_ON_TIMER  , // PC 2 ** 35 ** D35
+  NOT_ON_TIMER  , // PC 1 ** 36 ** D36
+  NOT_ON_TIMER  , // PC 0 ** 37 ** D37
+  NOT_ON_TIMER  , // PD 7 ** 38 ** D38
+  NOT_ON_TIMER  , // PG 2 ** 39 ** D39
+  NOT_ON_TIMER  , // PG 1 ** 40 ** D40
+  NOT_ON_TIMER  , // PG 0 ** 41 ** D41
+  NOT_ON_TIMER  , // PL 7 ** 42 ** D42
+  NOT_ON_TIMER  , // PL 6 ** 43 ** D43
+  TIMER5C , // PL 5 ** 44 ** D44
+  TIMER5B , // PL 4 ** 45 ** D45
+  TIMER5A , // PL 3 ** 46 ** D46
+  NOT_ON_TIMER  , // PL 2 ** 47 ** D47
+  NOT_ON_TIMER  , // PL 1 ** 48 ** D48
+  NOT_ON_TIMER  , // PL 0 ** 49 ** D49
+  NOT_ON_TIMER  , // PB 3 ** 50 ** SPI_MISO
+  NOT_ON_TIMER  , // PB 2 ** 51 ** SPI_MOSI
+  NOT_ON_TIMER  , // PB 1 ** 52 ** SPI_SCK
+  NOT_ON_TIMER  , // PB 0 ** 53 ** SPI_SS
+  NOT_ON_TIMER  , // PF 0 ** 54 ** A0
+  NOT_ON_TIMER  , // PF 1 ** 55 ** A1
+  NOT_ON_TIMER  , // PF 2 ** 56 ** A2
+  NOT_ON_TIMER  , // PF 3 ** 57 ** A3
+  NOT_ON_TIMER  , // PF 4 ** 58 ** A4
+  NOT_ON_TIMER  , // PF 5 ** 59 ** A5
+  NOT_ON_TIMER  , // PF 6 ** 60 ** A6
+  NOT_ON_TIMER  , // PF 7 ** 61 ** A7
+  NOT_ON_TIMER  , // PK 0 ** 62 ** A8
+  NOT_ON_TIMER  , // PK 1 ** 63 ** A9
+  NOT_ON_TIMER  , // PK 2 ** 64 ** A10
+  NOT_ON_TIMER  , // PK 3 ** 65 ** A11
+  NOT_ON_TIMER  , // PK 4 ** 66 ** A12
+  NOT_ON_TIMER  , // PK 5 ** 67 ** A13
+  NOT_ON_TIMER  , // PK 6 ** 68 ** A14
+  NOT_ON_TIMER  , // PK 7 ** 69 ** A15
+  NOT_ON_TIMER  , // PG 4 ** 70 ** D70
+  NOT_ON_TIMER  , // PG 3 ** 71 ** D71
+  NOT_ON_TIMER  , // PJ 2 ** 72 ** D72
+  NOT_ON_TIMER  , // PJ 3 ** 73 ** D73
+  NOT_ON_TIMER  , // PJ 7 ** 74 ** D74
+  NOT_ON_TIMER  , // PJ 4 ** 75 ** D75
+  NOT_ON_TIMER  , // PJ 5 ** 76 ** D76
+  NOT_ON_TIMER  , // PJ 6 ** 77 ** D77
+  NOT_ON_TIMER  , // PE 2 ** 78 ** D78
+  NOT_ON_TIMER  , // PE 6 ** 79 ** D79
+  NOT_ON_TIMER  , // PE 7 ** 80 ** D80
+  NOT_ON_TIMER  , // PD 4 ** 81 ** D81
+  NOT_ON_TIMER  , // PD 5 ** 82 ** D82
+  NOT_ON_TIMER  , // PD 6 ** 83 ** D83
+  NOT_ON_TIMER  , // PH 2 ** 84 ** D84
+  NOT_ON_TIMER  , // PH 7 ** 85 ** D85
 };
 
 #endif
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h
index 51a9e92286..0b6e6142ba 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_MKS_SKIPR_V1/variant.h
@@ -167,6 +167,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h
index 30c3d95349..5232a1eaf2 100644
--- a/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h
+++ b/buildroot/share/PlatformIO/variants/MARLIN_TH3D_EZBOARD_V2/variant.h
@@ -121,6 +121,7 @@ extern "C" {
 #ifdef __cplusplus
 } // extern "C"
 #endif
+
 /*----------------------------------------------------------------------------
  *        Arduino objects - C++ only
  *----------------------------------------------------------------------------*/
diff --git a/buildroot/share/cmake/CMakeLists.txt b/buildroot/share/cmake/CMakeLists.txt
index 9d3f24f990..1ed9091e01 100644
--- a/buildroot/share/cmake/CMakeLists.txt
+++ b/buildroot/share/cmake/CMakeLists.txt
@@ -25,7 +25,7 @@ set(SCRIPT_BRANCH 1.0.2) #Set to wanted marlin-cmake release tag or branch
 if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake)
 
 	file(DOWNLOAD https://github.com/tohara/marlin-cmake/archive/${SCRIPT_BRANCH}.tar.gz
-				  ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake-src.tar.gz SHOW_PROGRESS)
+	${CMAKE_CURRENT_LIST_DIR}/marlin-cmake-src.tar.gz SHOW_PROGRESS)
 
 	execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xvf ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake-src.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR})
 
@@ -36,7 +36,7 @@ if(NOT EXISTS ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake)
 endif()
 
 if(WIN32 AND NOT EXISTS ${CMAKE_BINARY_DIR}/make.exe)
-    file(COPY ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/resources/make.exe DESTINATION ${CMAKE_BINARY_DIR}/)
+	file(COPY ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/resources/make.exe DESTINATION ${CMAKE_BINARY_DIR}/)
 endif()
 
 set(CMAKE_MODULE_PATH  ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_LIST_DIR}/marlin-cmake/modules)
@@ -105,9 +105,9 @@ set(${PROJECT_NAME}_SRCS "${SOURCES};../../../Marlin/Marlin.ino")
 #    cmake .. -DUPLOAD_PORT=/dev/ttyACM0                             #
 #====================================================================#
 if(UPLOAD_PORT)
-    set(${PROJECT_NAME}_PORT ${UPLOAD_PORT})
+	set(${PROJECT_NAME}_PORT ${UPLOAD_PORT})
 else()
-    set(${PROJECT_NAME}_PORT /dev/ttyACM0)
+	set(${PROJECT_NAME}_PORT /dev/ttyACM0)
 endif()
 
 #====================================================================#
diff --git a/buildroot/share/dwin/bin/README.md b/buildroot/share/dwin/bin/README.md
index 4a9b4687ab..a00d679bf8 100644
--- a/buildroot/share/dwin/bin/README.md
+++ b/buildroot/share/dwin/bin/README.md
@@ -42,15 +42,15 @@ These tools must be run from a terminal with access to an installed Python 3 and
 
 Pillow is most easily installed with pip:
 
-    python3 -m pip install pillow
+  python3 -m pip install pillow
 
 ## Examples
 
 These tools process an `.ICO` file that you specify. The safest method is to create a folder and copy your `.ICO` file there. For example:
 
-	$ mkdir hackicons
-	$ cp 9.ICO hackicons
-	$ cd hackicons
+  $ mkdir hackicons
+  $ cp 9.ICO hackicons
+  $ cd hackicons
 
 The following explanations will refer back to this layout.
 
@@ -64,19 +64,19 @@ If you want to edit the individual icons stored in an ICO file (or add more imag
 
 In this example we're extracting the constituent JPEG files from `9.ICO` and storing them in a folder named `icons`. As each file is extracted the script reports its index number, byte offset, size, dimensions, and filename:
 
-    $ cd buildroot/share/dwin
-    $ ./bin/splitIco.py 9.ICO icons-9
-      Splitting 9.ICO into dir icons
-      Splitting Entry Data...
-      00: offset: 0x001000 len: 0x10a2 width: 130 height: 17
-       Wrote 4258 bytes to icons/000-ICON_LOGO.jpg
-      01: offset: 0x0020a2 len: 0x0eac width: 110 height: 100
-      Wrote 3756 bytes to icons/001-ICON_Print_0.jpg
-      02: offset: 0x002f4e len: 0x0eaa width: 110 height: 100
-      Wrote 3754 bytes to icons/002-ICON_Print_1.jpg
-      ...
-      91: offset: 0x0345fc len: 0x0d89 width: 110 height: 100
-      Wrote 3465 bytes to icons/091-ICON_Info_1.jpg
+  $ cd buildroot/share/dwin
+  $ ./bin/splitIco.py 9.ICO icons-9
+    Splitting 9.ICO into dir icons
+    Splitting Entry Data...
+    00: offset: 0x001000 len: 0x10a2 width: 130 height: 17
+     Wrote 4258 bytes to icons/000-ICON_LOGO.jpg
+    01: offset: 0x0020a2 len: 0x0eac width: 110 height: 100
+    Wrote 3756 bytes to icons/001-ICON_Print_0.jpg
+    02: offset: 0x002f4e len: 0x0eaa width: 110 height: 100
+    Wrote 3754 bytes to icons/002-ICON_Print_1.jpg
+    ...
+    91: offset: 0x0345fc len: 0x0d89 width: 110 height: 100
+    Wrote 3465 bytes to icons/091-ICON_Info_1.jpg
 
 Once the individual JPEG files have been saved they can be edited using common graphics applications like Photoshop. JPEG files are inherently lossy and will usually contain ugly artifacts, so cleanup may be needed before they are re-exported. Keep the limits of bank size in mind when exporting images and try to find the best balance between compressed size and image quality.
 
@@ -84,9 +84,9 @@ Once the individual JPEG files have been saved they can be edited using common g
 
 After editing images you'll create a new `9.ICO` archive with `makeIco.py` like so:
 
-    $ cd buildroot/share/dwin
-    $ ./bin/makeIco.py icons-3 3.ICO
-      Making .ico file '3.ICO' from contents of 'icons-3'
-      Scanning icon directory icons-3
-      ...Scanned 16 icon files
-      Scanning done. 16 icons included.
+  $ cd buildroot/share/dwin
+  $ ./bin/makeIco.py icons-3 3.ICO
+    Making .ico file '3.ICO' from contents of 'icons-3'
+    Scanning icon directory icons-3
+    ...Scanned 16 icon files
+    Scanning done. 16 icons included.
diff --git a/buildroot/share/vscode/avrdude_linux.conf b/buildroot/share/vscode/avrdude_linux.conf
index ff429a028c..f889e3e142 100644
--- a/buildroot/share/vscode/avrdude_linux.conf
+++ b/buildroot/share/vscode/avrdude_linux.conf
@@ -240,8 +240,8 @@
 #define AT86RF401   0xD0
 
 #define AT89START   0xE0
-#define AT89S51	    0xE0
-#define AT89S52	    0xE1
+#define AT89S51     0xE0
+#define AT89S52     0xE1
 
 # The following table lists the devices in the original AVR910
 # appnote:
@@ -293,15 +293,15 @@
 # in the Internet.  These add the following codes (only devices that
 # actually exist are listed):
 
-# ATmega8515	0x3A
-# ATmega128	0x43
-# ATmega64	0x45
-# ATtiny26	0x5E
-# ATmega8535	0x69
-# ATmega32	0x72
-# ATmega16	0x74
-# ATmega8	0x76
-# ATmega169	0x78
+# ATmega8515    0x3A
+# ATmega128 0x43
+# ATmega64  0x45
+# ATtiny26  0x5E
+# ATmega8535    0x69
+# ATmega32  0x72
+# ATmega16  0x74
+# ATmega8   0x76
+# ATmega169 0x78
 
 #
 # Overall avrdude defaults
@@ -894,63 +894,63 @@ programmer
 # This is an HVSP-only device.
 
 part
-    id                  = "t11";
-    desc                = "ATtiny11";
-    stk500_devcode      = 0x11;
-    signature           = 0x1e 0x90 0x04;
-    chip_erase_delay    = 20000;
+	id                  = "t11";
+	desc                = "ATtiny11";
+	stk500_devcode      = 0x11;
+	signature           = 0x1e 0x90 0x04;
+	chip_erase_delay    = 20000;
 
-    timeout		= 200;
-    hvsp_controlstack     =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
-        0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
-        0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 50;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	timeout     = 200;
+	hvsp_controlstack     =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
+		0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
+		0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 50;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-    memory "eeprom"
-        size            = 64;
-	blocksize	= 64;
-	readsize	= 256;
-	delay		= 5;
-    ;
+	memory "eeprom"
+		size            = 64;
+	blocksize   = 64;
+	readsize    = 256;
+	delay       = 5;
+	;
 
-    memory "flash"
-        size            = 1024;
-	blocksize	= 128;
-	readsize	= 256;
-	delay		= 3;
-    ;
+	memory "flash"
+		size            = 1024;
+	blocksize   = 128;
+	readsize    = 256;
+	delay       = 3;
+	;
 
-    memory "signature"
-        size            = 3;
-    ;
+	memory "signature"
+		size            = 3;
+	;
 
-    memory "lock"
-        size            = 1;
-    ;
+	memory "lock"
+		size            = 1;
+	;
 
-    memory "calibration"
-        size            = 1;
-    ;
+	memory "calibration"
+		size            = 1;
+	;
 
-    memory "fuse"
-        size            = 1;
-    ;
+	memory "fuse"
+		size            = 1;
+	;
 ;
 
 #------------------------------------------------------------
@@ -958,132 +958,132 @@ part
 #------------------------------------------------------------
 
 part
-    id                  = "t12";
-    desc                = "ATtiny12";
-    stk500_devcode      = 0x12;
-    avr910_devcode      = 0x55;
-    signature           = 0x1e 0x90 0x05;
-    chip_erase_delay    = 20000;
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	id                  = "t12";
+	desc                = "ATtiny12";
+	stk500_devcode      = 0x12;
+	avr910_devcode      = 0x55;
+	signature           = 0x1e 0x90 0x05;
+	chip_erase_delay    = 20000;
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
-        0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
-        0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 50;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
+		0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
+		0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 50;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-    memory "eeprom"
-        size            = 64;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+	memory "eeprom"
+		size            = 64;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 8;
-	blocksize	= 64;
-	readsize	= 256;
-    ;
+	mode        = 0x04;
+	delay       = 8;
+	blocksize   = 64;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        size            = 1024;
-        min_write_delay = 4500;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0  0  1  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+	memory "flash"
+		size            = 1024;
+		min_write_delay = 4500;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0  0  1  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        read_hi         = "  0  0  1  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_hi         = "  0  0  1  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        write_lo        = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		write_lo        = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        write_hi        = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		write_hi        = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-	mode		= 0x04;
-	delay		= 5;
-	blocksize	= 128;
-	readsize	= 256;
-    ;
+	mode        = 0x04;
+	delay       = 5;
+	blocksize   = 128;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x o o x";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x o o x";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 i i 1",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 i i 1",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0  0  0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	;
 
-    memory "fuse"
-        size            = 1;
-        read            = "0  1  0  1   0  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    o o o o  o o o o";
+	memory "fuse"
+		size            = 1;
+		read            = "0  1  0  1   0  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    o o o o  o o o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 0 1 x  x x x x",
-                          "x  x  x  x   x  x  x  x    i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 0 1 x  x x x x",
+						  "x  x  x  x   x  x  x  x    i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	;
 ;
 
 #------------------------------------------------------------
@@ -1091,170 +1091,170 @@ part
 #------------------------------------------------------------
 
 part
-    id                  = "t13";
-    desc                = "ATtiny13";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x0E, 0x1E;
-     eeprom_instr  = 0xBB, 0xFE, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x0E, 0xB4, 0x0E, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
-    stk500_devcode      = 0x14;
-    signature           = 0x1e 0x90 0x07;
-    chip_erase_delay    = 4000;
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	id                  = "t13";
+	desc                = "ATtiny13";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x0E, 0x1E;
+	 eeprom_instr  = 0xBB, 0xFE, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x0E, 0xB4, 0x0E, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
+	stk500_devcode      = 0x14;
+	signature           = 0x1e 0x90 0x07;
+	chip_erase_delay    = 4000;
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack     =
+	hvsp_controlstack     =
 	0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 90;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 90;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-    memory "eeprom"
-        size            = 64;
-        page_size       = 4;
-        min_write_delay = 4000;
-        max_write_delay = 4000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+	memory "eeprom"
+		size            = 64;
+		page_size       = 4;
+		min_write_delay = 4000;
+		max_write_delay = 4000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x   x  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        paged           = yes;
-        size            = 1024;
-        page_size       = 32;
-        num_pages       = 32;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0  0  1  0   0  0  0  0",
-                          "  0  0  0  0   0  0  0 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+	memory "flash"
+		paged           = yes;
+		size            = 1024;
+		page_size       = 32;
+		num_pages       = 32;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0  0  1  0   0  0  0  0",
+						  "  0  0  0  0   0  0  0 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        read_hi         = "  0  0  1  0   1  0  0  0",
-                          "  0  0  0  0   0  0  0 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_hi         = "  0  0  1  0   1  0  0  0",
+						  "  0  0  0  0   0  0  0 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        loadpage_lo     = "  0  1  0  0   0  0  0  0",
-                          "  0  0  0  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_lo     = "  0  1  0  0   0  0  0  0",
+						  "  0  0  0  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        loadpage_hi     = "  0  1  0  0   1  0  0  0",
-                          "  0  0  0  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_hi     = "  0  1  0  0   1  0  0  0",
+						  "  0  0  0  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        writepage       = "  0  1  0  0   1  1  0  0",
-                          "  0  0  0  0   0  0  0 a8",
-                          " a7 a6 a5 a4   x  x  x  x",
-                          "  x  x  x  x   x  x  x  x";
+		writepage       = "  0  1  0  0   1  1  0  0",
+						  "  0  0  0  0   0  0  0 a8",
+						  " a7 a6 a5 a4   x  x  x  x",
+						  "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    0 0 0 x  x x x x",
-                          "x  x  x  x   x  x a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    0 0 0 x  x x x x",
+						  "x  x  x  x   x  x a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
 
 	read            = "0  1  0  1   1  0  0  0    0 0 0 0  0 0 0 0",
-                          "x  x  x  x   x  x  x  x    x x o o  o o o o";
+						  "x  x  x  x   x  x  x  x    x x o o  o o o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 x  x x x x",
-                          "x  x  x  x   x  x  x  x    1 1 i i  i i i i";
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 x  x x x x",
+						  "x  x  x  x   x  x  x  x    1 1 i i  i i i i";
+	;
 
-    memory "calibration"
-        size            = 2;
-        read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                          "0  0  0  0   0  0  0 a0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 2;
+		read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						  "0  0  0  0   0  0  0 a0    o o o o  o o o o";
+	;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+	  ;
 
 ;
 
@@ -1264,132 +1264,132 @@ part
 #------------------------------------------------------------
 
 part
-    id                  = "t15";
-    desc                = "ATtiny15";
-    stk500_devcode      = 0x13;
-    avr910_devcode      = 0x56;
-    signature           = 0x1e 0x90 0x06;
-    chip_erase_delay    = 8200;
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	id                  = "t15";
+	desc                = "ATtiny15";
+	stk500_devcode      = 0x13;
+	avr910_devcode      = 0x56;
+	signature           = 0x1e 0x90 0x06;
+	chip_erase_delay    = 8200;
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
-        0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
-        0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 5;
-    synchcycles         = 6;
-    latchcycles         = 16;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 50;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
+		0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
+		0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 5;
+	synchcycles         = 6;
+	latchcycles         = 16;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 50;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-    memory "eeprom"
-        size            = 64;
-        min_write_delay = 8200;
-        max_write_delay = 8200;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+	memory "eeprom"
+		size            = 64;
+		min_write_delay = 8200;
+		max_write_delay = 8200;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 64;
-	readsize	= 256;
-    ;
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 64;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        size            = 1024;
-        min_write_delay = 4100;
-        max_write_delay = 4100;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0  0  1  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+	memory "flash"
+		size            = 1024;
+		min_write_delay = 4100;
+		max_write_delay = 4100;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0  0  1  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        read_hi         = "  0  0  1  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_hi         = "  0  0  1  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        write_lo        = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		write_lo        = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        write_hi        = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		write_hi        = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-	mode		= 0x04;
-	delay		= 5;
-	blocksize	= 128;
-	readsize	= 256;
-    ;
+	mode        = 0x04;
+	delay       = 5;
+	blocksize   = 128;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x o o x";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x o o x";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 i i 1",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 i i 1",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0  0  0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	;
 
-    memory "fuse"
-        size            = 1;
-        read            = "0  1  0  1   0  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    o o o o  x x o o";
+	memory "fuse"
+		size            = 1;
+		read            = "0  1  0  1   0  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    o o o o  x x o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 0 1 x  x x x x",
-                          "x  x  x  x   x  x  x  x    i i i i  1 1 i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 0 1 x  x x x x",
+						  "x  x  x  x   x  x  x  x    i i i i  1 1 i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	;
 ;
 
 #------------------------------------------------------------
@@ -1397,114 +1397,114 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "1200";
-    desc             = "AT90S1200";
-    stk500_devcode   = 0x33;
-    avr910_devcode   = 0x13;
-    signature        = 0x1e 0x90 0x01;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "1200";
+	desc             = "AT90S1200";
+	stk500_devcode   = 0x33;
+	avr910_devcode   = 0x13;
+	signature        = 0x1e 0x90 0x01;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 1;
-    bytedelay		= 0;
-    pollindex		= 0;
-    pollvalue		= 0xFF;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 1;
+	bytedelay       = 0;
+	pollindex       = 0;
+	pollvalue       = 0xFF;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 64;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = "1 0  1  0   0  0  0  0   x x x x  x x x x",
-                          "x x a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 64;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = "1 0  1  0   0  0  0  0   x x x x  x x x x",
+						  "x x a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = "1 1  0  0   0  0  0  0   x x x x  x x x x",
-                          "x x a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = "1 1  0  0   0  0  0  0   x x x x  x x x x",
+						  "x x a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 20;
-	blocksize	= 32;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 1024;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x   x   x  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 20;
+	blocksize   = 32;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 1024;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x   x   x  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x   x   x  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x   x   x  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x   x   x  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x   x   x  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x   x   x  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x   x   x  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x02;
-	delay		= 15;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-      ;
-    memory "lock"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
+	mode        = 0x02;
+	delay       = 15;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+	  ;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -1512,112 +1512,112 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "4414";
-    desc             = "AT90S4414";
-    stk500_devcode   = 0x50;
-    avr910_devcode   = 0x28;
-    signature        = 0x1e 0x92 0x01;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "4414";
+	desc             = "AT90S4414";
+	stk500_devcode   = 0x50;
+	avr910_devcode   = 0x28;
+	signature        = 0x1e 0x92 0x01;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 256;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x80;
-        readback_p2     = 0x7f;
-        read            = " 1  0  1  0   0  0  0  0  x x x x  x x x a8",
-                          "a7 a6 a5 a4 a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 256;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x80;
+		readback_p2     = 0x7f;
+		read            = " 1  0  1  0   0  0  0  0  x x x x  x x x a8",
+						  "a7 a6 a5 a4 a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x7f;
-        readback_p2     = 0x7f;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x7f;
+		readback_p2     = 0x7f;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-	size		= 1;
-      ;
-    memory "lock"
-	size		= 1;
-	write		= "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+	size        = 1;
+	  ;
+	memory "lock"
+	size        = 1;
+	write       = "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
 			  "x  x  x  x   x  x  x  x   x  x  x  x   x  x  x  x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -1625,112 +1625,112 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "2313";
-    desc             = "AT90S2313";
-    stk500_devcode   = 0x40;
-    avr910_devcode   = 0x20;
-    signature        = 0x1e 0x91 0x01;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "2313";
+	desc             = "AT90S2313";
+	stk500_devcode   = 0x40;
+	avr910_devcode   = 0x20;
+	signature        = 0x1e 0x91 0x01;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 128;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x80;
-        readback_p2     = 0x7f;
-        read            = "1  0  1  0   0  0  0  0   x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 128;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x80;
+		readback_p2     = 0x7f;
+		read            = "1  0  1  0   0  0  0  0   x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0   x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0   x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 2048;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x7f;
-        readback_p2     = 0x7f;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 2048;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x7f;
+		readback_p2     = 0x7f;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-      ;
-    memory "lock"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 1 1 x  x i i x",
-                          "x x x x  x x x x  x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+	  ;
+	memory "lock"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 1 1 x  x i i x",
+						  "x x x x  x x x x  x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -1738,126 +1738,126 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "2333";
+	id               = "2333";
 ##### WARNING: No XML file for device 'AT90S2333'! #####
-    desc             = "AT90S2333";
-    stk500_devcode   = 0x42;
-    avr910_devcode   = 0x34;
-    signature        = 0x1e 0x91 0x05;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	desc             = "AT90S2333";
+	stk500_devcode   = 0x42;
+	avr910_devcode   = 0x34;
+	signature        = 0x1e 0x91 0x05;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 128;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0   x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 128;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0   x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0   x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0   x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	memory "flash"
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        pwroff_after_write = yes;
-        read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		pwroff_after_write = yes;
+		read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
-    memory "lock"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x x x  x o o x";
+		write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x x x  x o o x";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
   ;
 
 
@@ -1866,122 +1866,122 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "2343";
-    desc             = "AT90S2343";
-    stk500_devcode   = 0x43;
-    avr910_devcode   = 0x4c;
-    signature        = 0x1e 0x91 0x03;
-    chip_erase_delay = 18000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "2343";
+	desc             = "AT90S2343";
+	stk500_devcode   = 0x43;
+	avr910_devcode   = 0x4c;
+	signature        = 0x1e 0x91 0x03;
+	chip_erase_delay = 18000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
-        0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
-        0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 0;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 50;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
+		0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
+		0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 0;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 50;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-    memory "eeprom"
-        size            = 128;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0   0 0 0 0  0 0 0 0",
-                          "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 128;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0   0 0 0 0  0 0 0 0",
+						  "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0   0 0 0 0  0 0 0 0",
-                          "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0   0 0 0 0  0 0 0 0",
+						  "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 128;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   o o o x  x x x o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 128;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   o o o x  x x x o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 1  1 1 1 i",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
-    memory "lock"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   o o o x  x x x o";
+		write           = "1 0 1 0  1 1 0 0   1 0 1 1  1 1 1 i",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   o o o x  x x x o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
   ;
 
 
@@ -1990,123 +1990,123 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "4433";
-    desc             = "AT90S4433";
-    stk500_devcode   = 0x51;
-    avr910_devcode   = 0x30;
-    signature        = 0x1e 0x92 0x03;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "4433";
+	desc             = "AT90S4433";
+	stk500_devcode   = 0x51;
+	avr910_devcode   = 0x30;
+	signature        = 0x1e 0x92 0x03;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 256;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = " 1  0  1  0   0  0  0  0   x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 256;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = " 1  0  1  0   0  0  0  0   x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0   x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = " 1  1  0  0   0  0  0  0   x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        pwroff_after_write = yes;
-        read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x o o  o o o o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		pwroff_after_write = yes;
+		read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
-    memory "lock"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x x x  x o o x";
+		write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x x x  x o o x";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -2114,82 +2114,82 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "4434";
+	id               = "4434";
 ##### WARNING: No XML file for device 'AT90S4434'! #####
-    desc             = "AT90S4434";
-    stk500_devcode   = 0x52;
-    avr910_devcode   = 0x6c;
-    signature        = 0x1e 0x92 0x02;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	desc             = "AT90S4434";
+	stk500_devcode   = 0x52;
+	avr910_devcode   = 0x6c;
+	signature        = 0x1e 0x92 0x02;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    memory "eeprom"
-        size            = 256;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = " 1  0  1  0   0  0  0  0   x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 256;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = " 1  0  1  0   0  0  0  0   x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0   x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
-      ;
-    memory "flash"
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		write           = " 1  1  0  0   0  0  0  0   x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+	  ;
+	memory "flash"
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x o o  o o o o";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
-    memory "lock"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x x x  x o o x";
+		write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x x x  x o o x";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -2197,113 +2197,113 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "8515";
-    desc             = "AT90S8515";
-    stk500_devcode   = 0x60;
-    avr910_devcode   = 0x38;
-    signature        = 0x1e 0x93 0x01;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "8515";
+	desc             = "AT90S8515";
+	stk500_devcode   = 0x60;
+	avr910_devcode   = 0x38;
+	signature        = 0x1e 0x93 0x01;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 512;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x80;
-        readback_p2     = 0x7f;
-        read            = " 1  0  1  0   0  0  0  0  x x x x  x x x a8",
-                          "a7 a6 a5 a4 a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 512;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x80;
+		readback_p2     = 0x7f;
+		read            = " 1  0  1  0   0  0  0  0  x x x x  x x x a8",
+						  "a7 a6 a5 a4 a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 8192;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x7f;
-        readback_p2     = 0x7f;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 8192;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x7f;
+		readback_p2     = 0x7f;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-	size		= 1;
-      ;
-    memory "lock"
-	size		= 1;
-	write		= "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+	size        = 1;
+	  ;
+	memory "lock"
+	size        = 1;
+	write       = "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
 			  "x  x  x  x   x  x  x  x   x  x  x  x   x  x  x  x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -2311,120 +2311,120 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "8535";
-    desc             = "AT90S8535";
-    stk500_devcode   = 0x61;
-    avr910_devcode   = 0x68;
-    signature        = 0x1e 0x93 0x03;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "8535";
+	desc             = "AT90S8535";
+	stk500_devcode   = 0x61;
+	avr910_devcode   = 0x68;
+	signature        = 0x1e 0x93 0x03;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = " 1  0  1  0   0  0  0  0   x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = " 1  0  1  0   0  0  0  0   x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 8192;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 8192;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-	size		= 1;
-	read		= "0  1  0  1   1  0  0  0   x  x  x  x   x  x  x  x",
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+	size        = 1;
+	read        = "0  1  0  1   1  0  0  0   x  x  x  x   x  x  x  x",
 			  "x  x  x  x   x  x  x  x   x  x  x  x   x  x  x  o";
-	write		= "1  0  1  0   1  1  0  0   1  0  1  1   1  1  1  i",
+	write       = "1  0  1  0   1  1  0  0   1  0  1  1   1  1  1  i",
 			  "x  x  x  x   x  x  x  x   x  x  x  x   x  x  x  x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
-    memory "lock"
-	size		= 1;
-	read		= "0  1  0  1   1  0  0  0   x  x  x  x   x  x  x  x",
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
+	memory "lock"
+	size        = 1;
+	read        = "0  1  0  1   1  0  0  0   x  x  x  x   x  x  x  x",
 			  "x  x  x  x   x  x  x  x   o  o  x  x   x  x  x  x";
-	write		= "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
+	write       = "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
 			  "x  x  x  x   x  x  x  x   x  x  x  x   x  x  x  x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -2432,138 +2432,138 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m103";
-    desc             = "ATMEGA103";
-    stk500_devcode   = 0xB1;
-    avr910_devcode   = 0x41;
-    signature        = 0x1e 0x97 0x01;
-    chip_erase_delay = 112000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m103";
+	desc             = "ATMEGA103";
+	stk500_devcode   = 0xB1;
+	avr910_devcode   = 0x41;
+	signature        = 0x1e 0x97 0x01;
+	chip_erase_delay = 112000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x8E, 0x9E, 0x2E, 0x3E, 0xAE, 0xBE,
-        0x4E, 0x5E, 0xCE, 0xDE, 0x6E, 0x7E, 0xEE, 0xDE,
-        0x66, 0x76, 0xE6, 0xF6, 0x6A, 0x7A, 0xEA, 0x7A,
-        0x7F, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 10;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x8E, 0x9E, 0x2E, 0x3E, 0xAE, 0xBE,
+		0x4E, 0x5E, 0xCE, 0xDE, 0x6E, 0x7E, 0xEE, 0xDE,
+		0x66, 0x76, 0xE6, 0xF6, 0x6A, 0x7A, 0xEA, 0x7A,
+		0x7F, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 10;
 
-    memory "eeprom"
-        size            = 4096;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x80;
-        readback_p2     = 0x7f;
+	memory "eeprom"
+		size            = 4096;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x80;
+		readback_p2     = 0x7f;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 22000;
-        max_write_delay = 56000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 22000;
+		max_write_delay = 56000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x11;
-	delay		= 70;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x11;
+	delay       = 70;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "fuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0  x x x x  x x x x",
-                          "x x x x  x x x x  x x o x  o 1 o o";
+	memory "fuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0  x x x x  x x x x",
+						  "x x x x  x x x x  x x o x  o 1 o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 1  i 1 i i",
-                          "x x x x  x x x x  x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 1  i 1 i i",
+						  "x x x x  x x x x  x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x x x  x o o x";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x x x  x o o x";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -2572,177 +2572,177 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m64";
-    desc             = "ATMEGA64";
-    has_jtag         = yes;
-    stk500_devcode   = 0xA0;
-    avr910_devcode   = 0x45;
-    signature        = 0x1e 0x96 0x02;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m64";
+	desc             = "ATMEGA64";
+	has_jtag         = yes;
+	stk500_devcode   = 0xA0;
+	avr910_devcode   = 0x45;
+	signature        = 0x1e 0x96 0x02;
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x22;
-    spmcr               = 0x68;
-    allowfullpagebitstream = yes;
+	idr                 = 0x22;
+	spmcr               = 0x68;
+	allowfullpagebitstream = yes;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 20;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 20;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x x i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x x i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -2753,177 +2753,177 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m128";
-    desc             = "ATMEGA128";
-    has_jtag         = yes;
-    stk500_devcode   = 0xB2;
-    avr910_devcode   = 0x43;
-    signature        = 0x1e 0x97 0x02;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m128";
+	desc             = "ATMEGA128";
+	has_jtag         = yes;
+	stk500_devcode   = 0xB2;
+	avr910_devcode   = 0x43;
+	signature        = 0x1e 0x97 0x02;
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x22;
-    spmcr               = 0x68;
-    rampz               = 0x3b;
-    allowfullpagebitstream = yes;
+	idr                 = 0x22;
+	spmcr               = 0x68;
+	rampz               = 0x3b;
+	allowfullpagebitstream = yes;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x x i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x x i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -2931,189 +2931,189 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "c128";
-    desc             = "AT90CAN128";
-    has_jtag         = yes;
-    stk500_devcode   = 0xB3;
+	id               = "c128";
+	desc             = "AT90CAN128";
+	has_jtag         = yes;
+	stk500_devcode   = 0xB3;
 #    avr910_devcode   = 0x43;
-    signature        = 0x1e 0x97 0x81;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x97 0x81;
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    eecr                = 0x3f;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	eecr                = 0x3f;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -3121,189 +3121,189 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "c64";
-    desc             = "AT90CAN64";
-    has_jtag         = yes;
-    stk500_devcode   = 0xB3;
+	id               = "c64";
+	desc             = "AT90CAN64";
+	has_jtag         = yes;
+	stk500_devcode   = 0xB3;
 #    avr910_devcode   = 0x43;
-    signature        = 0x1e 0x96 0x81;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x96 0x81;
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    eecr                = 0x3f;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	eecr                = 0x3f;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -3311,189 +3311,189 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "c32";
-    desc             = "AT90CAN32";
-    has_jtag         = yes;
-    stk500_devcode   = 0xB3;
+	id               = "c32";
+	desc             = "AT90CAN32";
+	has_jtag         = yes;
+	stk500_devcode   = 0xB3;
 #    avr910_devcode   = 0x43;
-    signature        = 0x1e 0x95 0x81;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x95 0x81;
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    eecr                = 0x3f;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	eecr                = 0x3f;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 256;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 256;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -3502,174 +3502,174 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m16";
-    desc             = "ATMEGA16";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82;
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x94 0x03;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m16";
+	desc             = "ATMEGA16";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82;
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x94 0x03;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 100;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 100;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = yes;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = yes;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "calibration"
-        size            = 4;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "calibration"
+		size            = 4;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 a1 a0 o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 a1 a0 o o o o  o o o o";
+		;
   ;
 
 
@@ -3680,187 +3680,187 @@ part
 # close to ATmega16
 
 part
-    id               = "m164p";
-    desc             = "ATMEGA164P";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x94 0x0a;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m164p";
+	desc             = "ATMEGA164P";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x94 0x0a;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 
@@ -3871,187 +3871,187 @@ part
 # similar to ATmega164P
 
 part
-    id               = "m324p";
-    desc             = "ATMEGA324P";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x95 0x08;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m324p";
+	desc             = "ATMEGA324P";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x95 0x08;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 
@@ -4062,187 +4062,187 @@ part
 # similar to ATmega164
 
 part
-    id               = "m644";
-    desc             = "ATMEGA644";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x96 0x09;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m644";
+	desc             = "ATMEGA644";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x96 0x09;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 #------------------------------------------------------------
@@ -4252,187 +4252,187 @@ part
 # similar to ATmega164p
 
 part
-    id               = "m644p";
-    desc             = "ATMEGA644P";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x96 0x0a;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m644p";
+	desc             = "ATMEGA644P";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x96 0x0a;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 
@@ -4444,187 +4444,187 @@ part
 # similar to ATmega164p
 
 part
-    id               = "m1284p";
-    desc             = "ATMEGA1284P";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x97 0x05;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m1284p";
+	desc             = "ATMEGA1284P";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x97 0x05;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 
@@ -4634,193 +4634,193 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m162";
-    desc             = "ATMEGA162";
-    has_jtag         = yes;
-    stk500_devcode   = 0x83;
-    avr910_devcode   = 0x63;
-    signature        = 0x1e 0x94 0x04;
-    chip_erase_delay = 9000;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
+	id               = "m162";
+	desc             = "ATMEGA162";
+	has_jtag         = yes;
+	stk500_devcode   = 0x83;
+	avr910_devcode   = 0x63;
+	signature        = 0x1e 0x94 0x04;
+	chip_erase_delay = 9000;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
 
-    idr              = 0x04;
-    spmcr            = 0x57;
-    allowfullpagebitstream = yes;
+	idr              = 0x04;
+	spmcr            = 0x57;
+	allowfullpagebitstream = yes;
 
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
-       mode        = 0x41;
-    delay       = 10;
-    blocksize   = 128;
-    readsize    = 256;
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
+	   mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
 
-        ;
+		;
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-                read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+				read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-                write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+				write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 4;
-	readsize	= 256;
-        ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 4;
+	readsize    = 256;
+		;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 16000;
-        max_write_delay = 16000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 16000;
+		max_write_delay = 16000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 16000;
-        max_write_delay = 16000;
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 16000;
+		max_write_delay = 16000;
 
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 16000;
-        max_write_delay = 16000;
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 16000;
+		max_write_delay = 16000;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 16000;
-        max_write_delay = 16000;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 16000;
+		max_write_delay = 16000;
 
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		;
 
-    memory "signature"
-        size            = 3;
+	memory "signature"
+		size            = 3;
 
-        read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-        ;
+		read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+		;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 x x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 x x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
 ;
 
 
@@ -4830,157 +4830,157 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m163";
-    desc             = "ATMEGA163";
-    stk500_devcode   = 0x81;
-    avr910_devcode   = 0x64;
-    signature        = 0x1e 0x94 0x02;
-    chip_erase_delay = 32000;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m163";
+	desc             = "ATMEGA163";
+	stk500_devcode   = 0x81;
+	avr910_devcode   = 0x64;
+	signature        = 0x1e 0x94 0x02;
+	chip_erase_delay = 32000;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout             = 200;
-    stabdelay           = 100;
-    cmdexedelay         = 25;
-    synchloops          = 32;
-    bytedelay           = 0;
-    pollindex           = 3;
-    pollvalue           = 0x53;
-    predelay            = 1;
-    postdelay           = 1;
-    pollmethod          = 0;
+	timeout             = 200;
+	stabdelay           = 100;
+	cmdexedelay         = 25;
+	synchloops          = 32;
+	bytedelay           = 0;
+	pollindex           = 3;
+	pollvalue           = 0x53;
+	predelay            = 1;
+	postdelay           = 1;
+	pollmethod          = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 30;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 2;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 2;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 30;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 2;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 2;
 
 
    memory "eeprom"
-        size            = 512;
-        min_write_delay = 4000;
-        max_write_delay = 4000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		size            = 512;
+		min_write_delay = 4000;
+		max_write_delay = 4000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
-        mode            = 0x41;
-        delay           = 20;
-        blocksize       = 4;
-        readsize        = 256;
-      ;
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
+		mode            = 0x41;
+		delay           = 20;
+		blocksize       = 4;
+		readsize        = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 16000;
-        max_write_delay = 16000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 16000;
+		max_write_delay = 16000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x11;
-	delay		= 20;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x11;
+	delay       = 20;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o x x  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o x x  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i 1 1  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i 1 1  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  1 o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  1 o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   1 1 1 1  1 i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   1 1 1 1  1 i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  0 x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  0 x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -4988,179 +4988,179 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m169";
-    desc             = "ATMEGA169";
-    has_jtag         = yes;
-    stk500_devcode   = 0x85;
-    avr910_devcode   = 0x78;
-    signature        = 0x1e 0x94 0x05;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m169";
+	desc             = "ATMEGA169";
+	has_jtag         = yes;
+	stk500_devcode   = 0x85;
+	avr910_devcode   = 0x78;
+	signature        = 0x1e 0x94 0x05;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 4;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 4;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -5168,182 +5168,182 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m329";
-    desc             = "ATMEGA329";
-    has_jtag         = yes;
+	id               = "m329";
+	desc             = "ATMEGA329";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x95 0x03;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x95 0x03;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -5352,182 +5352,182 @@ part
 # Identical to ATmega329 except of the signature
 
 part
-    id               = "m329p";
-    desc             = "ATMEGA329P";
-    has_jtag         = yes;
+	id               = "m329p";
+	desc             = "ATMEGA329P";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x95 0x0b;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x95 0x0b;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -5537,182 +5537,182 @@ part
 # identical to ATmega329
 
 part
-    id               = "m3290";
-    desc             = "ATMEGA3290";
-    has_jtag         = yes;
+	id               = "m3290";
+	desc             = "ATMEGA3290";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x95 0x04;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x95 0x04;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a3   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -5722,182 +5722,182 @@ part
 # identical to ATmega3290 except of the signature
 
 part
-    id               = "m3290p";
-    desc             = "ATMEGA3290P";
-    has_jtag         = yes;
+	id               = "m3290p";
+	desc             = "ATMEGA3290P";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x95 0x0c;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x95 0x0c;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a3   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -5905,182 +5905,182 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m649";
-    desc             = "ATMEGA649";
-    has_jtag         = yes;
+	id               = "m649";
+	desc             = "ATMEGA649";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x96 0x03;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x96 0x03;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -6090,192 +6090,192 @@ part
 # identical to ATmega649
 
 part
-    id               = "m6490";
-    desc             = "ATMEGA6490";
-    has_jtag         = yes;
+	id               = "m6490";
+	desc             = "ATMEGA6490";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x96 0x04;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x96 0x04;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -6283,174 +6283,174 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m32";
-    desc             = "ATMEGA32";
-    has_jtag         = yes;
-    stk500_devcode   = 0x91;
-    avr910_devcode   = 0x72;
-    signature        = 0x1e 0x95 0x02;
-    chip_erase_delay = 9000;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m32";
+	desc             = "ATMEGA32";
+	has_jtag         = yes;
+	stk500_devcode   = 0x91;
+	avr910_devcode   = 0x72;
+	signature        = 0x1e 0x95 0x02;
+	chip_erase_delay = 9000;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = yes;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = yes;
 
    memory "eeprom"
-        paged           = no;   /* leave this "no" */
-        page_size       = 4;    /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		paged           = no;   /* leave this "no" */
+		page_size       = 4;    /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o o";
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0 0 1 1  1 0 0 0    0 0 x x  x x x x",
-                          "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0 0 1 1  1 0 0 0    0 0 x x  x x x x",
+						  "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -6458,138 +6458,138 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m161";
-    desc             = "ATMEGA161";
-    stk500_devcode   = 0x80;
-    avr910_devcode   = 0x60;
-    signature        = 0x1e 0x94 0x01;
-    chip_erase_delay = 28000;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m161";
+	desc             = "ATMEGA161";
+	stk500_devcode   = 0x80;
+	avr910_devcode   = 0x60;
+	signature        = 0x1e 0x94 0x01;
+	chip_erase_delay = 28000;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 30;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 2;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 2;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 30;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 2;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 2;
 
    memory "eeprom"
-        size            = 512;
-        min_write_delay = 3400;
-        max_write_delay = 3400;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		size            = 512;
+		min_write_delay = 3400;
+		max_write_delay = 3400;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 5;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 5;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 14000;
-        max_write_delay = 14000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 14000;
+		max_write_delay = 14000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 16;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 16;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "fuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x o x o  o o o o";
+	memory "fuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x o x o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 x  x x x x",
-                          "x x x x  x x x x   1 i 1 i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 x  x x x x",
+						  "x x x x  x x x x   1 i 1 i  i i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -6598,158 +6598,158 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m8";
-    desc             = "ATMEGA8";
-    stk500_devcode   = 0x70;
-    avr910_devcode   = 0x76;
-    signature        = 0x1e 0x93 0x07;
-    pagel            = 0xd7;
-    bs2              = 0xc2;
-    chip_erase_delay = 10000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m8";
+	desc             = "ATMEGA8";
+	stk500_devcode   = 0x70;
+	avr910_devcode   = 0x76;
+	signature        = 0x1e 0x93 0x07;
+	pagel            = 0xd7;
+	bs2              = 0xc2;
+	chip_erase_delay = 10000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 2;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 2;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        size            = 512;
-        page_size       = 4;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		size            = 512;
+		page_size       = 4;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 20;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 20;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 10;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 10;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0  0  1  1   1  0  0  0   0  0  x  x   x  x  x  x",
-                          "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0  0  1  1   1  0  0  0   0  0  x  x   x  x  x  x",
+						  "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -6759,154 +6759,154 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m8515";
-    desc             = "ATMEGA8515";
-    stk500_devcode   = 0x63;
-    avr910_devcode   = 0x3A;
-    signature        = 0x1e 0x93 0x06;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m8515";
+	desc             = "ATMEGA8515";
+	stk500_devcode   = 0x63;
+	avr910_devcode   = 0x3A;
+	signature        = 0x1e 0x93 0x06;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
  read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
  write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0 0 1 1  1 0 0 0     0 0 x x  x x x x",
-                          "0 0 0 0  0 0 a1 a0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0 0 1 1  1 0 0 0     0 0 x x  x x x x",
+						  "0 0 0 0  0 0 a1 a0   o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -6917,156 +6917,156 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m8535";
-    desc             = "ATMEGA8535";
-    stk500_devcode   = 0x64;
-    avr910_devcode   = 0x69;
-    signature        = 0x1e 0x93 0x08;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m8535";
+	desc             = "ATMEGA8535";
+	stk500_devcode   = 0x64;
+	avr910_devcode   = 0x69;
+	signature        = 0x1e 0x93 0x08;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0 0 1 1  1 0 0 0   0 0 x x  x x x x",
-                          "0 0 0 0  0 0 a1 a0 o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0 0 1 1  1 0 0 0   0 0 x x  x x x x",
+						  "0 0 0 0  0 0 a1 a0 o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -7075,153 +7075,153 @@ part
 #------------------------------------------------------------
 
 part
-    id                  = "t26";
-    desc                = "ATTINY26";
-    stk500_devcode      = 0x21;
-    avr910_devcode      = 0x5e;
-    signature           = 0x1e 0x91 0x09;
-    pagel               = 0xb3;
-    bs2                 = 0xb2;
-    chip_erase_delay    = 9000;
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	id                  = "t26";
+	desc                = "ATTINY26";
+	stk500_devcode      = 0x21;
+	avr910_devcode      = 0x5e;
+	signature           = 0x1e 0x91 0x09;
+	pagel               = 0xb3;
+	bs2                 = 0xb2;
+	chip_erase_delay    = 9000;
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
-        0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
-        0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
-        0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 2;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
+		0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
+		0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
+		0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 2;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        size            = 128;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+	memory "eeprom"
+		size            = 128;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 64;
-	readsize	= 256;
-    ;
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 64;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        paged           = yes;
-        size            = 2048;
-        page_size       = 32;
-        num_pages       = 64;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0  0  1  0   0  0  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+	memory "flash"
+		paged           = yes;
+		size            = 2048;
+		page_size       = 32;
+		num_pages       = 64;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0  0  1  0   0  0  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        read_hi         = "  0  0  1  0   1  0  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_hi         = "  0  0  1  0   1  0  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        loadpage_lo     = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_lo     = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        loadpage_hi     = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_hi     = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        writepage       = "  0  1  0  0   1  1  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4   x  x  x  x",
-                          "  x  x  x  x   x  x  x  x";
+		writepage       = "  0  1  0  0   1  1  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4   x  x  x  x",
+						  "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 16;
-	readsize	= 256;
-    ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 16;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x x o o";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x x o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  x x x i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  x x x i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  x x x o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  x x x o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 4;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
 ;
 
@@ -7232,185 +7232,185 @@ part
 # Close to ATtiny26
 
 part
-    id                  = "t261";
-    desc                = "ATTINY261";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x00, 0x10;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	id                  = "t261";
+	desc                = "ATTINY261";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x00, 0x10;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 #    stk500_devcode      = 0x21;
 #    avr910_devcode      = 0x5e;
-    signature           = 0x1e 0x91 0x0c;
-    pagel               = 0xb3;
-    bs2                 = 0xb2;
-    chip_erase_delay    = 4000;
+	signature           = 0x1e 0x91 0x0c;
+	pagel               = 0xb3;
+	bs2                 = 0xb2;
+	chip_erase_delay    = 4000;
 
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
-        0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
-        0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
-        0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 2;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
+		0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
+		0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
+		0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 2;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        size            = 128;
-        page_size       = 4;
-        num_pages       = 32;
-        min_write_delay = 4000;
-        max_write_delay = 4000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		size            = 128;
+		page_size       = 4;
+		num_pages       = 32;
+		min_write_delay = 4000;
+		max_write_delay = 4000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+		read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 4;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 4;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        paged           = yes;
-        size            = 2048;
-        page_size       = 32;
-        num_pages       = 64;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "flash"
+		paged           = yes;
+		size            = 2048;
+		page_size       = 32;
+		num_pages       = 64;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read_lo         = "  0  0  1  0   0  0  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_lo         = "  0  0  1  0   0  0  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        read_hi         = "  0  0  1  0   1  0  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_hi         = "  0  0  1  0   1  0  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        loadpage_lo     = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_lo     = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        loadpage_hi     = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_hi     = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        writepage       = "  0  1  0  0   1  1  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4   x  x  x  x",
-                          "  x  x  x  x   x  x  x  x";
+		writepage       = "  0  1  0  0   1  1  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4   x  x  x  x",
+						  "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x x o o";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x x o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x x x i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x x x i";
 
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x x x o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x x x o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0  0  0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	;
 
 ;
 
@@ -7421,185 +7421,185 @@ part
 # Close to ATtiny261
 
 part
-    id                  = "t461";
-    desc                = "ATTINY461";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x00, 0x10;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	id                  = "t461";
+	desc                = "ATTINY461";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x00, 0x10;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 #    stk500_devcode      = 0x21;
 #    avr910_devcode      = 0x5e;
-    signature           = 0x1e 0x92 0x08;
-    pagel               = 0xb3;
-    bs2                 = 0xb2;
-    chip_erase_delay    = 4000;
+	signature           = 0x1e 0x92 0x08;
+	pagel               = 0xb3;
+	bs2                 = 0xb2;
+	chip_erase_delay    = 4000;
 
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
-        0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
-        0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
-        0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 2;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
+		0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
+		0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
+		0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 2;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        size            = 256;
-        page_size       = 4;
-        num_pages       = 64;
-        min_write_delay = 4000;
-        max_write_delay = 4000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		size            = 256;
+		page_size       = 4;
+		num_pages       = 64;
+		min_write_delay = 4000;
+		max_write_delay = 4000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read            = " 1  0  1  0   0  0  0  0    x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+		read            = " 1  0  1  0   0  0  0  0    x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0    x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = " 1  1  0  0   0  0  0  0    x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 4;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 4;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        paged           = yes;
-        size            = 4096;
-        page_size       = 64;
-        num_pages       = 64;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "flash"
+		paged           = yes;
+		size            = 4096;
+		page_size       = 64;
+		num_pages       = 64;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read_lo         = "  0  0  1  0   0   0  0  0",
-                          "  x  x  x  x   x a10 a9 a8",
-                          " a7 a6 a5 a4  a3  a2 a1 a0",
-                          "  o  o  o  o   o   o  o  o";
+		read_lo         = "  0  0  1  0   0   0  0  0",
+						  "  x  x  x  x   x a10 a9 a8",
+						  " a7 a6 a5 a4  a3  a2 a1 a0",
+						  "  o  o  o  o   o   o  o  o";
 
-        read_hi         = "  0  0  1  0   1   0  0  0",
-                          "  x  x  x  x   x a10 a9 a8",
-                          " a7 a6 a5 a4  a3  a2 a1 a0",
-                          "  o  o  o  o   o   o  o  o";
+		read_hi         = "  0  0  1  0   1   0  0  0",
+						  "  x  x  x  x   x a10 a9 a8",
+						  " a7 a6 a5 a4  a3  a2 a1 a0",
+						  "  o  o  o  o   o   o  o  o";
 
-        loadpage_lo     = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_lo     = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        loadpage_hi     = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_hi     = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        writepage       = "  0  1  0  0   1   1  0  0",
-                          "  x  x  x  x   x a10 a9 a8",
-                          " a7 a6 a5  x   x   x  x  x",
-                          "  x  x  x  x   x   x  x  x";
+		writepage       = "  0  1  0  0   1   1  0  0",
+						  "  x  x  x  x   x a10 a9 a8",
+						  " a7 a6 a5  x   x   x  x  x",
+						  "  x  x  x  x   x   x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x x o o";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x x o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x x x i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x x x i";
 
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x x x o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x x x o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0  0  0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	;
 
 ;
 
@@ -7610,185 +7610,185 @@ part
 # Close to ATtiny461
 
 part
-    id                  = "t861";
-    desc                = "ATTINY861";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x00, 0x10;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	id                  = "t861";
+	desc                = "ATTINY861";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x00, 0x10;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 #    stk500_devcode      = 0x21;
 #    avr910_devcode      = 0x5e;
-    signature           = 0x1e 0x93 0x0d;
-    pagel               = 0xb3;
-    bs2                 = 0xb2;
-    chip_erase_delay    = 4000;
+	signature           = 0x1e 0x93 0x0d;
+	pagel               = 0xb3;
+	bs2                 = 0xb2;
+	chip_erase_delay    = 4000;
 
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
-        0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
-        0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
-        0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 2;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
+		0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
+		0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
+		0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 2;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        size            = 512;
-        num_pages       = 128;
-        page_size       = 4;
-        min_write_delay = 4000;
-        max_write_delay = 4000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		size            = 512;
+		num_pages       = 128;
+		page_size       = 4;
+		min_write_delay = 4000;
+		max_write_delay = 4000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read            = " 1  0  1  0   0  0  0  0    x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0    o o o o  o o o  o";
+		read            = " 1  0  1  0   0  0  0  0    x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0    o o o o  o o o  o";
 
-        write           = " 1  1  0  0   0  0  0  0    x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0    i i i i  i i i  i";
+		write           = " 1  1  0  0   0  0  0  0    x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0    i i i i  i i i  i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 4;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 4;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read_lo         = "  0  0  1  0   0   0  0  0",
-                          "  x  x  x  x a11 a10 a9 a8",
-                          " a7 a6 a5 a4  a3  a2 a1 a0",
-                          "  o  o  o  o   o   o  o  o";
+		read_lo         = "  0  0  1  0   0   0  0  0",
+						  "  x  x  x  x a11 a10 a9 a8",
+						  " a7 a6 a5 a4  a3  a2 a1 a0",
+						  "  o  o  o  o   o   o  o  o";
 
-        read_hi         = "  0  0  1  0   1   0  0  0",
-                          "  x  x  x  x a11 a10 a9 a8",
-                          " a7 a6 a5 a4  a3  a2 a1 a0",
-                          "  o  o  o  o   o   o  o  o";
+		read_hi         = "  0  0  1  0   1   0  0  0",
+						  "  x  x  x  x a11 a10 a9 a8",
+						  " a7 a6 a5 a4  a3  a2 a1 a0",
+						  "  o  o  o  o   o   o  o  o";
 
-        loadpage_lo     = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_lo     = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        loadpage_hi     = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_hi     = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        writepage       = "  0  1  0  0   1   1  0  0",
-                          "  x  x  x  x a11 a10 a9 a8",
-                          " a7 a6 a5  x   x   x  x  x",
-                          "  x  x  x  x   x   x  x  x";
+		writepage       = "  0  1  0  0   1   1  0  0",
+						  "  x  x  x  x a11 a10 a9 a8",
+						  " a7 a6 a5  x   x   x  x  x",
+						  "  x  x  x  x   x   x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x x o o";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x x o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x x x i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x x x i";
 
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x x x o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x x x o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0  0  0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	;
 
 ;
 
@@ -7798,185 +7798,185 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m48";
-    desc             = "ATMEGA48";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-    stk500_devcode   = 0x59;
+	id               = "m48";
+	desc             = "ATMEGA48";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	stk500_devcode   = 0x59;
 #    avr910_devcode   = 0x;
-    signature        = 0x1e 0x92 0x05;
-    pagel            = 0xd7;
-    bs2              = 0xc2;
-    chip_erase_delay = 45000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x92 0x05;
+	pagel            = 0xd7;
+	bs2              = 0xc2;
+	chip_erase_delay = 45000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        page_size       = 4;
-        size            = 256;
-        min_write_delay = 3600;
-        max_write_delay = 3600;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		page_size       = 4;
+		size            = 256;
+		min_write_delay = 3600;
+		max_write_delay = 3600;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x      x   x   x   x",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x      x   x   x   x",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 256;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 4096;
-        page_size       = 64;
-        num_pages       = 64;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0    0 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 4096;
+		page_size       = 64;
+		num_pages       = 64;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0    0 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0    0 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0    0 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x x x o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x x x o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x x x i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x x x i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
-                          "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
+						  "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -7985,185 +7985,185 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m88";
-    desc             = "ATMEGA88";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-    stk500_devcode   = 0x73;
+	id               = "m88";
+	desc             = "ATMEGA88";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	stk500_devcode   = 0x73;
 #    avr910_devcode   = 0x;
-    signature        = 0x1e 0x93 0x0a;
-    pagel            = 0xd7;
-    bs2              = 0xc2;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x93 0x0a;
+	pagel            = 0xd7;
+	bs2              = 0xc2;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        page_size       = 4;
-        size            = 512;
-        min_write_delay = 3600;
-        max_write_delay = 3600;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		page_size       = 4;
+		size            = 512;
+		min_write_delay = 3600;
+		max_write_delay = 3600;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 256;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
-                          "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
+						  "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -8171,187 +8171,187 @@ part
 #------------------------------------------------------------
 
 part
-    id              = "m168";
-    desc            = "ATMEGA168";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-    stk500_devcode  = 0x86;
-    # avr910_devcode = 0x;
-    signature       = 0x1e 0x94 0x06;
-    pagel           = 0xd7;
-    bs2             = 0xc2;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0 1 1 0 0 0 1 0 1 0 0 1 1",
-                       "x x x x x x x x x x x x x x x x";
+	id              = "m168";
+	desc            = "ATMEGA168";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	stk500_devcode  = 0x86;
+	# avr910_devcode = 0x;
+	signature       = 0x1e 0x94 0x06;
+	pagel           = 0xd7;
+	bs2             = 0xc2;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0 1 1 0 0 0 1 0 1 0 0 1 1",
+					   "x x x x x x x x x x x x x x x x";
 
-    chip_erase       = "1 0 1 0 1 1 0 0 1 0 0 x x x x x",
-                       "x x x x x x x x x x x x x x x x";
+	chip_erase       = "1 0 1 0 1 1 0 0 1 0 0 x x x x x",
+					   "x x x x x x x x x x x x x x x x";
 
-    timeout         = 200;
-    stabdelay       = 100;
-    cmdexedelay     = 25;
-    synchloops      = 32;
-    bytedelay       = 0;
-    pollindex       = 3;
-    pollvalue       = 0x53;
-    predelay        = 1;
-    postdelay       = 1;
-    pollmethod      = 1;
+	timeout         = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        page_size       = 4;
-        size            = 512;
-        min_write_delay = 3600;
-        max_write_delay = 3600;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = " 1 0 1 0 0 0 0 0",
-                          " 0 0 0 x x x x a8",
-                          " a7 a6 a5 a4 a3 a2 a1 a0",
-                          " o o o o o o o o";
+	memory "eeprom"
+		paged           = no;
+		page_size       = 4;
+		size            = 512;
+		min_write_delay = 3600;
+		max_write_delay = 3600;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = " 1 0 1 0 0 0 0 0",
+						  " 0 0 0 x x x x a8",
+						  " a7 a6 a5 a4 a3 a2 a1 a0",
+						  " o o o o o o o o";
 
-        write           = " 1 1 0 0 0 0 0 0",
-                          " 0 0 0 x x x x a8",
-                          " a7 a6 a5 a4 a3 a2 a1 a0",
-                          " i i i i i i i i";
+		write           = " 1 1 0 0 0 0 0 0",
+						  " 0 0 0 x x x x a8",
+						  " a7 a6 a5 a4 a3 a2 a1 a0",
+						  " i i i i i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 256;
-        ;
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 256;
+		;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = " 0 0 1 0 0 0 0 0",
-                          " 0 0 0 a12 a11 a10 a9 a8",
-                          " a7 a6 a5 a4 a3 a2 a1 a0",
-                          " o o o o o o o o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = " 0 0 1 0 0 0 0 0",
+						  " 0 0 0 a12 a11 a10 a9 a8",
+						  " a7 a6 a5 a4 a3 a2 a1 a0",
+						  " o o o o o o o o";
 
-        read_hi          = " 0 0 1 0 1 0 0 0",
-                           " 0 0 0 a12 a11 a10 a9 a8",
-                           " a7 a6 a5 a4 a3 a2 a1 a0",
-                           " o o o o o o o o";
+		read_hi          = " 0 0 1 0 1 0 0 0",
+						   " 0 0 0 a12 a11 a10 a9 a8",
+						   " a7 a6 a5 a4 a3 a2 a1 a0",
+						   " o o o o o o o o";
 
-        loadpage_lo     = " 0 1 0 0 0 0 0 0",
-                          " 0 0 0 x x x x x",
-                          " x x a5 a4 a3 a2 a1 a0",
-                          " i i i i i i i i";
+		loadpage_lo     = " 0 1 0 0 0 0 0 0",
+						  " 0 0 0 x x x x x",
+						  " x x a5 a4 a3 a2 a1 a0",
+						  " i i i i i i i i";
 
-        loadpage_hi     = " 0 1 0 0 1 0 0 0",
-                          " 0 0 0 x x x x x",
-                          " x x a5 a4 a3 a2 a1 a0",
-                          " i i i i i i i i";
+		loadpage_hi     = " 0 1 0 0 1 0 0 0",
+						  " 0 0 0 x x x x x",
+						  " x x a5 a4 a3 a2 a1 a0",
+						  " i i i i i i i i";
 
-        writepage       = " 0 1 0 0 1 1 0 0",
-                          " 0 0 0 a12 a11 a10 a9 a8",
-                          " a7 a6 x x x x x x",
-                          " x x x x x x x x";
+		writepage       = " 0 1 0 0 1 1 0 0",
+						  " 0 0 0 a12 a11 a10 a9 a8",
+						  " a7 a6 x x x x x x",
+						  " x x x x x x x x";
 
-        mode        = 0x41;
-        delay       = 6;
-        blocksize   = 128;
-        readsize    = 256;
+		mode        = 0x41;
+		delay       = 6;
+		blocksize   = 128;
+		readsize    = 256;
 
-        ;
+		;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0",
-                          "x x x x x x x x o o o o o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0",
+						  "x x x x x x x x o o o o o o o o";
 
-        write           = "1 0 1 0 1 1 0 0 1 0 1 0 0 0 0 0",
-                          "x x x x x x x x i i i i i i i i";
-        ;
+		write           = "1 0 1 0 1 1 0 0 1 0 1 0 0 0 0 0",
+						  "x x x x x x x x i i i i i i i i";
+		;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1 1 0 0 0 0 0 0 0 1 0 0 0",
-                          "x x x x x x x x o o o o o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1 1 0 0 0 0 0 0 0 1 0 0 0",
+						  "x x x x x x x x o o o o o o o o";
 
-        write           = "1 0 1 0 1 1 0 0 1 0 1 0 1 0 0 0",
-                          "x x x x x x x x i i i i i i i i";
-        ;
+		write           = "1 0 1 0 1 1 0 0 1 0 1 0 1 0 0 0",
+						  "x x x x x x x x i i i i i i i i";
+		;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 0",
-                          "x x x x x x x x x x x x x o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 0",
+						  "x x x x x x x x x x x x x o o o";
 
-        write           = "1 0 1 0 1 1 0 0 1 0 1 0 0 1 0 0",
-                          "x x x x x x x x x x x x x i i i";
-        ;
+		write           = "1 0 1 0 1 1 0 0 1 0 1 0 0 1 0 0",
+						  "x x x x x x x x x x x x x i i i";
+		;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0",
-                          "x x x x x x x x x x o o o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0",
+						  "x x x x x x x x x x o o o o o o";
 
-        write           = "1 0 1 0 1 1 0 0 1 1 1 x x x x x",
-                          "x x x x x x x x 1 1 i i i i i i";
-        ;
+		write           = "1 0 1 0 1 1 0 0 1 1 1 x x x x x",
+						  "x x x x x x x x 1 1 i i i i i i";
+		;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1 1 0 0 0 0 0 0 x x x x x",
-                          "0 0 0 0 0 0 0 0 o o o o o o o o";
-        ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1 1 0 0 0 0 0 0 x x x x x",
+						  "0 0 0 0 0 0 0 0 o o o o o o o o";
+		;
 
-    memory "signature"
-        size            = 3;
-        read            = "0 0 1 1 0 0 0 0 0 0 0 x x x x x",
-                          "x x x x x x a1 a0 o o o o o o o o";
-        ;
+	memory "signature"
+		size            = 3;
+		read            = "0 0 1 1 0 0 0 0 0 0 0 x x x x x",
+						  "x x x x x x a1 a0 o o o o o o o o";
+		;
 ;
 
 #------------------------------------------------------------
@@ -8359,185 +8359,185 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "t88";
-    desc             = "attiny88";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-    stk500_devcode   = 0x73;
+	id               = "t88";
+	desc             = "attiny88";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	stk500_devcode   = 0x73;
 #    avr910_devcode   = 0x;
-    signature        = 0x1e 0x93 0x11;
-    pagel            = 0xd7;
-    bs2              = 0xc2;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x93 0x11;
+	pagel            = 0xd7;
+	bs2              = 0xc2;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        page_size       = 4;
-        size            = 64;
-        min_write_delay = 3600;
-        max_write_delay = 3600;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		page_size       = 4;
+		size            = 64;
+		min_write_delay = 3600;
+		max_write_delay = 3600;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 64;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 64;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x x x i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x x x i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
-                          "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
+						  "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -8545,100 +8545,100 @@ part
 #------------------------------------------------------------
 
 part
-    id			= "m328p";
-    desc		= "ATMEGA328P";
-    has_debugwire	= yes;
-    flash_instr		= 0xB6, 0x01, 0x11;
-    eeprom_instr	= 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+	id          = "m328p";
+	desc        = "ATMEGA328P";
+	has_debugwire   = yes;
+	flash_instr     = 0xB6, 0x01, 0x11;
+	eeprom_instr    = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
 			  0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
 			  0x99, 0xF9, 0xBB, 0xAF;
-    stk500_devcode	= 0x86;
-    # avr910_devcode	= 0x;
-    signature		= 0x1e 0x95 0x0F;
-    pagel		= 0xd7;
-    bs2			= 0xc2;
-    chip_erase_delay	= 9000;
-    pgm_enable = "1 0 1 0 1 1 0 0 0 1 0 1 0 0 1 1",
+	stk500_devcode  = 0x86;
+	# avr910_devcode    = 0x;
+	signature       = 0x1e 0x95 0x0F;
+	pagel       = 0xd7;
+	bs2         = 0xc2;
+	chip_erase_delay    = 9000;
+	pgm_enable = "1 0 1 0 1 1 0 0 0 1 0 1 0 0 1 1",
 		 "x x x x x x x x x x x x x x x x";
 
-    chip_erase = "1 0 1 0 1 1 0 0 1 0 0 x x x x x",
+	chip_erase = "1 0 1 0 1 1 0 0 1 0 0 x x x x x",
 		 "x x x x x x x x x x x x x x x x";
 
-    timeout	= 200;
-    stabdelay	= 100;
-    cmdexedelay	= 25;
-    synchloops	= 32;
-    bytedelay	= 0;
-    pollindex	= 3;
-    pollvalue	= 0x53;
-    predelay	= 1;
-    postdelay	= 1;
-    pollmethod	= 1;
+	timeout = 200;
+	stabdelay   = 100;
+	cmdexedelay = 25;
+	synchloops  = 32;
+	bytedelay   = 0;
+	pollindex   = 3;
+	pollvalue   = 0x53;
+	predelay    = 1;
+	postdelay   = 1;
+	pollmethod  = 1;
 
-    pp_controlstack =
+	pp_controlstack =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay	= 100;
-    progmodedelay	= 0;
-    latchcycles		= 5;
-    togglevtg		= 1;
-    poweroffdelay	= 15;
-    resetdelayms	= 1;
-    resetdelayus	= 0;
-    hvleavestabdelay	= 15;
-    resetdelay		= 15;
-    chiperasepulsewidth	= 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay   = 0;
+	latchcycles     = 5;
+	togglevtg       = 1;
+	poweroffdelay   = 15;
+	resetdelayms    = 1;
+	resetdelayus    = 0;
+	hvleavestabdelay    = 15;
+	resetdelay      = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-	paged		= no;
-	page_size	= 4;
-	size		= 1024;
+	memory "eeprom"
+	paged       = no;
+	page_size   = 4;
+	size        = 1024;
 	min_write_delay = 3600;
 	max_write_delay = 3600;
-	readback_p1	= 0xff;
-	readback_p2	= 0xff;
+	readback_p1 = 0xff;
+	readback_p2 = 0xff;
 	read = " 1 0 1 0 0 0 0 0",
-	       " 0 0 0 x x x a9 a8",
-	       " a7 a6 a5 a4 a3 a2 a1 a0",
-	       " o o o o o o o o";
+		   " 0 0 0 x x x a9 a8",
+		   " a7 a6 a5 a4 a3 a2 a1 a0",
+		   " o o o o o o o o";
 
 	write = " 1 1 0 0 0 0 0 0",
-	      	" 0 0 0 x x x a9 a8",
+			" 0 0 0 x x x a9 a8",
 		" a7 a6 a5 a4 a3 a2 a1 a0",
 		" i i i i i i i i";
 
 	loadpage_lo = " 1 1 0 0 0 0 0 1",
-		      " 0 0 0 0 0 0 0 0",
-		      " 0 0 0 0 0 0 a1 a0",
-		      " i i i i i i i i";
+			  " 0 0 0 0 0 0 0 0",
+			  " 0 0 0 0 0 0 a1 a0",
+			  " i i i i i i i i";
 
 	writepage = " 1 1 0 0 0 0 1 0",
-		    " 0 0 x x x x a9 a8",
-		    " a7 a6 a5 a4 a3 a2 0 0",
-		    " x x x x x x x x";
+			" 0 0 x x x x a9 a8",
+			" a7 a6 a5 a4 a3 a2 0 0",
+			" x x x x x x x x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 256;
+	;
 
-    memory "flash"
-	paged		= yes;
-	size		= 32768;
-	page_size	= 128;
-	num_pages	= 256;
+	memory "flash"
+	paged       = yes;
+	size        = 32768;
+	page_size   = 128;
+	num_pages   = 256;
 	min_write_delay = 4500;
 	max_write_delay = 4500;
-	readback_p1	= 0xff;
-	readback_p2	= 0xff;
+	readback_p1 = 0xff;
+	readback_p2 = 0xff;
 	read_lo = " 0 0 1 0 0 0 0 0",
 		  " 0 0 a13 a12 a11 a10 a9 a8",
 		  " a7 a6 a5 a4 a3 a2 a1 a0",
@@ -8650,82 +8650,82 @@ part
 		  " o o o o o o o o";
 
 	loadpage_lo = " 0 1 0 0 0 0 0 0",
-		      " 0 0 0 x x x x x",
-		      " x x a5 a4 a3 a2 a1 a0",
-		      " i i i i i i i i";
+			  " 0 0 0 x x x x x",
+			  " x x a5 a4 a3 a2 a1 a0",
+			  " i i i i i i i i";
 
 	loadpage_hi = " 0 1 0 0 1 0 0 0",
-		      " 0 0 0 x x x x x",
-		      " x x a5 a4 a3 a2 a1 a0",
-		      " i i i i i i i i";
+			  " 0 0 0 x x x x x",
+			  " x x a5 a4 a3 a2 a1 a0",
+			  " i i i i i i i i";
 
 	writepage = " 0 1 0 0 1 1 0 0",
-		    " 0 0 a13 a12 a11 a10 a9 a8",
-		    " a7 a6 x x x x x x",
-		    " x x x x x x x x";
+			" 0 0 a13 a12 a11 a10 a9 a8",
+			" a7 a6 x x x x x x",
+			" x x x x x x x x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
 
-    ;
+	;
 
-    memory "lfuse"
+	memory "lfuse"
 	size = 1;
 	min_write_delay = 4500;
 	max_write_delay = 4500;
 	read = "0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0",
-	       "x x x x x x x x o o o o o o o o";
+		   "x x x x x x x x o o o o o o o o";
 
 	write = "1 0 1 0 1 1 0 0 1 0 1 0 0 0 0 0",
-	      	"x x x x x x x x i i i i i i i i";
-    ;
+			"x x x x x x x x i i i i i i i i";
+	;
 
-    memory "hfuse"
+	memory "hfuse"
 	size = 1;
 	min_write_delay = 4500;
 	max_write_delay = 4500;
 	read = "0 1 0 1 1 0 0 0 0 0 0 0 1 0 0 0",
-	       "x x x x x x x x o o o o o o o o";
+		   "x x x x x x x x o o o o o o o o";
 
 	write = "1 0 1 0 1 1 0 0 1 0 1 0 1 0 0 0",
-	      	"x x x x x x x x i i i i i i i i";
-    ;
+			"x x x x x x x x i i i i i i i i";
+	;
 
-    memory "efuse"
+	memory "efuse"
 	size = 1;
 	min_write_delay = 4500;
 	max_write_delay = 4500;
 	read = "0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 0",
-	       "x x x x x x x x x x x x x o o o";
+		   "x x x x x x x x x x x x x o o o";
 
 	write = "1 0 1 0 1 1 0 0 1 0 1 0 0 1 0 0",
-	      	"x x x x x x x x x x x x x i i i";
-    ;
+			"x x x x x x x x x x x x x i i i";
+	;
 
-    memory "lock"
+	memory "lock"
 	size = 1;
 	min_write_delay = 4500;
 	max_write_delay = 4500;
 	read = "0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0",
-	       "x x x x x x x x x x o o o o o o";
+		   "x x x x x x x x x x o o o o o o";
 
 	write = "1 0 1 0 1 1 0 0 1 1 1 x x x x x",
-	      	"x x x x x x x x 1 1 i i i i i i";
-    ;
+			"x x x x x x x x 1 1 i i i i i i";
+	;
 
-    memory "calibration"
+	memory "calibration"
 	size = 1;
 	read = "0 0 1 1 1 0 0 0 0 0 0 x x x x x",
-	       "0 0 0 0 0 0 0 0 o o o o o o o o";
-    ;
+		   "0 0 0 0 0 0 0 0 o o o o o o o o";
+	;
 
-    memory "signature"
+	memory "signature"
 	size = 3;
 	read = "0 0 1 1 0 0 0 0 0 0 0 x x x x x",
-	       "x x x x x x a1 a0 o o o o o o o o";
-    ;
+		   "x x x x x x a1 a0 o o o o o o o o";
+	;
 ;
 
 #------------------------------------------------------------
@@ -8733,186 +8733,186 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t2313";
-     desc          = "ATtiny2313";
-     has_debugwire = yes;
-     flash_instr   = 0xB2, 0x0F, 0x1F;
-     eeprom_instr  = 0xBB, 0xFE, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBA, 0x0F, 0xB2, 0x0F, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
-     stk500_devcode   = 0x23;
+	 id            = "t2313";
+	 desc          = "ATtiny2313";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB2, 0x0F, 0x1F;
+	 eeprom_instr  = 0xBB, 0xFE, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBA, 0x0F, 0xB2, 0x0F, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
+	 stk500_devcode   = 0x23;
 ##   Use the ATtiny26 devcode:
-     avr910_devcode   = 0x5e;
-     signature        = 0x1e 0x91 0x0a;
-     pagel            = 0xD4;
-     bs2              = 0xD6;
-     reset            = io;
-     chip_erase_delay = 9000;
+	 avr910_devcode   = 0x5e;
+	 signature        = 0x1e 0x91 0x0a;
+	 pagel            = 0xD4;
+	 bs2              = 0xD6;
+	 reset            = io;
+	 chip_erase_delay = 9000;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0E, 0x1E, 0x2E, 0x3E, 0x2E, 0x3E,
-        0x4E, 0x5E, 0x4E, 0x5E, 0x6E, 0x7E, 0x6E, 0x7E,
-        0x26, 0x36, 0x66, 0x76, 0x2A, 0x3A, 0x6A, 0x7A,
-        0x2E, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0E, 0x1E, 0x2E, 0x3E, 0x2E, 0x3E,
+		0x4E, 0x5E, 0x4E, 0x5E, 0x6E, 0x7E, 0x6E, 0x7E,
+		0x26, 0x36, 0x66, 0x76, 0x2A, 0x3A, 0x6A, 0x7A,
+		0x2E, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-     memory "eeprom"
-         size            = 128;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 128;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 2048;
-         page_size       = 32;
-         num_pages       = 64;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 2048;
+		 page_size       = 32;
+		 num_pages       = 64;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
 # The information in the data sheet of April/2004 is wrong, this works:
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
 # The information in the data sheet of April/2004 is wrong, this works:
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
 # The information in the data sheet of April/2004 is wrong, this works:
-         writepage       = "  0  1  0  0   1  1  0  0",
-                           "  0  0  0  0   0  0 a9 a8",
-                           " a7 a6 a5 a4   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1  1  0  0",
+						   "  0  0  0  0   0  0 a9 a8",
+						   " a7 a6 a5 a4   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny2313 has Signature Bytes: 0x1E 0x91 0x0A.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
-         read           = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  x x o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
+		 read           = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  x x o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 # The Tiny2313 has calibration data for both 4 MHz and 8 MHz.
 # The information in the data sheet of April/2004 is wrong, this works:
 
-     memory "calibration"
-         size            = 2;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 2;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -8920,181 +8920,181 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "pwm2";
-     desc          = "AT90PWM2";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-     stk500_devcode   = 0x65;
+	 id            = "pwm2";
+	 desc          = "AT90PWM2";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	 stk500_devcode   = 0x65;
 ##  avr910_devcode   = ?;
-     signature        = 0x1e 0x93 0x81;
-     pagel            = 0xD8;
-     bs2              = 0xE2;
-     reset            = io;
-     chip_erase_delay = 9000;
+	 signature        = 0x1e 0x93 0x81;
+	 pagel            = 0xD8;
+	 bs2              = 0xE2;
+	 reset            = io;
+	 chip_erase_delay = 9000;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0   0",
-                           "  0  0  0  0   a11 a10 a9  a8",
-                           " a7 a6 a5  x   x   x   x   x",
-                           "  x  x  x  x   x   x   x   x";
+		 writepage       = "  0  1  0  0   1   1   0   0",
+						   "  0  0  0  0   a11 a10 a9  a8",
+						   " a7 a6 a5  x   x   x   x   x",
+						   "  x  x  x  x   x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	   ;
 #   AT90PWM2 has Signature Bytes: 0x1E 0x93 0x81.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  x x o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  x x o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  0    o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -9104,181 +9104,181 @@ part
 # Completely identical to AT90PWM2 (including the signature!)
 
 part
-     id            = "pwm3";
-     desc          = "AT90PWM3";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-     stk500_devcode   = 0x65;
+	 id            = "pwm3";
+	 desc          = "AT90PWM3";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	 stk500_devcode   = 0x65;
 ##  avr910_devcode   = ?;
-     signature        = 0x1e 0x93 0x81;
-     pagel            = 0xD8;
-     bs2              = 0xE2;
-     reset            = io;
-     chip_erase_delay = 9000;
+	 signature        = 0x1e 0x93 0x81;
+	 pagel            = 0xD8;
+	 bs2              = 0xE2;
+	 reset            = io;
+	 chip_erase_delay = 9000;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0   0",
-                           "  0  0  0  0   a11 a10 a9  a8",
-                           " a7 a6 a5  x   x   x   x   x",
-                           "  x  x  x  x   x   x   x   x";
+		 writepage       = "  0  1  0  0   1   1   0   0",
+						   "  0  0  0  0   a11 a10 a9  a8",
+						   " a7 a6 a5  x   x   x   x   x",
+						   "  x  x  x  x   x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	   ;
 #   AT90PWM2 has Signature Bytes: 0x1E 0x93 0x81.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  x x o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  x x o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  0    o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -9287,180 +9287,180 @@ part
 # Same as AT90PWM2 but different signature.
 
 part
-     id            = "pwm2b";
-     desc          = "AT90PWM2B";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-     stk500_devcode   = 0x65;
+	 id            = "pwm2b";
+	 desc          = "AT90PWM2B";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	 stk500_devcode   = 0x65;
 ##  avr910_devcode   = ?;
-     signature        = 0x1e 0x93 0x83;
-     pagel            = 0xD8;
-     bs2              = 0xE2;
-     reset            = io;
-     chip_erase_delay = 9000;
+	 signature        = 0x1e 0x93 0x83;
+	 pagel            = 0xD8;
+	 bs2              = 0xE2;
+	 reset            = io;
+	 chip_erase_delay = 9000;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0   0",
-                           "  0  0  0  0   a11 a10 a9  a8",
-                           " a7 a6 a5  x   x   x   x   x",
-                           "  x  x  x  x   x   x   x   x";
+		 writepage       = "  0  1  0  0   1   1   0   0",
+						   "  0  0  0  0   a11 a10 a9  a8",
+						   " a7 a6 a5  x   x   x   x   x",
+						   "  x  x  x  x   x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-       ;
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	   ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  x x o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  x x o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  0    o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -9470,180 +9470,180 @@ part
 # Completely identical to AT90PWM2B (including the signature!)
 
 part
-     id            = "pwm3b";
-     desc          = "AT90PWM3B";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-     stk500_devcode   = 0x65;
+	 id            = "pwm3b";
+	 desc          = "AT90PWM3B";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	 stk500_devcode   = 0x65;
 ##  avr910_devcode   = ?;
-     signature        = 0x1e 0x93 0x83;
-     pagel            = 0xD8;
-     bs2              = 0xE2;
-     reset            = io;
-     chip_erase_delay = 9000;
+	 signature        = 0x1e 0x93 0x83;
+	 pagel            = 0xD8;
+	 bs2              = 0xE2;
+	 reset            = io;
+	 chip_erase_delay = 9000;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0   0",
-                           "  0  0  0  0   a11 a10 a9  a8",
-                           " a7 a6 a5  x   x   x   x   x",
-                           "  x  x  x  x   x   x   x   x";
+		 writepage       = "  0  1  0  0   1   1   0   0",
+						   "  0  0  0  0   a11 a10 a9  a8",
+						   " a7 a6 a5  x   x   x   x   x",
+						   "  x  x  x  x   x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-       ;
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	   ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  x x o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  x x o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  0    o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -9651,179 +9651,179 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t25";
-     desc          = "ATtiny25";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x02, 0x12;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	 id            = "t25";
+	 desc          = "ATtiny25";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x02, 0x12;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 ## no STK500 devcode in XML file, use the ATtiny45 one
-     stk500_devcode   = 0x14;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x91 0x08;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x91 0x08;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 128;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 128;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 2048;
-         page_size       = 32;
-         num_pages       = 64;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 2048;
+		 page_size       = 32;
+		 num_pages       = 64;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1  1  0  0",
-                           "  0  0  0  0   0  0 a9 a8",
-                           " a7 a6 a5 a4   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1  1  0  0",
+						   "  0  0  0  0   0  0 a9 a8",
+						   " a7 a6 a5 a4   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny25 has Signature Bytes: 0x1E 0x91 0x08.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 2;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 2;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -9831,178 +9831,178 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t45";
-     desc          = "ATtiny45";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x02, 0x12;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
-     stk500_devcode   = 0x14;
+	 id            = "t45";
+	 desc          = "ATtiny45";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x02, 0x12;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x92 0x06;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x92 0x06;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack     =
+	hvsp_controlstack     =
 	0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 256;
-         page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 256;
+		 page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 4096;
-         page_size       = 64;
-         num_pages       = 64;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0    0  a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 4096;
+		 page_size       = 64;
+		 num_pages       = 64;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0    0  a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0    0  a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0    0  a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1  1  0  0",
-                           "  0  0  0  0   0 a10 a9 a8",
-                           " a7 a6 a5  x   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1  1  0  0",
+						   "  0  0  0  0   0 a10 a9 a8",
+						   " a7 a6 a5  x   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny45 has Signature Bytes: 0x1E 0x92 0x08. (Data sheet 2586C-AVR-06/05 (doc2586.pdf) indicates otherwise!)
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 2;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 2;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -10010,179 +10010,179 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t85";
-     desc          = "ATtiny85";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x02, 0x12;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	 id            = "t85";
+	 desc          = "ATtiny85";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x02, 0x12;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 ## no STK500 devcode in XML file, use the ATtiny45 one
-     stk500_devcode   = 0x14;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x93 0x0b;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x93 0x0b;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x a8",
-                           "a8 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x a8",
+						   "a8 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0  a11 a10  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0  a11 a10  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0  a11 a10  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0  a11 a10  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0  0",
-                           "  0  0  0  0  a11 a10 a9 a8",
-                           " a7 a6 a5  x   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1   1   0  0",
+						   "  0  0  0  0  a11 a10 a9 a8",
+						   " a7 a6 a5  x   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny85 has Signature Bytes: 0x1E 0x93 0x08.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 2;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 2;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -10191,187 +10191,187 @@ part
 # Almost same as ATmega1280, except for different memory sizes
 
 part
-    id               = "m640";
-    desc             = "ATMEGA640";
-    signature        = 0x1e 0x96 0x08;
-    has_jtag         = yes;
+	id               = "m640";
+	desc             = "ATMEGA640";
+	signature        = 0x1e 0x96 0x08;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -10379,187 +10379,187 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m1280";
-    desc             = "ATMEGA1280";
-    signature        = 0x1e 0x97 0x03;
-    has_jtag         = yes;
+	id               = "m1280";
+	desc             = "ATMEGA1280";
+	signature        = 0x1e 0x97 0x03;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -10568,187 +10568,187 @@ part
 # Identical to ATmega1280
 
 part
-    id               = "m1281";
-    desc             = "ATMEGA1281";
-    signature        = 0x1e 0x97 0x04;
-    has_jtag         = yes;
+	id               = "m1281";
+	desc             = "ATMEGA1281";
+	signature        = 0x1e 0x97 0x04;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -10756,192 +10756,192 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m2560";
-    desc             = "ATMEGA2560";
-    signature        = 0x1e 0x98 0x01;
-    has_jtag         = yes;
+	id               = "m2560";
+	desc             = "ATMEGA2560";
+	signature        = 0x1e 0x98 0x01;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 262144;
-        page_size       = 256;
-        num_pages       = 1024;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 262144;
+		page_size       = 256;
+		num_pages       = 1024;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-        load_ext_addr   = "  0   1   0   0      1   1   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0 a16",
-                          "  0   0   0   0      0   0   0   0";
+		load_ext_addr   = "  0   1   0   0      1   1   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0 a16",
+						  "  0   0   0   0      0   0   0   0";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -10949,192 +10949,192 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m2561";
-    desc             = "ATMEGA2561";
-    signature        = 0x1e 0x98 0x02;
-    has_jtag         = yes;
+	id               = "m2561";
+	desc             = "ATMEGA2561";
+	signature        = 0x1e 0x98 0x02;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 262144;
-        page_size       = 256;
-        num_pages       = 1024;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 262144;
+		page_size       = 256;
+		num_pages       = 1024;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-        load_ext_addr   = "  0   1   0   0      1   1   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0 a16",
-                          "  0   0   0   0      0   0   0   0";
+		load_ext_addr   = "  0   1   0   0      1   1   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0 a16",
+						  "  0   0   0   0      0   0   0   0";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -11143,187 +11143,187 @@ part
 # Identical to ATmega2561 but half the ROM
 
 part
-    id               = "m128rfa1";
-    desc             = "ATMEGA128RFA1";
-    signature        = 0x1e 0xa7 0x01;
-    has_jtag         = yes;
+	id               = "m128rfa1";
+	desc             = "ATMEGA128RFA1";
+	signature        = 0x1e 0xa7 0x01;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xE2;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xE2;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -11331,181 +11331,181 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t24";
-     desc          = "ATtiny24";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x07, 0x17;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	 id            = "t24";
+	 desc          = "ATtiny24";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x07, 0x17;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 ## no STK500 devcode in XML file, use the ATtiny45 one
-     stk500_devcode   = 0x14;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x91 0x0b;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x91 0x0b;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 70;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 70;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 128;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 128;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 2048;
-         page_size       = 32;
-         num_pages       = 64;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 2048;
+		 page_size       = 32;
+		 num_pages       = 64;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1  1  0  0",
-                           "  0  0  0  0   0  0 a9 a8",
-                           " a7 a6 a5 a4   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1  1  0  0",
+						   "  0  0  0  0   0  0 a9 a8",
+						   " a7 a6 a5 a4   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny24 has Signature Bytes: 0x1E 0x91 0x0B.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  x x x x  x x i i";
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "0 0 0 0  0 0 0 0  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  x x x x  x x i i";
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -11513,181 +11513,181 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t44";
-     desc          = "ATtiny44";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x07, 0x17;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-                     0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
-                     0x99, 0xE1, 0xBB, 0xAC;
+	 id            = "t44";
+	 desc          = "ATtiny44";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x07, 0x17;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+					 0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
+					 0x99, 0xE1, 0xBB, 0xAC;
 ## no STK500 devcode in XML file, use the ATtiny45 one
-     stk500_devcode   = 0x14;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x92 0x07;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x92 0x07;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 70;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 70;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 256;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 256;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 4096;
-         page_size       = 64;
-         num_pages       = 64;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0    0  a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 4096;
+		 page_size       = 64;
+		 num_pages       = 64;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0    0  a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0    0  a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0    0  a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1  1  0  0",
-                           "  0  0  0  0   0 a10 a9 a8",
-                           " a7 a6 a5  x   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1  1  0  0",
+						   "  0  0  0  0   0 a10 a9 a8",
+						   " a7 a6 a5  x   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny44 has Signature Bytes: 0x1E 0x92 0x07.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  x x x x  x x i i";
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "0 0 0 0  0 0 0 0  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  x x x x  x x i i";
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -11695,182 +11695,182 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t84";
-     desc          = "ATtiny84";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x07, 0x17;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	 id            = "t84";
+	 desc          = "ATtiny84";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x07, 0x17;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 ## no STK500 devcode in XML file, use the ATtiny45 one
-     stk500_devcode   = 0x14;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x93 0x0c;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x93 0x0c;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 70;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 70;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x a8",
-                           "a8 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x a8",
+						   "a8 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0  a11 a10  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0  a11 a10  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0  a11 a10  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0  a11 a10  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0  0",
-                           "  0  0  0  0  a11 a10 a9 a8",
-                           " a7 a6 a5  x   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1   1   0  0",
+						   "  0  0  0  0  a11 a10 a9 a8",
+						   " a7 a6 a5  x   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny84 has Signature Bytes: 0x1E 0x93 0x0C.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
 
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  x x x x  x x i i";
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "0 0 0 0  0 0 0 0  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  x x x x  x x i i";
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -11878,187 +11878,187 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m32u4";
-    desc             = "ATmega32U4";
-    signature        = 0x1e 0x95 0x87;
-    has_jtag         = yes;
+	id               = "m32u4";
+	desc             = "ATmega32U4";
+	signature        = 0x1e 0x95 0x87;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -12066,187 +12066,187 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "usb646";
-    desc             = "AT90USB646";
-    signature        = 0x1e 0x96 0x82;
-    has_jtag         = yes;
+	id               = "usb646";
+	desc             = "AT90USB646";
+	signature        = 0x1e 0x96 0x82;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -12255,187 +12255,187 @@ part
 # identical to AT90USB646
 
 part
-    id               = "usb647";
-    desc             = "AT90USB647";
-    signature        = 0x1e 0x96 0x82;
-    has_jtag         = yes;
+	id               = "usb647";
+	desc             = "AT90USB647";
+	signature        = 0x1e 0x96 0x82;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -12443,187 +12443,187 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "usb1286";
-    desc             = "AT90USB1286";
-    signature        = 0x1e 0x97 0x82;
-    has_jtag         = yes;
+	id               = "usb1286";
+	desc             = "AT90USB1286";
+	signature        = 0x1e 0x97 0x82;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -12632,187 +12632,187 @@ part
 # identical to AT90USB1286
 
 part
-    id               = "usb1287";
-    desc             = "AT90USB1287";
-    signature        = 0x1e 0x97 0x82;
-    has_jtag         = yes;
+	id               = "usb1287";
+	desc             = "AT90USB1287";
+	signature        = 0x1e 0x97 0x82;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -12821,179 +12821,179 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "usb162";
-    desc             = "AT90USB162";
-    has_jtag         = no;
-    has_debugwire    = yes;
-    signature        = 0x1e 0x94 0x82;
-    chip_erase_delay = 9000;
-    reset            = io;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
-    pagel            = 0xD7;
-    bs2              = 0xC6;
+	id               = "usb162";
+	desc             = "AT90USB162";
+	has_jtag         = no;
+	has_debugwire    = yes;
+	signature        = 0x1e 0x94 0x82;
+	chip_erase_delay = 9000;
+	reset            = io;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
+	pagel            = 0xD7;
+	bs2              = 0xC6;
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        num_pages       = 128;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		num_pages       = 128;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2   0   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 4;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 4;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -13005,179 +13005,179 @@ part
 #        num_pages       = 64;
 
 part
-    id               = "usb82";
-    desc             = "AT90USB82";
-    has_jtag         = no;
-    has_debugwire    = yes;
-    signature        = 0x1e 0x93 0x82;
-    chip_erase_delay = 9000;
-    reset            = io;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
-    pagel            = 0xD7;
-    bs2              = 0xC6;
+	id               = "usb82";
+	desc             = "AT90USB82";
+	has_jtag         = no;
+	has_debugwire    = yes;
+	signature        = 0x1e 0x93 0x82;
+	chip_erase_delay = 9000;
+	reset            = io;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
+	pagel            = 0xD7;
+	bs2              = 0xC6;
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        num_pages       = 128;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		num_pages       = 128;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2   0   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 4;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 4;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 128;
-        num_pages       = 64;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 128;
+		num_pages       = 64;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -13185,188 +13185,188 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m325";
-    desc             = "ATMEGA325";
-    signature        = 0x1e 0x95 0x05;
-    has_jtag         = yes;
+	id               = "m325";
+	desc             = "ATMEGA325";
+	signature        = 0x1e 0x95 0x05;
+	has_jtag         = yes;
 #   stk500_devcode   = 0x??; # No STK500v1 support?
 #   avr910_devcode   = 0x??; # Try the ATmega16 one
-    avr910_devcode   = 0x74;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	avr910_devcode   = 0x74;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    timeout             = 200;
-    stabdelay           = 100;
-    cmdexedelay         = 25;
-    synchloops          = 32;
-    bytedelay           = 0;
-    pollindex           = 3;
-    pollvalue           = 0x53;
-    predelay            = 1;
-    postdelay           = 1;
-    pollmethod          = 1;
+	timeout             = 200;
+	stabdelay           = 100;
+	cmdexedelay         = 25;
+	synchloops          = 32;
+	bytedelay           = 0;
+	pollindex           = 3;
+	pollvalue           = 0x53;
+	predelay            = 1;
+	postdelay           = 1;
+	pollmethod          = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_lo     = "  1   1   0   0      0   0   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  1   1   0   0      0   0   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2   0   0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2   0   0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 4;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 4;
+		readsize        = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 128;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 128;
+		readsize        = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
-                          "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
+						  "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 #------------------------------------------------------------
@@ -13374,188 +13374,188 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m645";
-    desc             = "ATMEGA645";
-    signature        = 0x1E 0x96 0x05;
-    has_jtag         = yes;
+	id               = "m645";
+	desc             = "ATMEGA645";
+	signature        = 0x1E 0x96 0x05;
+	has_jtag         = yes;
 #   stk500_devcode   = 0x??; # No STK500v1 support?
 #   avr910_devcode   = 0x??; # Try the ATmega16 one
-    avr910_devcode   = 0x74;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	avr910_devcode   = 0x74;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    timeout             = 200;
-    stabdelay           = 100;
-    cmdexedelay         = 25;
-    synchloops          = 32;
-    bytedelay           = 0;
-    pollindex           = 3;
-    pollvalue           = 0x53;
-    predelay            = 1;
-    postdelay           = 1;
-    pollmethod          = 1;
+	timeout             = 200;
+	stabdelay           = 100;
+	cmdexedelay         = 25;
+	synchloops          = 32;
+	bytedelay           = 0;
+	pollindex           = 3;
+	pollvalue           = 0x53;
+	predelay            = 1;
+	postdelay           = 1;
+	pollmethod          = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_lo     = "  1   1   0   0      0   0   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  1   1   0   0      0   0   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3   0   0   0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3   0   0   0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 8;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 8;
+		readsize        = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "   0   0   1   0      0   0   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "   0   0   1   0      0   0   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   o   o   o   o      o   o   o   o";
 
-        read_hi         = "   0   0   1   0      1   0   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   o   o   o   o      o   o   o   o";
+		read_hi         = "   0   0   1   0      1   0   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          "  a7 a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  "  a7 a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          "  a7 a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  "  a7 a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "   0   1   0   0      1   1   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   0   0   0   0      0   0   0   0";
+		writepage       = "   0   1   0   0      1   1   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   0   0   0   0      0   0   0   0";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 128;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 128;
+		readsize        = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
-                          "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
+						  "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 #------------------------------------------------------------
@@ -13563,188 +13563,188 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m3250";
-    desc             = "ATMEGA3250";
-    signature        = 0x1E 0x95 0x06;
-    has_jtag         = yes;
+	id               = "m3250";
+	desc             = "ATMEGA3250";
+	signature        = 0x1E 0x95 0x06;
+	has_jtag         = yes;
 #   stk500_devcode   = 0x??; # No STK500v1 support?
 #   avr910_devcode   = 0x??; # Try the ATmega16 one
-    avr910_devcode   = 0x74;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	avr910_devcode   = 0x74;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    timeout             = 200;
-    stabdelay           = 100;
-    cmdexedelay         = 25;
-    synchloops          = 32;
-    bytedelay           = 0;
-    pollindex           = 3;
-    pollvalue           = 0x53;
-    predelay            = 1;
-    postdelay           = 1;
-    pollmethod          = 1;
+	timeout             = 200;
+	stabdelay           = 100;
+	cmdexedelay         = 25;
+	synchloops          = 32;
+	bytedelay           = 0;
+	pollindex           = 3;
+	pollvalue           = 0x53;
+	predelay            = 1;
+	postdelay           = 1;
+	pollmethod          = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_lo     = "  1   1   0   0      0   0   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  1   1   0   0      0   0   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2   0   0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2   0   0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 4;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 4;
+		readsize        = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 128;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 128;
+		readsize        = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
-                          "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
+						  "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 #------------------------------------------------------------
@@ -13752,188 +13752,188 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m6450";
-    desc             = "ATMEGA6450";
-    signature        = 0x1E 0x96 0x06;
-    has_jtag         = yes;
+	id               = "m6450";
+	desc             = "ATMEGA6450";
+	signature        = 0x1E 0x96 0x06;
+	has_jtag         = yes;
 #   stk500_devcode   = 0x??; # No STK500v1 support?
 #   avr910_devcode   = 0x??; # Try the ATmega16 one
-    avr910_devcode   = 0x74;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	avr910_devcode   = 0x74;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    timeout             = 200;
-    stabdelay           = 100;
-    cmdexedelay         = 25;
-    synchloops          = 32;
-    bytedelay           = 0;
-    pollindex           = 3;
-    pollvalue           = 0x53;
-    predelay            = 1;
-    postdelay           = 1;
-    pollmethod          = 1;
+	timeout             = 200;
+	stabdelay           = 100;
+	cmdexedelay         = 25;
+	synchloops          = 32;
+	bytedelay           = 0;
+	pollindex           = 3;
+	pollvalue           = 0x53;
+	predelay            = 1;
+	postdelay           = 1;
+	pollmethod          = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_lo     = "  1   1   0   0      0   0   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  1   1   0   0      0   0   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3   0   0   0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3   0   0   0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 4;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 4;
+		readsize        = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "   0   0   1   0      0   0   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "   0   0   1   0      0   0   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   o   o   o   o      o   o   o   o";
 
-        read_hi         = "   0   0   1   0      1   0   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   o   o   o   o      o   o   o   o";
+		read_hi         = "   0   0   1   0      1   0   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          "  a7 a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  "  a7 a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          "  a7 a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  "  a7 a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "   0   1   0   0      1   1   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   0   0   0   0      0   0   0   0";
+		writepage       = "   0   1   0   0      1   1   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   0   0   0   0      0   0   0   0";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 128;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 128;
+		readsize        = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
-                          "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
+						  "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 #------------------------------------------------------------
@@ -13941,96 +13941,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x64a1";
-    desc	= "ATXMEGA64A1";
-    signature	= 0x1e 0x96 0x4e;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x64a1";
+	desc    = "ATXMEGA64A1";
+	signature   = 0x1e 0x96 0x4e;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00010000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00010000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00001000;
-        offset		= 0x0080f000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00001000;
+		offset      = 0x0080f000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00001000;
-        offset		= 0x00810000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00001000;
+		offset      = 0x00810000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00011000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00011000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14038,96 +14038,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x128a1";
-    desc	= "ATXMEGA128A1";
-    signature	= 0x1e 0x97 0x4c;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x128a1";
+	desc    = "ATXMEGA128A1";
+	signature   = 0x1e 0x97 0x4c;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00020000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00020000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0081e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0081e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00820000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00820000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00022000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00022000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14135,96 +14135,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x128a1d";
-    desc	= "ATXMEGA128A1REVD";
-    signature	= 0x1e 0x97 0x41;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x128a1d";
+	desc    = "ATXMEGA128A1REVD";
+	signature   = 0x1e 0x97 0x41;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00020000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00020000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0081e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0081e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00820000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00820000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00022000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00022000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14232,96 +14232,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x192a1";
-    desc	= "ATXMEGA192A1";
-    signature	= 0x1e 0x97 0x4e;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x192a1";
+	desc    = "ATXMEGA192A1";
+	signature   = 0x1e 0x97 0x4e;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00030000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00030000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0082e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0082e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00830000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00830000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00032000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00032000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14329,96 +14329,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x256a1";
-    desc	= "ATXMEGA256A1";
-    signature	= 0x1e 0x98 0x46;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x256a1";
+	desc    = "ATXMEGA256A1";
+	signature   = 0x1e 0x98 0x46;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x1000;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x1000;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00040000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00040000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0083e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0083e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00840000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00840000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00042000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00042000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14426,96 +14426,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x64a3";
-    desc	= "ATXMEGA64A3";
-    signature	= 0x1e 0x96 0x42;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x64a3";
+	desc    = "ATXMEGA64A3";
+	signature   = 0x1e 0x96 0x42;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00010000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00010000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00001000;
-        offset		= 0x0080f000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00001000;
+		offset      = 0x0080f000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00001000;
-        offset		= 0x00810000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00001000;
+		offset      = 0x00810000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00011000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00011000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14523,96 +14523,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x128a3";
-    desc	= "ATXMEGA128A3";
-    signature	= 0x1e 0x97 0x42;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x128a3";
+	desc    = "ATXMEGA128A3";
+	signature   = 0x1e 0x97 0x42;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00020000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00020000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0081e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0081e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00820000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00820000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00022000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00022000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14620,96 +14620,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x192a3";
-    desc	= "ATXMEGA192A3";
-    signature	= 0x1e 0x97 0x44;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x192a3";
+	desc    = "ATXMEGA192A3";
+	signature   = 0x1e 0x97 0x44;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00030000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00030000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0082e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0082e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00830000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00830000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00032000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00032000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14717,96 +14717,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x256a3";
-    desc	= "ATXMEGA256A3";
-    signature	= 0x1e 0x98 0x42;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x256a3";
+	desc    = "ATXMEGA256A3";
+	signature   = 0x1e 0x98 0x42;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x1000;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x1000;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00040000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00040000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0083e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0083e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00840000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00840000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00042000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00042000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14814,96 +14814,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x256a3b";
-    desc	= "ATXMEGA256A3B";
-    signature	= 0x1e 0x98 0x43;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x256a3b";
+	desc    = "ATXMEGA256A3B";
+	signature   = 0x1e 0x98 0x43;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x1000;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x1000;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00040000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00040000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0083e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0083e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00840000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00840000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00042000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00042000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14911,96 +14911,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x16a4";
-    desc	= "ATXMEGA16A4";
-    signature	= 0x1e 0x94 0x41;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x16a4";
+	desc    = "ATXMEGA16A4";
+	signature   = 0x1e 0x94 0x41;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0400;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0400;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00004000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00004000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00001000;
-        offset		= 0x00803000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00001000;
+		offset      = 0x00803000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00001000;
-        offset		= 0x00804000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00001000;
+		offset      = 0x00804000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00005000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00005000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -15008,96 +15008,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x32a4";
-    desc	= "ATXMEGA32A4";
-    signature	= 0x1e 0x95 0x41;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x32a4";
+	desc    = "ATXMEGA32A4";
+	signature   = 0x1e 0x95 0x41;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0400;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0400;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00008000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00008000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00001000;
-        offset		= 0x00807000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00001000;
+		offset      = 0x00807000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00001000;
-        offset		= 0x00808000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00001000;
+		offset      = 0x00808000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00009000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00009000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -15105,96 +15105,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x64a4";
-    desc	= "ATXMEGA64A4";
-    signature	= 0x1e 0x96 0x46;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x64a4";
+	desc    = "ATXMEGA64A4";
+	signature   = 0x1e 0x96 0x46;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00010000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00010000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00001000;
-        offset		= 0x0080f000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00001000;
+		offset      = 0x0080f000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00001000;
-        offset		= 0x00810000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00001000;
+		offset      = 0x00810000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00011000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00011000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -15202,96 +15202,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x128a4";
-    desc	= "ATXMEGA128A4";
-    signature	= 0x1e 0x97 0x46;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x128a4";
+	desc    = "ATXMEGA128A4";
+	signature   = 0x1e 0x97 0x46;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00020000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00020000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0081e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0081e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00820000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00820000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00022000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00022000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 
@@ -15300,20 +15300,20 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "ucr2";
-    desc	= "32UC3A0512";
-    signature	= 0xED 0xC0 0x3F;
-    has_jtag	= yes;
-    is_avr32    = yes;
+	id      = "ucr2";
+	desc    = "32UC3A0512";
+	signature   = 0xED 0xC0 0x3F;
+	has_jtag    = yes;
+	is_avr32    = yes;
 
-    memory "flash"
-        paged           = yes;
-        page_size		= 512;               # bytes
-        readsize		= 512;				 # bytes
-        num_pages       = 1024;              # could be set dynamicly
-        size			= 0x00080000;		 # could be set dynamicly
-        offset			= 0x80000000;
-    ;
+	memory "flash"
+		paged           = yes;
+		page_size       = 512;               # bytes
+		readsize        = 512;               # bytes
+		num_pages       = 1024;              # could be set dynamicly
+		size            = 0x00080000;        # could be set dynamicly
+		offset          = 0x80000000;
+	;
 ;
 
 #------------------------------------------------------------
@@ -15321,38 +15321,38 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "t4";
-    desc	= "ATtiny4";
-    signature	= 0x1e 0x8f 0x0a;
-    has_tpi	= yes;
+	id      = "t4";
+	desc    = "ATtiny4";
+	signature   = 0x1e 0x8f 0x0a;
+	has_tpi = yes;
 
-    memory "flash"
-        size		= 512;
-        offset		= 0x4000;
-        page_size	= 16;
-        blocksize	= 128;
-    ;
+	memory "flash"
+		size        = 512;
+		offset      = 0x4000;
+		page_size   = 16;
+		blocksize   = 128;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x3fc0;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x3fc0;
+	;
 
-    memory "fuse"
-        size		= 1;
-        offset		= 0x3f40;
-	blocksize	= 4;
-    ;
+	memory "fuse"
+		size        = 1;
+		offset      = 0x3f40;
+	blocksize   = 4;
+	;
 
-    memory "calibration"
-        size		= 1;
-        offset		= 0x3f80;
-    ;
+	memory "calibration"
+		size        = 1;
+		offset      = 0x3f80;
+	;
 
-    memory "lockbits"
-        size		= 1;
-        offset		= 0x3f00;
-    ;
+	memory "lockbits"
+		size        = 1;
+		offset      = 0x3f00;
+	;
 ;
 
 
@@ -15361,38 +15361,38 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "t5";
-    desc	= "ATtiny5";
-    signature	= 0x1e 0x8f 0x09;
-    has_tpi	= yes;
+	id      = "t5";
+	desc    = "ATtiny5";
+	signature   = 0x1e 0x8f 0x09;
+	has_tpi = yes;
 
-    memory "flash"
-        size		= 512;
-        offset		= 0x4000;
-        page_size	= 16;
-        blocksize	= 128;
-    ;
+	memory "flash"
+		size        = 512;
+		offset      = 0x4000;
+		page_size   = 16;
+		blocksize   = 128;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x3fc0;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x3fc0;
+	;
 
-    memory "fuse"
-        size		= 1;
-        offset		= 0x3f40;
-	blocksize	= 4;
-    ;
+	memory "fuse"
+		size        = 1;
+		offset      = 0x3f40;
+	blocksize   = 4;
+	;
 
-    memory "calibration"
-        size		= 1;
-        offset		= 0x3f80;
-    ;
+	memory "calibration"
+		size        = 1;
+		offset      = 0x3f80;
+	;
 
-    memory "lockbits"
-        size		= 1;
-        offset		= 0x3f00;
-    ;
+	memory "lockbits"
+		size        = 1;
+		offset      = 0x3f00;
+	;
 ;
 
 
@@ -15401,38 +15401,38 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "t8";
-    desc	= "ATtiny9";
-    signature	= 0x1e 0x90 0x08;
-    has_tpi	= yes;
+	id      = "t8";
+	desc    = "ATtiny9";
+	signature   = 0x1e 0x90 0x08;
+	has_tpi = yes;
 
-    memory "flash"
-        size		= 1024;
-        offset		= 0x4000;
-        page_size	= 16;
-        blocksize	= 128;
-    ;
+	memory "flash"
+		size        = 1024;
+		offset      = 0x4000;
+		page_size   = 16;
+		blocksize   = 128;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x3fc0;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x3fc0;
+	;
 
-    memory "fuse"
-        size		= 1;
-        offset		= 0x3f40;
-	blocksize	= 4;
-    ;
+	memory "fuse"
+		size        = 1;
+		offset      = 0x3f40;
+	blocksize   = 4;
+	;
 
-    memory "calibration"
-        size		= 1;
-        offset		= 0x3f80;
-    ;
+	memory "calibration"
+		size        = 1;
+		offset      = 0x3f80;
+	;
 
-    memory "lockbits"
-        size		= 1;
-        offset		= 0x3f00;
-    ;
+	memory "lockbits"
+		size        = 1;
+		offset      = 0x3f00;
+	;
 ;
 
 
@@ -15441,38 +15441,38 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "t10";
-    desc	= "ATtiny10";
-    signature	= 0x1e 0x90 0x03;
-    has_tpi	= yes;
+	id      = "t10";
+	desc    = "ATtiny10";
+	signature   = 0x1e 0x90 0x03;
+	has_tpi = yes;
 
-    memory "flash"
-        size		= 1024;
-        offset		= 0x4000;
-        page_size	= 16;
-        blocksize	= 128;
-    ;
+	memory "flash"
+		size        = 1024;
+		offset      = 0x4000;
+		page_size   = 16;
+		blocksize   = 128;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x3fc0;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x3fc0;
+	;
 
-    memory "fuse"
-        size		= 1;
-        offset		= 0x3f40;
-	blocksize	= 4;
-    ;
+	memory "fuse"
+		size        = 1;
+		offset      = 0x3f40;
+	blocksize   = 4;
+	;
 
-    memory "calibration"
-        size		= 1;
-        offset		= 0x3f80;
-    ;
+	memory "calibration"
+		size        = 1;
+		offset      = 0x3f80;
+	;
 
-    memory "lockbits"
-        size		= 1;
-        offset		= 0x3f00;
-    ;
+	memory "lockbits"
+		size        = 1;
+		offset      = 0x3f00;
+	;
 ;
 
 
diff --git a/buildroot/share/vscode/avrdude_macOS.conf b/buildroot/share/vscode/avrdude_macOS.conf
index 6147a2259a..c3235eed2b 100644
--- a/buildroot/share/vscode/avrdude_macOS.conf
+++ b/buildroot/share/vscode/avrdude_macOS.conf
@@ -240,8 +240,8 @@
 #define AT86RF401   0xD0
 
 #define AT89START   0xE0
-#define AT89S51	    0xE0
-#define AT89S52	    0xE1
+#define AT89S51     0xE0
+#define AT89S52     0xE1
 
 # The following table lists the devices in the original AVR910
 # appnote:
@@ -293,15 +293,15 @@
 # in the Internet.  These add the following codes (only devices that
 # actually exist are listed):
 
-# ATmega8515	0x3A
-# ATmega128	0x43
-# ATmega64	0x45
-# ATtiny26	0x5E
-# ATmega8535	0x69
-# ATmega32	0x72
-# ATmega16	0x74
-# ATmega8	0x76
-# ATmega169	0x78
+# ATmega8515    0x3A
+# ATmega128 0x43
+# ATmega64  0x45
+# ATtiny26  0x5E
+# ATmega8535    0x69
+# ATmega32  0x72
+# ATmega16  0x74
+# ATmega8   0x76
+# ATmega169 0x78
 
 #
 # Overall avrdude defaults
@@ -688,63 +688,63 @@ programmer
 # This is an HVSP-only device.
 
 part
-    id                  = "t11";
-    desc                = "ATtiny11";
-    stk500_devcode      = 0x11;
-    signature           = 0x1e 0x90 0x04;
-    chip_erase_delay    = 20000;
+	id                  = "t11";
+	desc                = "ATtiny11";
+	stk500_devcode      = 0x11;
+	signature           = 0x1e 0x90 0x04;
+	chip_erase_delay    = 20000;
 
-    timeout		= 200;
-    hvsp_controlstack     =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
-        0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
-        0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 50;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	timeout     = 200;
+	hvsp_controlstack     =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
+		0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
+		0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 50;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-    memory "eeprom"
-        size            = 64;
-	blocksize	= 64;
-	readsize	= 256;
-	delay		= 5;
-    ;
+	memory "eeprom"
+		size            = 64;
+	blocksize   = 64;
+	readsize    = 256;
+	delay       = 5;
+	;
 
-    memory "flash"
-        size            = 1024;
-	blocksize	= 128;
-	readsize	= 256;
-	delay		= 3;
-    ;
+	memory "flash"
+		size            = 1024;
+	blocksize   = 128;
+	readsize    = 256;
+	delay       = 3;
+	;
 
-    memory "signature"
-        size            = 3;
-    ;
+	memory "signature"
+		size            = 3;
+	;
 
-    memory "lock"
-        size            = 1;
-    ;
+	memory "lock"
+		size            = 1;
+	;
 
-    memory "calibration"
-        size            = 1;
-    ;
+	memory "calibration"
+		size            = 1;
+	;
 
-    memory "fuse"
-        size            = 1;
-    ;
+	memory "fuse"
+		size            = 1;
+	;
 ;
 
 #------------------------------------------------------------
@@ -752,132 +752,132 @@ part
 #------------------------------------------------------------
 
 part
-    id                  = "t12";
-    desc                = "ATtiny12";
-    stk500_devcode      = 0x12;
-    avr910_devcode      = 0x55;
-    signature           = 0x1e 0x90 0x05;
-    chip_erase_delay    = 20000;
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	id                  = "t12";
+	desc                = "ATtiny12";
+	stk500_devcode      = 0x12;
+	avr910_devcode      = 0x55;
+	signature           = 0x1e 0x90 0x05;
+	chip_erase_delay    = 20000;
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
-        0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
-        0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 50;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
+		0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
+		0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 50;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-    memory "eeprom"
-        size            = 64;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+	memory "eeprom"
+		size            = 64;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 8;
-	blocksize	= 64;
-	readsize	= 256;
-    ;
+	mode        = 0x04;
+	delay       = 8;
+	blocksize   = 64;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        size            = 1024;
-        min_write_delay = 4500;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0  0  1  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+	memory "flash"
+		size            = 1024;
+		min_write_delay = 4500;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0  0  1  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        read_hi         = "  0  0  1  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_hi         = "  0  0  1  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        write_lo        = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		write_lo        = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        write_hi        = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		write_hi        = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-	mode		= 0x04;
-	delay		= 5;
-	blocksize	= 128;
-	readsize	= 256;
-    ;
+	mode        = 0x04;
+	delay       = 5;
+	blocksize   = 128;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x o o x";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x o o x";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 i i 1",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 i i 1",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0  0  0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	;
 
-    memory "fuse"
-        size            = 1;
-        read            = "0  1  0  1   0  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    o o o o  o o o o";
+	memory "fuse"
+		size            = 1;
+		read            = "0  1  0  1   0  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    o o o o  o o o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 0 1 x  x x x x",
-                          "x  x  x  x   x  x  x  x    i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 0 1 x  x x x x",
+						  "x  x  x  x   x  x  x  x    i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	;
 ;
 
 #------------------------------------------------------------
@@ -885,170 +885,170 @@ part
 #------------------------------------------------------------
 
 part
-    id                  = "t13";
-    desc                = "ATtiny13";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x0E, 0x1E;
-     eeprom_instr  = 0xBB, 0xFE, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x0E, 0xB4, 0x0E, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
-    stk500_devcode      = 0x14;
-    signature           = 0x1e 0x90 0x07;
-    chip_erase_delay    = 4000;
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	id                  = "t13";
+	desc                = "ATtiny13";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x0E, 0x1E;
+	 eeprom_instr  = 0xBB, 0xFE, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x0E, 0xB4, 0x0E, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
+	stk500_devcode      = 0x14;
+	signature           = 0x1e 0x90 0x07;
+	chip_erase_delay    = 4000;
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack     =
+	hvsp_controlstack     =
 	0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 90;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 90;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-    memory "eeprom"
-        size            = 64;
-        page_size       = 4;
-        min_write_delay = 4000;
-        max_write_delay = 4000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+	memory "eeprom"
+		size            = 64;
+		page_size       = 4;
+		min_write_delay = 4000;
+		max_write_delay = 4000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x   x  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        paged           = yes;
-        size            = 1024;
-        page_size       = 32;
-        num_pages       = 32;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0  0  1  0   0  0  0  0",
-                          "  0  0  0  0   0  0  0 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+	memory "flash"
+		paged           = yes;
+		size            = 1024;
+		page_size       = 32;
+		num_pages       = 32;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0  0  1  0   0  0  0  0",
+						  "  0  0  0  0   0  0  0 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        read_hi         = "  0  0  1  0   1  0  0  0",
-                          "  0  0  0  0   0  0  0 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_hi         = "  0  0  1  0   1  0  0  0",
+						  "  0  0  0  0   0  0  0 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        loadpage_lo     = "  0  1  0  0   0  0  0  0",
-                          "  0  0  0  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_lo     = "  0  1  0  0   0  0  0  0",
+						  "  0  0  0  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        loadpage_hi     = "  0  1  0  0   1  0  0  0",
-                          "  0  0  0  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_hi     = "  0  1  0  0   1  0  0  0",
+						  "  0  0  0  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        writepage       = "  0  1  0  0   1  1  0  0",
-                          "  0  0  0  0   0  0  0 a8",
-                          " a7 a6 a5 a4   x  x  x  x",
-                          "  x  x  x  x   x  x  x  x";
+		writepage       = "  0  1  0  0   1  1  0  0",
+						  "  0  0  0  0   0  0  0 a8",
+						  " a7 a6 a5 a4   x  x  x  x",
+						  "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    0 0 0 x  x x x x",
-                          "x  x  x  x   x  x a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    0 0 0 x  x x x x",
+						  "x  x  x  x   x  x a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
 
 	read            = "0  1  0  1   1  0  0  0    0 0 0 0  0 0 0 0",
-                          "x  x  x  x   x  x  x  x    x x o o  o o o o";
+						  "x  x  x  x   x  x  x  x    x x o o  o o o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 x  x x x x",
-                          "x  x  x  x   x  x  x  x    1 1 i i  i i i i";
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 x  x x x x",
+						  "x  x  x  x   x  x  x  x    1 1 i i  i i i i";
+	;
 
-    memory "calibration"
-        size            = 2;
-        read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                          "0  0  0  0   0  0  0 a0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 2;
+		read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						  "0  0  0  0   0  0  0 a0    o o o o  o o o o";
+	;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+	  ;
 
 ;
 
@@ -1058,132 +1058,132 @@ part
 #------------------------------------------------------------
 
 part
-    id                  = "t15";
-    desc                = "ATtiny15";
-    stk500_devcode      = 0x13;
-    avr910_devcode      = 0x56;
-    signature           = 0x1e 0x90 0x06;
-    chip_erase_delay    = 8200;
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	id                  = "t15";
+	desc                = "ATtiny15";
+	stk500_devcode      = 0x13;
+	avr910_devcode      = 0x56;
+	signature           = 0x1e 0x90 0x06;
+	chip_erase_delay    = 8200;
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
-        0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
-        0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 5;
-    synchcycles         = 6;
-    latchcycles         = 16;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 50;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
+		0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
+		0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 5;
+	synchcycles         = 6;
+	latchcycles         = 16;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 50;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-    memory "eeprom"
-        size            = 64;
-        min_write_delay = 8200;
-        max_write_delay = 8200;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+	memory "eeprom"
+		size            = 64;
+		min_write_delay = 8200;
+		max_write_delay = 8200;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
-                          "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
+						  "x  x a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 64;
-	readsize	= 256;
-    ;
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 64;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        size            = 1024;
-        min_write_delay = 4100;
-        max_write_delay = 4100;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0  0  1  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+	memory "flash"
+		size            = 1024;
+		min_write_delay = 4100;
+		max_write_delay = 4100;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0  0  1  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        read_hi         = "  0  0  1  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_hi         = "  0  0  1  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        write_lo        = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		write_lo        = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        write_hi        = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		write_hi        = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-	mode		= 0x04;
-	delay		= 5;
-	blocksize	= 128;
-	readsize	= 256;
-    ;
+	mode        = 0x04;
+	delay       = 5;
+	blocksize   = 128;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x o o x";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x o o x";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 i i 1",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 i i 1",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0  0  0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	;
 
-    memory "fuse"
-        size            = 1;
-        read            = "0  1  0  1   0  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    o o o o  x x o o";
+	memory "fuse"
+		size            = 1;
+		read            = "0  1  0  1   0  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    o o o o  x x o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 0 1 x  x x x x",
-                          "x  x  x  x   x  x  x  x    i i i i  1 1 i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 0 1 x  x x x x",
+						  "x  x  x  x   x  x  x  x    i i i i  1 1 i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	;
 ;
 
 #------------------------------------------------------------
@@ -1191,114 +1191,114 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "1200";
-    desc             = "AT90S1200";
-    stk500_devcode   = 0x33;
-    avr910_devcode   = 0x13;
-    signature        = 0x1e 0x90 0x01;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "1200";
+	desc             = "AT90S1200";
+	stk500_devcode   = 0x33;
+	avr910_devcode   = 0x13;
+	signature        = 0x1e 0x90 0x01;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 1;
-    bytedelay		= 0;
-    pollindex		= 0;
-    pollvalue		= 0xFF;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 1;
+	bytedelay       = 0;
+	pollindex       = 0;
+	pollvalue       = 0xFF;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 64;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = "1 0  1  0   0  0  0  0   x x x x  x x x x",
-                          "x x a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 64;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = "1 0  1  0   0  0  0  0   x x x x  x x x x",
+						  "x x a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = "1 1  0  0   0  0  0  0   x x x x  x x x x",
-                          "x x a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = "1 1  0  0   0  0  0  0   x x x x  x x x x",
+						  "x x a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 20;
-	blocksize	= 32;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 1024;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x   x   x  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 20;
+	blocksize   = 32;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 1024;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x   x   x  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x   x   x  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x   x   x  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x   x   x  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x   x   x  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x   x   x  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x   x   x  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x02;
-	delay		= 15;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-      ;
-    memory "lock"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
+	mode        = 0x02;
+	delay       = 15;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+	  ;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -1306,112 +1306,112 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "4414";
-    desc             = "AT90S4414";
-    stk500_devcode   = 0x50;
-    avr910_devcode   = 0x28;
-    signature        = 0x1e 0x92 0x01;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "4414";
+	desc             = "AT90S4414";
+	stk500_devcode   = 0x50;
+	avr910_devcode   = 0x28;
+	signature        = 0x1e 0x92 0x01;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 256;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x80;
-        readback_p2     = 0x7f;
-        read            = " 1  0  1  0   0  0  0  0  x x x x  x x x a8",
-                          "a7 a6 a5 a4 a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 256;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x80;
+		readback_p2     = 0x7f;
+		read            = " 1  0  1  0   0  0  0  0  x x x x  x x x a8",
+						  "a7 a6 a5 a4 a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x7f;
-        readback_p2     = 0x7f;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x7f;
+		readback_p2     = 0x7f;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-	size		= 1;
-      ;
-    memory "lock"
-	size		= 1;
-	write		= "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+	size        = 1;
+	  ;
+	memory "lock"
+	size        = 1;
+	write       = "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
 			  "x  x  x  x   x  x  x  x   x  x  x  x   x  x  x  x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -1419,112 +1419,112 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "2313";
-    desc             = "AT90S2313";
-    stk500_devcode   = 0x40;
-    avr910_devcode   = 0x20;
-    signature        = 0x1e 0x91 0x01;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "2313";
+	desc             = "AT90S2313";
+	stk500_devcode   = 0x40;
+	avr910_devcode   = 0x20;
+	signature        = 0x1e 0x91 0x01;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 128;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x80;
-        readback_p2     = 0x7f;
-        read            = "1  0  1  0   0  0  0  0   x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 128;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x80;
+		readback_p2     = 0x7f;
+		read            = "1  0  1  0   0  0  0  0   x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0   x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0   x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 2048;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x7f;
-        readback_p2     = 0x7f;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 2048;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x7f;
+		readback_p2     = 0x7f;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-      ;
-    memory "lock"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 1 1 x  x i i x",
-                          "x x x x  x x x x  x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+	  ;
+	memory "lock"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 1 1 x  x i i x",
+						  "x x x x  x x x x  x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -1532,126 +1532,126 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "2333";
+	id               = "2333";
 ##### WARNING: No XML file for device 'AT90S2333'! #####
-    desc             = "AT90S2333";
-    stk500_devcode   = 0x42;
-    avr910_devcode   = 0x34;
-    signature        = 0x1e 0x91 0x05;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	desc             = "AT90S2333";
+	stk500_devcode   = 0x42;
+	avr910_devcode   = 0x34;
+	signature        = 0x1e 0x91 0x05;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 128;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0   x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 128;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0   x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0   x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0   x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	memory "flash"
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        pwroff_after_write = yes;
-        read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		pwroff_after_write = yes;
+		read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
-    memory "lock"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x x x  x o o x";
+		write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x x x  x o o x";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
   ;
 
 
@@ -1660,122 +1660,122 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "2343";
-    desc             = "AT90S2343";
-    stk500_devcode   = 0x43;
-    avr910_devcode   = 0x4c;
-    signature        = 0x1e 0x91 0x03;
-    chip_erase_delay = 18000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "2343";
+	desc             = "AT90S2343";
+	stk500_devcode   = 0x43;
+	avr910_devcode   = 0x4c;
+	signature        = 0x1e 0x91 0x03;
+	chip_erase_delay = 18000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
-        0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
-        0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 0;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 50;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x00,
+		0x68, 0x78, 0x68, 0x68, 0x00, 0x00, 0x68, 0x78,
+		0x78, 0x00, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 0;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 50;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-    memory "eeprom"
-        size            = 128;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0   0 0 0 0  0 0 0 0",
-                          "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 128;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0   0 0 0 0  0 0 0 0",
+						  "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0   0 0 0 0  0 0 0 0",
-                          "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0   0 0 0 0  0 0 0 0",
+						  "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x   x  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x   x  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 128;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   o o o x  x x x o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 128;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   o o o x  x x x o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 1  1 1 1 i",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
-    memory "lock"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   o o o x  x x x o";
+		write           = "1 0 1 0  1 1 0 0   1 0 1 1  1 1 1 i",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   o o o x  x x x o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
   ;
 
 
@@ -1784,123 +1784,123 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "4433";
-    desc             = "AT90S4433";
-    stk500_devcode   = 0x51;
-    avr910_devcode   = 0x30;
-    signature        = 0x1e 0x92 0x03;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "4433";
+	desc             = "AT90S4433";
+	stk500_devcode   = 0x51;
+	avr910_devcode   = 0x30;
+	signature        = 0x1e 0x92 0x03;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 256;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = " 1  0  1  0   0  0  0  0   x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 256;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = " 1  0  1  0   0  0  0  0   x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0   x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = " 1  1  0  0   0  0  0  0   x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        pwroff_after_write = yes;
-        read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x o o  o o o o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		pwroff_after_write = yes;
+		read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
-    memory "lock"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x x x  x o o x";
+		write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x x x  x o o x";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -1908,82 +1908,82 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "4434";
+	id               = "4434";
 ##### WARNING: No XML file for device 'AT90S4434'! #####
-    desc             = "AT90S4434";
-    stk500_devcode   = 0x52;
-    avr910_devcode   = 0x6c;
-    signature        = 0x1e 0x92 0x02;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	desc             = "AT90S4434";
+	stk500_devcode   = 0x52;
+	avr910_devcode   = 0x6c;
+	signature        = 0x1e 0x92 0x02;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    memory "eeprom"
-        size            = 256;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = " 1  0  1  0   0  0  0  0   x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 256;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = " 1  0  1  0   0  0  0  0   x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0   x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
-      ;
-    memory "flash"
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		write           = " 1  1  0  0   0  0  0  0   x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+	  ;
+	memory "flash"
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x    x a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x o o  o o o o";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x    x a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
-    memory "lock"
-        size            = 1;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x x x  x o o x";
+		write           = "1 0 1 0  1 1 0 0   1 0 1 i  i i i i",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x x x  x o o x";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -1991,113 +1991,113 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "8515";
-    desc             = "AT90S8515";
-    stk500_devcode   = 0x60;
-    avr910_devcode   = 0x38;
-    signature        = 0x1e 0x93 0x01;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "8515";
+	desc             = "AT90S8515";
+	stk500_devcode   = 0x60;
+	avr910_devcode   = 0x38;
+	signature        = 0x1e 0x93 0x01;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 512;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x80;
-        readback_p2     = 0x7f;
-        read            = " 1  0  1  0   0  0  0  0  x x x x  x x x a8",
-                          "a7 a6 a5 a4 a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 512;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x80;
+		readback_p2     = 0x7f;
+		read            = " 1  0  1  0   0  0  0  0  x x x x  x x x a8",
+						  "a7 a6 a5 a4 a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 8192;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x7f;
-        readback_p2     = 0x7f;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 8192;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x7f;
+		readback_p2     = 0x7f;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-	size		= 1;
-      ;
-    memory "lock"
-	size		= 1;
-	write		= "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+	size        = 1;
+	  ;
+	memory "lock"
+	size        = 1;
+	write       = "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
 			  "x  x  x  x   x  x  x  x   x  x  x  x   x  x  x  x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -2105,120 +2105,120 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "8535";
-    desc             = "AT90S8535";
-    stk500_devcode   = 0x61;
-    avr910_devcode   = 0x68;
-    signature        = 0x1e 0x93 0x03;
-    chip_erase_delay = 20000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "8535";
+	desc             = "AT90S8535";
+	stk500_devcode   = 0x61;
+	avr910_devcode   = 0x68;
+	signature        = 0x1e 0x93 0x03;
+	chip_erase_delay = 20000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 1;
 
-    memory "eeprom"
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0x00;
-        readback_p2     = 0xff;
-        read            = " 1  0  1  0   0  0  0  0   x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	memory "eeprom"
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0x00;
+		readback_p2     = 0xff;
+		read            = " 1  0  1  0   0  0  0  0   x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		write           = " 1  1  0  0   0  0  0  0   x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        size            = 8192;
-        min_write_delay = 9000;
-        max_write_delay = 20000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		size            = 8192;
+		min_write_delay = 9000;
+		max_write_delay = 20000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        write_lo        = "  0   1   0   0    0   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_lo        = "  0   1   0   0    0   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-        write_hi        = "  0   1   0   0    1   0   0   0",
-                          "  x   x   x   x  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  i   i   i   i    i   i   i   i";
+		write_hi        = "  0   1   0   0    1   0   0   0",
+						  "  x   x   x   x  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  i   i   i   i    i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "fuse"
-	size		= 1;
-	read		= "0  1  0  1   1  0  0  0   x  x  x  x   x  x  x  x",
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "fuse"
+	size        = 1;
+	read        = "0  1  0  1   1  0  0  0   x  x  x  x   x  x  x  x",
 			  "x  x  x  x   x  x  x  x   x  x  x  x   x  x  x  o";
-	write		= "1  0  1  0   1  1  0  0   1  0  1  1   1  1  1  i",
+	write       = "1  0  1  0   1  1  0  0   1  0  1  1   1  1  1  i",
 			  "x  x  x  x   x  x  x  x   x  x  x  x   x  x  x  x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
-    memory "lock"
-	size		= 1;
-	read		= "0  1  0  1   1  0  0  0   x  x  x  x   x  x  x  x",
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
+	memory "lock"
+	size        = 1;
+	read        = "0  1  0  1   1  0  0  0   x  x  x  x   x  x  x  x",
 			  "x  x  x  x   x  x  x  x   o  o  x  x   x  x  x  x";
-	write		= "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
+	write       = "1  0  1  0   1  1  0  0   1  1  1  1   1  i  i  1",
 			  "x  x  x  x   x  x  x  x   x  x  x  x   x  x  x  x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -2226,138 +2226,138 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m103";
-    desc             = "ATMEGA103";
-    stk500_devcode   = 0xB1;
-    avr910_devcode   = 0x41;
-    signature        = 0x1e 0x97 0x01;
-    chip_erase_delay = 112000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m103";
+	desc             = "ATMEGA103";
+	stk500_devcode   = 0xB1;
+	avr910_devcode   = 0x41;
+	signature        = 0x1e 0x97 0x01;
+	chip_erase_delay = 112000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x8E, 0x9E, 0x2E, 0x3E, 0xAE, 0xBE,
-        0x4E, 0x5E, 0xCE, 0xDE, 0x6E, 0x7E, 0xEE, 0xDE,
-        0x66, 0x76, 0xE6, 0xF6, 0x6A, 0x7A, 0xEA, 0x7A,
-        0x7F, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 15;
-    chiperasepolltimeout = 0;
-    programfusepulsewidth = 2;
-    programfusepolltimeout = 0;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 10;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x8E, 0x9E, 0x2E, 0x3E, 0xAE, 0xBE,
+		0x4E, 0x5E, 0xCE, 0xDE, 0x6E, 0x7E, 0xEE, 0xDE,
+		0x66, 0x76, 0xE6, 0xF6, 0x6A, 0x7A, 0xEA, 0x7A,
+		0x7F, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 15;
+	chiperasepolltimeout = 0;
+	programfusepulsewidth = 2;
+	programfusepolltimeout = 0;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 10;
 
-    memory "eeprom"
-        size            = 4096;
-        min_write_delay = 4000;
-        max_write_delay = 9000;
-        readback_p1     = 0x80;
-        readback_p2     = 0x7f;
+	memory "eeprom"
+		size            = 4096;
+		min_write_delay = 4000;
+		max_write_delay = 9000;
+		readback_p1     = 0x80;
+		readback_p2     = 0x7f;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 22000;
-        max_write_delay = 56000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 22000;
+		max_write_delay = 56000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x11;
-	delay		= 70;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x11;
+	delay       = 70;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "fuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0  x x x x  x x x x",
-                          "x x x x  x x x x  x x o x  o 1 o o";
+	memory "fuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0  x x x x  x x x x",
+						  "x x x x  x x x x  x x o x  o 1 o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 1  i 1 i i",
-                          "x x x x  x x x x  x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 1  i 1 i i",
+						  "x x x x  x x x x  x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x x x x  x o o x";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x x x x  x o o x";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
-                          "x x x x  x x x x   x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 1  1 i i 1",
+						  "x x x x  x x x x   x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -2366,177 +2366,177 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m64";
-    desc             = "ATMEGA64";
-    has_jtag         = yes;
-    stk500_devcode   = 0xA0;
-    avr910_devcode   = 0x45;
-    signature        = 0x1e 0x96 0x02;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m64";
+	desc             = "ATMEGA64";
+	has_jtag         = yes;
+	stk500_devcode   = 0xA0;
+	avr910_devcode   = 0x45;
+	signature        = 0x1e 0x96 0x02;
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x22;
-    spmcr               = 0x68;
-    allowfullpagebitstream = yes;
+	idr                 = 0x22;
+	spmcr               = 0x68;
+	allowfullpagebitstream = yes;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 20;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 20;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x x i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x x i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -2547,177 +2547,177 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m128";
-    desc             = "ATMEGA128";
-    has_jtag         = yes;
-    stk500_devcode   = 0xB2;
-    avr910_devcode   = 0x43;
-    signature        = 0x1e 0x97 0x02;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m128";
+	desc             = "ATMEGA128";
+	has_jtag         = yes;
+	stk500_devcode   = 0xB2;
+	avr910_devcode   = 0x43;
+	signature        = 0x1e 0x97 0x02;
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x22;
-    spmcr               = 0x68;
-    rampz               = 0x3b;
-    allowfullpagebitstream = yes;
+	idr                 = 0x22;
+	spmcr               = 0x68;
+	rampz               = 0x3b;
+	allowfullpagebitstream = yes;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 12;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 12;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x x i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x x i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -2725,189 +2725,189 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "c128";
-    desc             = "AT90CAN128";
-    has_jtag         = yes;
-    stk500_devcode   = 0xB3;
+	id               = "c128";
+	desc             = "AT90CAN128";
+	has_jtag         = yes;
+	stk500_devcode   = 0xB3;
 #    avr910_devcode   = 0x43;
-    signature        = 0x1e 0x97 0x81;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x97 0x81;
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    eecr                = 0x3f;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	eecr                = 0x3f;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -2915,189 +2915,189 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "c64";
-    desc             = "AT90CAN64";
-    has_jtag         = yes;
-    stk500_devcode   = 0xB3;
+	id               = "c64";
+	desc             = "AT90CAN64";
+	has_jtag         = yes;
+	stk500_devcode   = 0xB3;
 #    avr910_devcode   = 0x43;
-    signature        = 0x1e 0x96 0x81;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x96 0x81;
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    eecr                = 0x3f;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	eecr                = 0x3f;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -3105,189 +3105,189 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "c32";
-    desc             = "AT90CAN32";
-    has_jtag         = yes;
-    stk500_devcode   = 0xB3;
+	id               = "c32";
+	desc             = "AT90CAN32";
+	has_jtag         = yes;
+	stk500_devcode   = 0xB3;
 #    avr910_devcode   = 0x43;
-    signature        = 0x1e 0x95 0x81;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x95 0x81;
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    eecr                = 0x3f;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	eecr                = 0x3f;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 256;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 256;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0  0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -3296,174 +3296,174 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m16";
-    desc             = "ATMEGA16";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82;
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x94 0x03;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m16";
+	desc             = "ATMEGA16";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82;
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x94 0x03;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 100;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 100;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = yes;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = yes;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
-    memory "calibration"
-        size            = 4;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
+	memory "calibration"
+		size            = 4;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 a1 a0 o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 a1 a0 o o o o  o o o o";
+		;
   ;
 
 
@@ -3474,187 +3474,187 @@ part
 # close to ATmega16
 
 part
-    id               = "m164p";
-    desc             = "ATMEGA164P";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x94 0x0a;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m164p";
+	desc             = "ATMEGA164P";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x94 0x0a;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 
@@ -3665,187 +3665,187 @@ part
 # similar to ATmega164P
 
 part
-    id               = "m324p";
-    desc             = "ATMEGA324P";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x95 0x08;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m324p";
+	desc             = "ATMEGA324P";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x95 0x08;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 
@@ -3856,187 +3856,187 @@ part
 # similar to ATmega164
 
 part
-    id               = "m644";
-    desc             = "ATMEGA644";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x96 0x09;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m644";
+	desc             = "ATMEGA644";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x96 0x09;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 #------------------------------------------------------------
@@ -4046,187 +4046,187 @@ part
 # similar to ATmega164p
 
 part
-    id               = "m644p";
-    desc             = "ATMEGA644P";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x96 0x0a;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m644p";
+	desc             = "ATMEGA644P";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x96 0x0a;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 
@@ -4238,187 +4238,187 @@ part
 # similar to ATmega164p
 
 part
-    id               = "m1284p";
-    desc             = "ATMEGA1284P";
-    has_jtag         = yes;
-    stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
-    avr910_devcode   = 0x74;
-    signature        = 0x1e 0x97 0x05;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m1284p";
+	desc             = "ATMEGA1284P";
+	has_jtag         = yes;
+	stk500_devcode   = 0x82; # no STK500v1 support, use the ATmega16 one
+	avr910_devcode   = 0x74;
+	signature        = 0x1e 0x97 0x05;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 
@@ -4428,193 +4428,193 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m162";
-    desc             = "ATMEGA162";
-    has_jtag         = yes;
-    stk500_devcode   = 0x83;
-    avr910_devcode   = 0x63;
-    signature        = 0x1e 0x94 0x04;
-    chip_erase_delay = 9000;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
+	id               = "m162";
+	desc             = "ATMEGA162";
+	has_jtag         = yes;
+	stk500_devcode   = 0x83;
+	avr910_devcode   = 0x63;
+	signature        = 0x1e 0x94 0x04;
+	chip_erase_delay = 9000;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
 
-    idr              = 0x04;
-    spmcr            = 0x57;
-    allowfullpagebitstream = yes;
+	idr              = 0x04;
+	spmcr            = 0x57;
+	allowfullpagebitstream = yes;
 
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
-       mode        = 0x41;
-    delay       = 10;
-    blocksize   = 128;
-    readsize    = 256;
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
+	   mode        = 0x41;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
 
-        ;
+		;
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-                read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+				read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-                write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+				write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 4;
-	readsize	= 256;
-        ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 4;
+	readsize    = 256;
+		;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 16000;
-        max_write_delay = 16000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 16000;
+		max_write_delay = 16000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 16000;
-        max_write_delay = 16000;
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 16000;
+		max_write_delay = 16000;
 
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-        ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+		;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 16000;
-        max_write_delay = 16000;
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 16000;
+		max_write_delay = 16000;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  1 1 1 1  1 i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  1 1 1 1  1 i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 16000;
-        max_write_delay = 16000;
+	memory "lock"
+		size            = 1;
+		min_write_delay = 16000;
+		max_write_delay = 16000;
 
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		;
 
-    memory "signature"
-        size            = 3;
+	memory "signature"
+		size            = 3;
 
-        read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-        ;
+		read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+		;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 x x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 x x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
 ;
 
 
@@ -4624,157 +4624,157 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m163";
-    desc             = "ATMEGA163";
-    stk500_devcode   = 0x81;
-    avr910_devcode   = 0x64;
-    signature        = 0x1e 0x94 0x02;
-    chip_erase_delay = 32000;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m163";
+	desc             = "ATMEGA163";
+	stk500_devcode   = 0x81;
+	avr910_devcode   = 0x64;
+	signature        = 0x1e 0x94 0x02;
+	chip_erase_delay = 32000;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout             = 200;
-    stabdelay           = 100;
-    cmdexedelay         = 25;
-    synchloops          = 32;
-    bytedelay           = 0;
-    pollindex           = 3;
-    pollvalue           = 0x53;
-    predelay            = 1;
-    postdelay           = 1;
-    pollmethod          = 0;
+	timeout             = 200;
+	stabdelay           = 100;
+	cmdexedelay         = 25;
+	synchloops          = 32;
+	bytedelay           = 0;
+	pollindex           = 3;
+	pollvalue           = 0x53;
+	predelay            = 1;
+	postdelay           = 1;
+	pollmethod          = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 30;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 2;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 2;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 30;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 2;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 2;
 
 
    memory "eeprom"
-        size            = 512;
-        min_write_delay = 4000;
-        max_write_delay = 4000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		size            = 512;
+		min_write_delay = 4000;
+		max_write_delay = 4000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
-        mode            = 0x41;
-        delay           = 20;
-        blocksize       = 4;
-        readsize        = 256;
-      ;
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
+		mode            = 0x41;
+		delay           = 20;
+		blocksize       = 4;
+		readsize        = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 16000;
-        max_write_delay = 16000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 16000;
+		max_write_delay = 16000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x11;
-	delay		= 20;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x11;
+	delay       = 20;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o x x  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o x x  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i 1 1  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i 1 1  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  1 o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  1 o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   1 1 1 1  1 i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   1 1 1 1  1 i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  0 x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  0 x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -4782,179 +4782,179 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m169";
-    desc             = "ATMEGA169";
-    has_jtag         = yes;
-    stk500_devcode   = 0x85;
-    avr910_devcode   = 0x78;
-    signature        = 0x1e 0x94 0x05;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m169";
+	desc             = "ATMEGA169";
+	has_jtag         = yes;
+	stk500_devcode   = 0x85;
+	avr910_devcode   = 0x78;
+	signature        = 0x1e 0x94 0x05;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 4;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 4;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -4962,182 +4962,182 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m329";
-    desc             = "ATMEGA329";
-    has_jtag         = yes;
+	id               = "m329";
+	desc             = "ATMEGA329";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x95 0x03;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x95 0x03;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -5146,182 +5146,182 @@ part
 # Identical to ATmega329 except of the signature
 
 part
-    id               = "m329p";
-    desc             = "ATMEGA329P";
-    has_jtag         = yes;
+	id               = "m329p";
+	desc             = "ATMEGA329P";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x95 0x0b;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x95 0x0b;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -5331,182 +5331,182 @@ part
 # identical to ATmega329
 
 part
-    id               = "m3290";
-    desc             = "ATMEGA3290";
-    has_jtag         = yes;
+	id               = "m3290";
+	desc             = "ATMEGA3290";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x95 0x04;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x95 0x04;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a3   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -5516,182 +5516,182 @@ part
 # identical to ATmega3290 except of the signature
 
 part
-    id               = "m3290p";
-    desc             = "ATMEGA3290P";
-    has_jtag         = yes;
+	id               = "m3290p";
+	desc             = "ATMEGA3290P";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x95 0x0c;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x95 0x0c;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a3   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -5699,182 +5699,182 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m649";
-    desc             = "ATMEGA649";
-    has_jtag         = yes;
+	id               = "m649";
+	desc             = "ATMEGA649";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x96 0x03;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x96 0x03;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -5884,192 +5884,192 @@ part
 # identical to ATmega649
 
 part
-    id               = "m6490";
-    desc             = "ATMEGA6490";
-    has_jtag         = yes;
+	id               = "m6490";
+	desc             = "ATMEGA6490";
+	has_jtag         = yes;
 #    stk500_devcode   = 0x85; # no STK500 support, only STK500v2
 #    avr910_devcode   = 0x?;  # try the ATmega169 one:
-    avr910_devcode   = 0x75;
-    signature        = 0x1e 0x96 0x04;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	avr910_devcode   = 0x75;
+	signature        = 0x1e 0x96 0x04;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
+	idr                 = 0x31;
+	spmcr               = 0x57;
 
    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -6077,174 +6077,174 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m32";
-    desc             = "ATMEGA32";
-    has_jtag         = yes;
-    stk500_devcode   = 0x91;
-    avr910_devcode   = 0x72;
-    signature        = 0x1e 0x95 0x02;
-    chip_erase_delay = 9000;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m32";
+	desc             = "ATMEGA32";
+	has_jtag         = yes;
+	stk500_devcode   = 0x91;
+	avr910_devcode   = 0x72;
+	signature        = 0x1e 0x95 0x02;
+	chip_erase_delay = 9000;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = yes;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = yes;
 
    memory "eeprom"
-        paged           = no;   /* leave this "no" */
-        page_size       = 4;    /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		paged           = no;   /* leave this "no" */
+		page_size       = 4;    /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x  a9  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o o";
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0 0 1 1  1 0 0 0    0 0 x x  x x x x",
-                          "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0 0 1 1  1 0 0 0    0 0 x x  x x x x",
+						  "0 0 0 0  0 0 a1 a0  o o o o  o o o o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -6252,138 +6252,138 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m161";
-    desc             = "ATMEGA161";
-    stk500_devcode   = 0x80;
-    avr910_devcode   = 0x60;
-    signature        = 0x1e 0x94 0x01;
-    chip_erase_delay = 28000;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m161";
+	desc             = "ATMEGA161";
+	stk500_devcode   = 0x80;
+	avr910_devcode   = 0x60;
+	signature        = 0x1e 0x94 0x01;
+	chip_erase_delay = 28000;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 0;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 30;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 2;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 2;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 0;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 30;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 2;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 2;
 
    memory "eeprom"
-        size            = 512;
-        min_write_delay = 3400;
-        max_write_delay = 3400;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+		size            = 512;
+		min_write_delay = 3400;
+		max_write_delay = 3400;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  x   x   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 5;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x04;
+	delay       = 5;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 14000;
-        max_write_delay = 14000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 14000;
+		max_write_delay = 14000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  x   x   x a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  x   x   x a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 16;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 16;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "fuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
-                          "x x x x  x x x x   x o x o  o o o o";
+	memory "fuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   x x x x  x x x x",
+						  "x x x x  x x x x   x o x o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 x  x x x x",
-                          "x x x x  x x x x   1 i 1 i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 x  x x x x",
+						  "x x x x  x x x x   1 i 1 i  i i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -6392,158 +6392,158 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m8";
-    desc             = "ATMEGA8";
-    stk500_devcode   = 0x70;
-    avr910_devcode   = 0x76;
-    signature        = 0x1e 0x93 0x07;
-    pagel            = 0xd7;
-    bs2              = 0xc2;
-    chip_erase_delay = 10000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m8";
+	desc             = "ATMEGA8";
+	stk500_devcode   = 0x70;
+	avr910_devcode   = 0x76;
+	signature        = 0x1e 0x93 0x07;
+	pagel            = 0xd7;
+	bs2              = 0xc2;
+	chip_erase_delay = 10000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 2;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 2;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        size            = 512;
-        page_size       = 4;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		size            = 512;
+		page_size       = 4;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 20;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 20;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 10;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 10;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0  0  1  1   1  0  0  0   0  0  x  x   x  x  x  x",
-                          "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0  0  1  1   1  0  0  0   0  0  x  x   x  x  x  x",
+						  "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -6553,154 +6553,154 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m8515";
-    desc             = "ATMEGA8515";
-    stk500_devcode   = 0x63;
-    avr910_devcode   = 0x3A;
-    signature        = 0x1e 0x93 0x06;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m8515";
+	desc             = "ATMEGA8515";
+	stk500_devcode   = 0x63;
+	avr910_devcode   = 0x3A;
+	signature        = 0x1e 0x93 0x06;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
  read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
  write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0 0 1 1  1 0 0 0     0 0 x x  x x x x",
-                          "0 0 0 0  0 0 a1 a0   o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0 0 1 1  1 0 0 0     0 0 x x  x x x x",
+						  "0 0 0 0  0 0 a1 a0   o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -6711,156 +6711,156 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m8535";
-    desc             = "ATMEGA8535";
-    stk500_devcode   = 0x64;
-    avr910_devcode   = 0x69;
-    signature        = 0x1e 0x93 0x08;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	id               = "m8535";
+	desc             = "ATMEGA8535";
+	stk500_devcode   = 0x64;
+	avr910_devcode   = 0x69;
+	signature        = 0x1e 0x93 0x08;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 6;
-    togglevtg           = 0;
-    poweroffdelay       = 0;
-    resetdelayms        = 0;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 6;
+	togglevtg           = 0;
+	poweroffdelay       = 0;
+	resetdelayms        = 0;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        size            = 512;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		size            = 512;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   x   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   x   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 2000;
-        max_write_delay = 2000;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 2000;
+		max_write_delay = 2000;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0 0 1 1  1 0 0 0   0 0 x x  x x x x",
-                          "0 0 0 0  0 0 a1 a0 o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 4;
+		read            = "0 0 1 1  1 0 0 0   0 0 x x  x x x x",
+						  "0 0 0 0  0 0 a1 a0 o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -6869,153 +6869,153 @@ part
 #------------------------------------------------------------
 
 part
-    id                  = "t26";
-    desc                = "ATTINY26";
-    stk500_devcode      = 0x21;
-    avr910_devcode      = 0x5e;
-    signature           = 0x1e 0x91 0x09;
-    pagel               = 0xb3;
-    bs2                 = 0xb2;
-    chip_erase_delay    = 9000;
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	id                  = "t26";
+	desc                = "ATTINY26";
+	stk500_devcode      = 0x21;
+	avr910_devcode      = 0x5e;
+	signature           = 0x1e 0x91 0x09;
+	pagel               = 0xb3;
+	bs2                 = 0xb2;
+	chip_erase_delay    = 9000;
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
-        0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
-        0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
-        0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 2;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
+		0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
+		0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
+		0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 2;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        size            = 128;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+	memory "eeprom"
+		size            = 128;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	mode		= 0x04;
-	delay		= 10;
-	blocksize	= 64;
-	readsize	= 256;
-    ;
+	mode        = 0x04;
+	delay       = 10;
+	blocksize   = 64;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        paged           = yes;
-        size            = 2048;
-        page_size       = 32;
-        num_pages       = 64;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0  0  1  0   0  0  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+	memory "flash"
+		paged           = yes;
+		size            = 2048;
+		page_size       = 32;
+		num_pages       = 64;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0  0  1  0   0  0  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        read_hi         = "  0  0  1  0   1  0  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_hi         = "  0  0  1  0   1  0  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        loadpage_lo     = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_lo     = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        loadpage_hi     = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_hi     = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        writepage       = "  0  1  0  0   1  1  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4   x  x  x  x",
-                          "  x  x  x  x   x  x  x  x";
+		writepage       = "  0  1  0  0   1  1  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4   x  x  x  x",
+						  "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x21;
-	delay		= 6;
-	blocksize	= 16;
-	readsize	= 256;
-    ;
+	mode        = 0x21;
+	delay       = 6;
+	blocksize   = 16;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x x o o";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x x o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  x x x i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  x x x i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  x x x o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  x x x o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 4;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 4;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
 ;
 
@@ -7026,185 +7026,185 @@ part
 # Close to ATtiny26
 
 part
-    id                  = "t261";
-    desc                = "ATTINY261";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x00, 0x10;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	id                  = "t261";
+	desc                = "ATTINY261";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x00, 0x10;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 #    stk500_devcode      = 0x21;
 #    avr910_devcode      = 0x5e;
-    signature           = 0x1e 0x91 0x0c;
-    pagel               = 0xb3;
-    bs2                 = 0xb2;
-    chip_erase_delay    = 4000;
+	signature           = 0x1e 0x91 0x0c;
+	pagel               = 0xb3;
+	bs2                 = 0xb2;
+	chip_erase_delay    = 4000;
 
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
-        0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
-        0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
-        0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 2;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
+		0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
+		0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
+		0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 2;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        size            = 128;
-        page_size       = 4;
-        num_pages       = 32;
-        min_write_delay = 4000;
-        max_write_delay = 4000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		size            = 128;
+		page_size       = 4;
+		num_pages       = 32;
+		min_write_delay = 4000;
+		max_write_delay = 4000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+		read            = "1  0  1  0   0  0  0  0    x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
-                          "x a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = "1  1  0  0   0  0  0  0    x x x x  x x x x",
+						  "x a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 4;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 4;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        paged           = yes;
-        size            = 2048;
-        page_size       = 32;
-        num_pages       = 64;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "flash"
+		paged           = yes;
+		size            = 2048;
+		page_size       = 32;
+		num_pages       = 64;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read_lo         = "  0  0  1  0   0  0  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_lo         = "  0  0  1  0   0  0  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        read_hi         = "  0  0  1  0   1  0  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4  a3 a2 a1 a0",
-                          "  o  o  o  o   o  o  o  o";
+		read_hi         = "  0  0  1  0   1  0  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4  a3 a2 a1 a0",
+						  "  o  o  o  o   o  o  o  o";
 
-        loadpage_lo     = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_lo     = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        loadpage_hi     = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x  x  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_hi     = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x  x  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        writepage       = "  0  1  0  0   1  1  0  0",
-                          "  x  x  x  x   x  x a9 a8",
-                          " a7 a6 a5 a4   x  x  x  x",
-                          "  x  x  x  x   x  x  x  x";
+		writepage       = "  0  1  0  0   1  1  0  0",
+						  "  x  x  x  x   x  x a9 a8",
+						  " a7 a6 a5 a4   x  x  x  x",
+						  "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x x o o";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x x o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x x x i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x x x i";
 
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x x x o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x x x o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0  0  0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	;
 
 ;
 
@@ -7215,185 +7215,185 @@ part
 # Close to ATtiny261
 
 part
-    id                  = "t461";
-    desc                = "ATTINY461";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x00, 0x10;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	id                  = "t461";
+	desc                = "ATTINY461";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x00, 0x10;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 #    stk500_devcode      = 0x21;
 #    avr910_devcode      = 0x5e;
-    signature           = 0x1e 0x92 0x08;
-    pagel               = 0xb3;
-    bs2                 = 0xb2;
-    chip_erase_delay    = 4000;
+	signature           = 0x1e 0x92 0x08;
+	pagel               = 0xb3;
+	bs2                 = 0xb2;
+	chip_erase_delay    = 4000;
 
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
-        0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
-        0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
-        0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 2;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
+		0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
+		0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
+		0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 2;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        size            = 256;
-        page_size       = 4;
-        num_pages       = 64;
-        min_write_delay = 4000;
-        max_write_delay = 4000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		size            = 256;
+		page_size       = 4;
+		num_pages       = 64;
+		min_write_delay = 4000;
+		max_write_delay = 4000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read            = " 1  0  1  0   0  0  0  0    x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
+		read            = " 1  0  1  0   0  0  0  0    x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0    o o o o  o o o o";
 
-        write           = " 1  1  0  0   0  0  0  0    x x x x  x x x x",
-                          "a7 a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
+		write           = " 1  1  0  0   0  0  0  0    x x x x  x x x x",
+						  "a7 a6 a5 a4  a3 a2 a1 a0    i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 4;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 4;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        paged           = yes;
-        size            = 4096;
-        page_size       = 64;
-        num_pages       = 64;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "flash"
+		paged           = yes;
+		size            = 4096;
+		page_size       = 64;
+		num_pages       = 64;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read_lo         = "  0  0  1  0   0   0  0  0",
-                          "  x  x  x  x   x a10 a9 a8",
-                          " a7 a6 a5 a4  a3  a2 a1 a0",
-                          "  o  o  o  o   o   o  o  o";
+		read_lo         = "  0  0  1  0   0   0  0  0",
+						  "  x  x  x  x   x a10 a9 a8",
+						  " a7 a6 a5 a4  a3  a2 a1 a0",
+						  "  o  o  o  o   o   o  o  o";
 
-        read_hi         = "  0  0  1  0   1   0  0  0",
-                          "  x  x  x  x   x a10 a9 a8",
-                          " a7 a6 a5 a4  a3  a2 a1 a0",
-                          "  o  o  o  o   o   o  o  o";
+		read_hi         = "  0  0  1  0   1   0  0  0",
+						  "  x  x  x  x   x a10 a9 a8",
+						  " a7 a6 a5 a4  a3  a2 a1 a0",
+						  "  o  o  o  o   o   o  o  o";
 
-        loadpage_lo     = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_lo     = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        loadpage_hi     = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_hi     = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        writepage       = "  0  1  0  0   1   1  0  0",
-                          "  x  x  x  x   x a10 a9 a8",
-                          " a7 a6 a5  x   x   x  x  x",
-                          "  x  x  x  x   x   x  x  x";
+		writepage       = "  0  1  0  0   1   1  0  0",
+						  "  x  x  x  x   x a10 a9 a8",
+						  " a7 a6 a5  x   x   x  x  x",
+						  "  x  x  x  x   x   x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x x o o";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x x o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x x x i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x x x i";
 
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x x x o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x x x o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0  0  0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	;
 
 ;
 
@@ -7404,185 +7404,185 @@ part
 # Close to ATtiny461
 
 part
-    id                  = "t861";
-    desc                = "ATTINY861";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x00, 0x10;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	id                  = "t861";
+	desc                = "ATTINY861";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x00, 0x10;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x00, 0xB4, 0x00, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 #    stk500_devcode      = 0x21;
 #    avr910_devcode      = 0x5e;
-    signature           = 0x1e 0x93 0x0d;
-    pagel               = 0xb3;
-    bs2                 = 0xb2;
-    chip_erase_delay    = 4000;
+	signature           = 0x1e 0x93 0x0d;
+	pagel               = 0xb3;
+	bs2                 = 0xb2;
+	chip_erase_delay    = 4000;
 
-    pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
-                          "x x x x  x x x x   x x x x  x x x x";
+	pgm_enable          = "1 0 1 0  1 1 0 0   0 1 0 1  0 0 1 1",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
-                          "x x x x  x x x x   x x x x  x x x x";
+	chip_erase          = "1 0 1 0  1 1 0 0   1 0 0 x  x x x x",
+						  "x x x x  x x x x   x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 0;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 0;
 
-    pp_controlstack     =
-        0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
-        0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
-        0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
-        0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 2;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0xC4, 0xE4, 0xC4, 0xE4, 0xCC, 0xEC, 0xCC, 0xEC,
+		0xD4, 0xF4, 0xD4, 0xF4, 0xDC, 0xFC, 0xDC, 0xFC,
+		0xC8, 0xE8, 0xD8, 0xF8, 0x4C, 0x6C, 0x5C, 0x7C,
+		0xEC, 0xBC, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 2;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        size            = 512;
-        num_pages       = 128;
-        page_size       = 4;
-        min_write_delay = 4000;
-        max_write_delay = 4000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		size            = 512;
+		num_pages       = 128;
+		page_size       = 4;
+		min_write_delay = 4000;
+		max_write_delay = 4000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read            = " 1  0  1  0   0  0  0  0    x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0    o o o o  o o o  o";
+		read            = " 1  0  1  0   0  0  0  0    x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0    o o o o  o o o  o";
 
-        write           = " 1  1  0  0   0  0  0  0    x x x x  x x x a8",
-                          "a7 a6 a5 a4  a3 a2 a1 a0    i i i i  i i i  i";
+		write           = " 1  1  0  0   0  0  0  0    x x x x  x x x a8",
+						  "a7 a6 a5 a4  a3 a2 a1 a0    i i i i  i i i  i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 4;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 4;
+	readsize    = 256;
+	;
 
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 
-        read_lo         = "  0  0  1  0   0   0  0  0",
-                          "  x  x  x  x a11 a10 a9 a8",
-                          " a7 a6 a5 a4  a3  a2 a1 a0",
-                          "  o  o  o  o   o   o  o  o";
+		read_lo         = "  0  0  1  0   0   0  0  0",
+						  "  x  x  x  x a11 a10 a9 a8",
+						  " a7 a6 a5 a4  a3  a2 a1 a0",
+						  "  o  o  o  o   o   o  o  o";
 
-        read_hi         = "  0  0  1  0   1   0  0  0",
-                          "  x  x  x  x a11 a10 a9 a8",
-                          " a7 a6 a5 a4  a3  a2 a1 a0",
-                          "  o  o  o  o   o   o  o  o";
+		read_hi         = "  0  0  1  0   1   0  0  0",
+						  "  x  x  x  x a11 a10 a9 a8",
+						  " a7 a6 a5 a4  a3  a2 a1 a0",
+						  "  o  o  o  o   o   o  o  o";
 
-        loadpage_lo     = "  0  1  0  0   0  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_lo     = "  0  1  0  0   0  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        loadpage_hi     = "  0  1  0  0   1  0  0  0",
-                          "  x  x  x  x   x  x  x  x",
-                          "  x  x  x a4  a3 a2 a1 a0",
-                          "  i  i  i  i   i  i  i  i";
+		loadpage_hi     = "  0  1  0  0   1  0  0  0",
+						  "  x  x  x  x   x  x  x  x",
+						  "  x  x  x a4  a3 a2 a1 a0",
+						  "  i  i  i  i   i  i  i  i";
 
-        writepage       = "  0  1  0  0   1   1  0  0",
-                          "  x  x  x  x a11 a10 a9 a8",
-                          " a7 a6 a5  x   x   x  x  x",
-                          "  x  x  x  x   x   x  x  x";
+		writepage       = "  0  1  0  0   1   1  0  0",
+						  "  x  x  x  x a11 a10 a9 a8",
+						  " a7 a6 a5  x   x   x  x  x",
+						  "  x  x  x  x   x   x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
-    ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0 a1 a0    o o o o  o o o o";
+	;
 
-    memory "lock"
-        size            = 1;
-        read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
-                          "x  x  x  x   x  x  x  x    x x x x  x x o o";
+	memory "lock"
+		size            = 1;
+		read            = "0  1  0  1   1  0  0  0    x x x x  x x x x",
+						  "x  x  x  x   x  x  x  x    x x x x  x x o o";
 
-        write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
-                          "x  x  x  x   x  x  x  x    x x x x  x x x x";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-    ;
+		write           = "1  0  1  0   1  1  0  0    1 1 1 1  1 1 i i",
+						  "x  x  x  x   x  x  x  x    x x x x  x x x x";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x x x i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x x x i";
 
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x x x o";
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-      ;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x x x o";
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
-                          "0  0  0  0   0  0  0  0    o o o o  o o o o";
-    ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0    x x x x  x x x x",
+						  "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	;
 
 ;
 
@@ -7592,185 +7592,185 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m48";
-    desc             = "ATMEGA48";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-    stk500_devcode   = 0x59;
+	id               = "m48";
+	desc             = "ATMEGA48";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	stk500_devcode   = 0x59;
 #    avr910_devcode   = 0x;
-    signature        = 0x1e 0x92 0x05;
-    pagel            = 0xd7;
-    bs2              = 0xc2;
-    chip_erase_delay = 45000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x92 0x05;
+	pagel            = 0xd7;
+	bs2              = 0xc2;
+	chip_erase_delay = 45000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        page_size       = 4;
-        size            = 256;
-        min_write_delay = 3600;
-        max_write_delay = 3600;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		page_size       = 4;
+		size            = 256;
+		min_write_delay = 3600;
+		max_write_delay = 3600;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x      x   x   x   x",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x      x   x   x   x",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 256;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 4096;
-        page_size       = 64;
-        num_pages       = 64;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0    0 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 4096;
+		page_size       = 64;
+		num_pages       = 64;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0    0 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0    0 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0    0 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x x x o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x x x o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x x x i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x x x i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
-                          "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
+						  "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -7779,185 +7779,185 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m88";
-    desc             = "ATMEGA88";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-    stk500_devcode   = 0x73;
+	id               = "m88";
+	desc             = "ATMEGA88";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	stk500_devcode   = 0x73;
 #    avr910_devcode   = 0x;
-    signature        = 0x1e 0x93 0x0a;
-    pagel            = 0xd7;
-    bs2              = 0xc2;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x93 0x0a;
+	pagel            = 0xd7;
+	bs2              = 0xc2;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        page_size       = 4;
-        size            = 512;
-        min_write_delay = 3600;
-        max_write_delay = 3600;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		page_size       = 4;
+		size            = 512;
+		min_write_delay = 3600;
+		max_write_delay = 3600;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x      x   x   x  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 256;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 256;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x i i i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
-                          "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
+						  "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -7965,187 +7965,187 @@ part
 #------------------------------------------------------------
 
 part
-    id              = "m168";
-    desc            = "ATMEGA168";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-    stk500_devcode  = 0x86;
-    # avr910_devcode = 0x;
-    signature       = 0x1e 0x94 0x06;
-    pagel           = 0xd7;
-    bs2             = 0xc2;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0 1 1 0 0 0 1 0 1 0 0 1 1",
-                       "x x x x x x x x x x x x x x x x";
+	id              = "m168";
+	desc            = "ATMEGA168";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	stk500_devcode  = 0x86;
+	# avr910_devcode = 0x;
+	signature       = 0x1e 0x94 0x06;
+	pagel           = 0xd7;
+	bs2             = 0xc2;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0 1 1 0 0 0 1 0 1 0 0 1 1",
+					   "x x x x x x x x x x x x x x x x";
 
-    chip_erase       = "1 0 1 0 1 1 0 0 1 0 0 x x x x x",
-                       "x x x x x x x x x x x x x x x x";
+	chip_erase       = "1 0 1 0 1 1 0 0 1 0 0 x x x x x",
+					   "x x x x x x x x x x x x x x x x";
 
-    timeout         = 200;
-    stabdelay       = 100;
-    cmdexedelay     = 25;
-    synchloops      = 32;
-    bytedelay       = 0;
-    pollindex       = 3;
-    pollvalue       = 0x53;
-    predelay        = 1;
-    postdelay       = 1;
-    pollmethod      = 1;
+	timeout         = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        page_size       = 4;
-        size            = 512;
-        min_write_delay = 3600;
-        max_write_delay = 3600;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = " 1 0 1 0 0 0 0 0",
-                          " 0 0 0 x x x x a8",
-                          " a7 a6 a5 a4 a3 a2 a1 a0",
-                          " o o o o o o o o";
+	memory "eeprom"
+		paged           = no;
+		page_size       = 4;
+		size            = 512;
+		min_write_delay = 3600;
+		max_write_delay = 3600;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = " 1 0 1 0 0 0 0 0",
+						  " 0 0 0 x x x x a8",
+						  " a7 a6 a5 a4 a3 a2 a1 a0",
+						  " o o o o o o o o";
 
-        write           = " 1 1 0 0 0 0 0 0",
-                          " 0 0 0 x x x x a8",
-                          " a7 a6 a5 a4 a3 a2 a1 a0",
-                          " i i i i i i i i";
+		write           = " 1 1 0 0 0 0 0 0",
+						  " 0 0 0 x x x x a8",
+						  " a7 a6 a5 a4 a3 a2 a1 a0",
+						  " i i i i i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 256;
-        ;
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 256;
+		;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = " 0 0 1 0 0 0 0 0",
-                          " 0 0 0 a12 a11 a10 a9 a8",
-                          " a7 a6 a5 a4 a3 a2 a1 a0",
-                          " o o o o o o o o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = " 0 0 1 0 0 0 0 0",
+						  " 0 0 0 a12 a11 a10 a9 a8",
+						  " a7 a6 a5 a4 a3 a2 a1 a0",
+						  " o o o o o o o o";
 
-        read_hi          = " 0 0 1 0 1 0 0 0",
-                           " 0 0 0 a12 a11 a10 a9 a8",
-                           " a7 a6 a5 a4 a3 a2 a1 a0",
-                           " o o o o o o o o";
+		read_hi          = " 0 0 1 0 1 0 0 0",
+						   " 0 0 0 a12 a11 a10 a9 a8",
+						   " a7 a6 a5 a4 a3 a2 a1 a0",
+						   " o o o o o o o o";
 
-        loadpage_lo     = " 0 1 0 0 0 0 0 0",
-                          " 0 0 0 x x x x x",
-                          " x x a5 a4 a3 a2 a1 a0",
-                          " i i i i i i i i";
+		loadpage_lo     = " 0 1 0 0 0 0 0 0",
+						  " 0 0 0 x x x x x",
+						  " x x a5 a4 a3 a2 a1 a0",
+						  " i i i i i i i i";
 
-        loadpage_hi     = " 0 1 0 0 1 0 0 0",
-                          " 0 0 0 x x x x x",
-                          " x x a5 a4 a3 a2 a1 a0",
-                          " i i i i i i i i";
+		loadpage_hi     = " 0 1 0 0 1 0 0 0",
+						  " 0 0 0 x x x x x",
+						  " x x a5 a4 a3 a2 a1 a0",
+						  " i i i i i i i i";
 
-        writepage       = " 0 1 0 0 1 1 0 0",
-                          " 0 0 0 a12 a11 a10 a9 a8",
-                          " a7 a6 x x x x x x",
-                          " x x x x x x x x";
+		writepage       = " 0 1 0 0 1 1 0 0",
+						  " 0 0 0 a12 a11 a10 a9 a8",
+						  " a7 a6 x x x x x x",
+						  " x x x x x x x x";
 
-        mode        = 0x41;
-        delay       = 6;
-        blocksize   = 128;
-        readsize    = 256;
+		mode        = 0x41;
+		delay       = 6;
+		blocksize   = 128;
+		readsize    = 256;
 
-        ;
+		;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0",
-                          "x x x x x x x x o o o o o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0",
+						  "x x x x x x x x o o o o o o o o";
 
-        write           = "1 0 1 0 1 1 0 0 1 0 1 0 0 0 0 0",
-                          "x x x x x x x x i i i i i i i i";
-        ;
+		write           = "1 0 1 0 1 1 0 0 1 0 1 0 0 0 0 0",
+						  "x x x x x x x x i i i i i i i i";
+		;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1 1 0 0 0 0 0 0 0 1 0 0 0",
-                          "x x x x x x x x o o o o o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1 1 0 0 0 0 0 0 0 1 0 0 0",
+						  "x x x x x x x x o o o o o o o o";
 
-        write           = "1 0 1 0 1 1 0 0 1 0 1 0 1 0 0 0",
-                          "x x x x x x x x i i i i i i i i";
-        ;
+		write           = "1 0 1 0 1 1 0 0 1 0 1 0 1 0 0 0",
+						  "x x x x x x x x i i i i i i i i";
+		;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 0",
-                          "x x x x x x x x x x x x x o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 0",
+						  "x x x x x x x x x x x x x o o o";
 
-        write           = "1 0 1 0 1 1 0 0 1 0 1 0 0 1 0 0",
-                          "x x x x x x x x x x x x x i i i";
-        ;
+		write           = "1 0 1 0 1 1 0 0 1 0 1 0 0 1 0 0",
+						  "x x x x x x x x x x x x x i i i";
+		;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0",
-                          "x x x x x x x x x x o o o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0",
+						  "x x x x x x x x x x o o o o o o";
 
-        write           = "1 0 1 0 1 1 0 0 1 1 1 x x x x x",
-                          "x x x x x x x x 1 1 i i i i i i";
-        ;
+		write           = "1 0 1 0 1 1 0 0 1 1 1 x x x x x",
+						  "x x x x x x x x 1 1 i i i i i i";
+		;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1 1 0 0 0 0 0 0 x x x x x",
-                          "0 0 0 0 0 0 0 0 o o o o o o o o";
-        ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1 1 0 0 0 0 0 0 x x x x x",
+						  "0 0 0 0 0 0 0 0 o o o o o o o o";
+		;
 
-    memory "signature"
-        size            = 3;
-        read            = "0 0 1 1 0 0 0 0 0 0 0 x x x x x",
-                          "x x x x x x a1 a0 o o o o o o o o";
-        ;
+	memory "signature"
+		size            = 3;
+		read            = "0 0 1 1 0 0 0 0 0 0 0 x x x x x",
+						  "x x x x x x a1 a0 o o o o o o o o";
+		;
 ;
 
 #------------------------------------------------------------
@@ -8153,185 +8153,185 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "t88";
-    desc             = "attiny88";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-    stk500_devcode   = 0x73;
+	id               = "t88";
+	desc             = "attiny88";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	stk500_devcode   = 0x73;
 #    avr910_devcode   = 0x;
-    signature        = 0x1e 0x93 0x11;
-    pagel            = 0xd7;
-    bs2              = 0xc2;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	signature        = 0x1e 0x93 0x11;
+	pagel            = 0xd7;
+	bs2              = 0xc2;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
+	pp_controlstack     =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    resetdelay          = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	resetdelay          = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no;
-        page_size       = 4;
-        size            = 64;
-        min_write_delay = 3600;
-        max_write_delay = 3600;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
+	memory "eeprom"
+		paged           = no;
+		page_size       = 4;
+		size            = 64;
+		min_write_delay = 3600;
+		max_write_delay = 3600;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
 	read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
 	write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+						  "  0   0   0   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 64;
-      ;
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 64;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0    0   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 64;
+	  ;
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 64;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0    0   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        read_hi         = "  0   0   1   0    1   0   0   0",
-                          "  0   0   0   0  a11 a10  a9  a8",
-                          " a7  a6  a5  a4   a3  a2  a1  a0",
-                          "  o   o   o   o    o   o   o   o";
+		read_hi         = "  0   0   1   0    1   0   0   0",
+						  "  0   0   0   0  a11 a10  a9  a8",
+						  " a7  a6  a5  a4   a3  a2  a1  a0",
+						  "  o   o   o   o    o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   x      x   x   x   x",
-                          "  x   x   x  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   x      x   x   x   x",
+						  "  x   x   x  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x   i i i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x   i i i i  i i i i";
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x   x x x x  x o o o";
+	memory "efuse"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x   x x x x  x o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x   x x x x  x x x i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x   x x x x  x x x i";
+	  ;
 
-    memory "lock"
-        size            = 1;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
-                          "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0  0  1  1   1  0  0  0   0  0  0  x   x  x  x  x",
+						  "0  0  0  0   0  0  0  0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -8339,100 +8339,100 @@ part
 #------------------------------------------------------------
 
 part
-    id			= "m328p";
-    desc		= "ATMEGA328P";
-    has_debugwire	= yes;
-    flash_instr		= 0xB6, 0x01, 0x11;
-    eeprom_instr	= 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+	id          = "m328p";
+	desc        = "ATMEGA328P";
+	has_debugwire   = yes;
+	flash_instr     = 0xB6, 0x01, 0x11;
+	eeprom_instr    = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
 			  0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
 			  0x99, 0xF9, 0xBB, 0xAF;
-    stk500_devcode	= 0x86;
-    # avr910_devcode	= 0x;
-    signature		= 0x1e 0x95 0x0F;
-    pagel		= 0xd7;
-    bs2			= 0xc2;
-    chip_erase_delay	= 9000;
-    pgm_enable = "1 0 1 0 1 1 0 0 0 1 0 1 0 0 1 1",
+	stk500_devcode  = 0x86;
+	# avr910_devcode    = 0x;
+	signature       = 0x1e 0x95 0x0F;
+	pagel       = 0xd7;
+	bs2         = 0xc2;
+	chip_erase_delay    = 9000;
+	pgm_enable = "1 0 1 0 1 1 0 0 0 1 0 1 0 0 1 1",
 		 "x x x x x x x x x x x x x x x x";
 
-    chip_erase = "1 0 1 0 1 1 0 0 1 0 0 x x x x x",
+	chip_erase = "1 0 1 0 1 1 0 0 1 0 0 x x x x x",
 		 "x x x x x x x x x x x x x x x x";
 
-    timeout	= 200;
-    stabdelay	= 100;
-    cmdexedelay	= 25;
-    synchloops	= 32;
-    bytedelay	= 0;
-    pollindex	= 3;
-    pollvalue	= 0x53;
-    predelay	= 1;
-    postdelay	= 1;
-    pollmethod	= 1;
+	timeout = 200;
+	stabdelay   = 100;
+	cmdexedelay = 25;
+	synchloops  = 32;
+	bytedelay   = 0;
+	pollindex   = 3;
+	pollvalue   = 0x53;
+	predelay    = 1;
+	postdelay   = 1;
+	pollmethod  = 1;
 
-    pp_controlstack =
+	pp_controlstack =
 	0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
 	0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
 	0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
 	0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay	= 100;
-    progmodedelay	= 0;
-    latchcycles		= 5;
-    togglevtg		= 1;
-    poweroffdelay	= 15;
-    resetdelayms	= 1;
-    resetdelayus	= 0;
-    hvleavestabdelay	= 15;
-    resetdelay		= 15;
-    chiperasepulsewidth	= 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	hventerstabdelay    = 100;
+	progmodedelay   = 0;
+	latchcycles     = 5;
+	togglevtg       = 1;
+	poweroffdelay   = 15;
+	resetdelayms    = 1;
+	resetdelayus    = 0;
+	hvleavestabdelay    = 15;
+	resetdelay      = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-	paged		= no;
-	page_size	= 4;
-	size		= 1024;
+	memory "eeprom"
+	paged       = no;
+	page_size   = 4;
+	size        = 1024;
 	min_write_delay = 3600;
 	max_write_delay = 3600;
-	readback_p1	= 0xff;
-	readback_p2	= 0xff;
+	readback_p1 = 0xff;
+	readback_p2 = 0xff;
 	read = " 1 0 1 0 0 0 0 0",
-	       " 0 0 0 x x x a9 a8",
-	       " a7 a6 a5 a4 a3 a2 a1 a0",
-	       " o o o o o o o o";
+		   " 0 0 0 x x x a9 a8",
+		   " a7 a6 a5 a4 a3 a2 a1 a0",
+		   " o o o o o o o o";
 
 	write = " 1 1 0 0 0 0 0 0",
-	      	" 0 0 0 x x x a9 a8",
+			" 0 0 0 x x x a9 a8",
 		" a7 a6 a5 a4 a3 a2 a1 a0",
 		" i i i i i i i i";
 
 	loadpage_lo = " 1 1 0 0 0 0 0 1",
-		      " 0 0 0 0 0 0 0 0",
-		      " 0 0 0 0 0 0 a1 a0",
-		      " i i i i i i i i";
+			  " 0 0 0 0 0 0 0 0",
+			  " 0 0 0 0 0 0 a1 a0",
+			  " i i i i i i i i";
 
 	writepage = " 1 1 0 0 0 0 1 0",
-		    " 0 0 x x x x a9 a8",
-		    " a7 a6 a5 a4 a3 a2 0 0",
-		    " x x x x x x x x";
+			" 0 0 x x x x a9 a8",
+			" a7 a6 a5 a4 a3 a2 0 0",
+			" x x x x x x x x";
 
-	mode		= 0x41;
-	delay		= 5;
-	blocksize	= 4;
-	readsize	= 256;
-    ;
+	mode        = 0x41;
+	delay       = 5;
+	blocksize   = 4;
+	readsize    = 256;
+	;
 
-    memory "flash"
-	paged		= yes;
-	size		= 32768;
-	page_size	= 128;
-	num_pages	= 256;
+	memory "flash"
+	paged       = yes;
+	size        = 32768;
+	page_size   = 128;
+	num_pages   = 256;
 	min_write_delay = 4500;
 	max_write_delay = 4500;
-	readback_p1	= 0xff;
-	readback_p2	= 0xff;
+	readback_p1 = 0xff;
+	readback_p2 = 0xff;
 	read_lo = " 0 0 1 0 0 0 0 0",
 		  " 0 0 a13 a12 a11 a10 a9 a8",
 		  " a7 a6 a5 a4 a3 a2 a1 a0",
@@ -8444,82 +8444,82 @@ part
 		  " o o o o o o o o";
 
 	loadpage_lo = " 0 1 0 0 0 0 0 0",
-		      " 0 0 0 x x x x x",
-		      " x x a5 a4 a3 a2 a1 a0",
-		      " i i i i i i i i";
+			  " 0 0 0 x x x x x",
+			  " x x a5 a4 a3 a2 a1 a0",
+			  " i i i i i i i i";
 
 	loadpage_hi = " 0 1 0 0 1 0 0 0",
-		      " 0 0 0 x x x x x",
-		      " x x a5 a4 a3 a2 a1 a0",
-		      " i i i i i i i i";
+			  " 0 0 0 x x x x x",
+			  " x x a5 a4 a3 a2 a1 a0",
+			  " i i i i i i i i";
 
 	writepage = " 0 1 0 0 1 1 0 0",
-		    " 0 0 a13 a12 a11 a10 a9 a8",
-		    " a7 a6 x x x x x x",
-		    " x x x x x x x x";
+			" 0 0 a13 a12 a11 a10 a9 a8",
+			" a7 a6 x x x x x x",
+			" x x x x x x x x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
 
-    ;
+	;
 
-    memory "lfuse"
+	memory "lfuse"
 	size = 1;
 	min_write_delay = 4500;
 	max_write_delay = 4500;
 	read = "0 1 0 1 0 0 0 0 0 0 0 0 0 0 0 0",
-	       "x x x x x x x x o o o o o o o o";
+		   "x x x x x x x x o o o o o o o o";
 
 	write = "1 0 1 0 1 1 0 0 1 0 1 0 0 0 0 0",
-	      	"x x x x x x x x i i i i i i i i";
-    ;
+			"x x x x x x x x i i i i i i i i";
+	;
 
-    memory "hfuse"
+	memory "hfuse"
 	size = 1;
 	min_write_delay = 4500;
 	max_write_delay = 4500;
 	read = "0 1 0 1 1 0 0 0 0 0 0 0 1 0 0 0",
-	       "x x x x x x x x o o o o o o o o";
+		   "x x x x x x x x o o o o o o o o";
 
 	write = "1 0 1 0 1 1 0 0 1 0 1 0 1 0 0 0",
-	      	"x x x x x x x x i i i i i i i i";
-    ;
+			"x x x x x x x x i i i i i i i i";
+	;
 
-    memory "efuse"
+	memory "efuse"
 	size = 1;
 	min_write_delay = 4500;
 	max_write_delay = 4500;
 	read = "0 1 0 1 0 0 0 0 0 0 0 0 1 0 0 0",
-	       "x x x x x x x x x x x x x o o o";
+		   "x x x x x x x x x x x x x o o o";
 
 	write = "1 0 1 0 1 1 0 0 1 0 1 0 0 1 0 0",
-	      	"x x x x x x x x x x x x x i i i";
-    ;
+			"x x x x x x x x x x x x x i i i";
+	;
 
-    memory "lock"
+	memory "lock"
 	size = 1;
 	min_write_delay = 4500;
 	max_write_delay = 4500;
 	read = "0 1 0 1 1 0 0 0 0 0 0 0 0 0 0 0",
-	       "x x x x x x x x x x o o o o o o";
+		   "x x x x x x x x x x o o o o o o";
 
 	write = "1 0 1 0 1 1 0 0 1 1 1 x x x x x",
-	      	"x x x x x x x x 1 1 i i i i i i";
-    ;
+			"x x x x x x x x 1 1 i i i i i i";
+	;
 
-    memory "calibration"
+	memory "calibration"
 	size = 1;
 	read = "0 0 1 1 1 0 0 0 0 0 0 x x x x x",
-	       "0 0 0 0 0 0 0 0 o o o o o o o o";
-    ;
+		   "0 0 0 0 0 0 0 0 o o o o o o o o";
+	;
 
-    memory "signature"
+	memory "signature"
 	size = 3;
 	read = "0 0 1 1 0 0 0 0 0 0 0 x x x x x",
-	       "x x x x x x a1 a0 o o o o o o o o";
-    ;
+		   "x x x x x x a1 a0 o o o o o o o o";
+	;
 ;
 
 #------------------------------------------------------------
@@ -8527,186 +8527,186 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t2313";
-     desc          = "ATtiny2313";
-     has_debugwire = yes;
-     flash_instr   = 0xB2, 0x0F, 0x1F;
-     eeprom_instr  = 0xBB, 0xFE, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBA, 0x0F, 0xB2, 0x0F, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
-     stk500_devcode   = 0x23;
+	 id            = "t2313";
+	 desc          = "ATtiny2313";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB2, 0x0F, 0x1F;
+	 eeprom_instr  = 0xBB, 0xFE, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBA, 0x0F, 0xB2, 0x0F, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
+	 stk500_devcode   = 0x23;
 ##   Use the ATtiny26 devcode:
-     avr910_devcode   = 0x5e;
-     signature        = 0x1e 0x91 0x0a;
-     pagel            = 0xD4;
-     bs2              = 0xD6;
-     reset            = io;
-     chip_erase_delay = 9000;
+	 avr910_devcode   = 0x5e;
+	 signature        = 0x1e 0x91 0x0a;
+	 pagel            = 0xD4;
+	 bs2              = 0xD6;
+	 reset            = io;
+	 chip_erase_delay = 9000;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0E, 0x1E, 0x2E, 0x3E, 0x2E, 0x3E,
-        0x4E, 0x5E, 0x4E, 0x5E, 0x6E, 0x7E, 0x6E, 0x7E,
-        0x26, 0x36, 0x66, 0x76, 0x2A, 0x3A, 0x6A, 0x7A,
-        0x2E, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0E, 0x1E, 0x2E, 0x3E, 0x2E, 0x3E,
+		0x4E, 0x5E, 0x4E, 0x5E, 0x6E, 0x7E, 0x6E, 0x7E,
+		0x26, 0x36, 0x66, 0x76, 0x2A, 0x3A, 0x6A, 0x7A,
+		0x2E, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-     memory "eeprom"
-         size            = 128;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 128;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 2048;
-         page_size       = 32;
-         num_pages       = 64;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 2048;
+		 page_size       = 32;
+		 num_pages       = 64;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
 # The information in the data sheet of April/2004 is wrong, this works:
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
 # The information in the data sheet of April/2004 is wrong, this works:
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
 # The information in the data sheet of April/2004 is wrong, this works:
-         writepage       = "  0  1  0  0   1  1  0  0",
-                           "  0  0  0  0   0  0 a9 a8",
-                           " a7 a6 a5 a4   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1  1  0  0",
+						   "  0  0  0  0   0  0 a9 a8",
+						   " a7 a6 a5 a4   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny2313 has Signature Bytes: 0x1E 0x91 0x0A.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
-         read           = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  x x o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
+		 read           = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  x x o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 # The Tiny2313 has calibration data for both 4 MHz and 8 MHz.
 # The information in the data sheet of April/2004 is wrong, this works:
 
-     memory "calibration"
-         size            = 2;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 2;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -8714,181 +8714,181 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "pwm2";
-     desc          = "AT90PWM2";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-     stk500_devcode   = 0x65;
+	 id            = "pwm2";
+	 desc          = "AT90PWM2";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	 stk500_devcode   = 0x65;
 ##  avr910_devcode   = ?;
-     signature        = 0x1e 0x93 0x81;
-     pagel            = 0xD8;
-     bs2              = 0xE2;
-     reset            = io;
-     chip_erase_delay = 9000;
+	 signature        = 0x1e 0x93 0x81;
+	 pagel            = 0xD8;
+	 bs2              = 0xE2;
+	 reset            = io;
+	 chip_erase_delay = 9000;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0   0",
-                           "  0  0  0  0   a11 a10 a9  a8",
-                           " a7 a6 a5  x   x   x   x   x",
-                           "  x  x  x  x   x   x   x   x";
+		 writepage       = "  0  1  0  0   1   1   0   0",
+						   "  0  0  0  0   a11 a10 a9  a8",
+						   " a7 a6 a5  x   x   x   x   x",
+						   "  x  x  x  x   x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	   ;
 #   AT90PWM2 has Signature Bytes: 0x1E 0x93 0x81.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  x x o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  x x o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  0    o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -8898,181 +8898,181 @@ part
 # Completely identical to AT90PWM2 (including the signature!)
 
 part
-     id            = "pwm3";
-     desc          = "AT90PWM3";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-     stk500_devcode   = 0x65;
+	 id            = "pwm3";
+	 desc          = "AT90PWM3";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	 stk500_devcode   = 0x65;
 ##  avr910_devcode   = ?;
-     signature        = 0x1e 0x93 0x81;
-     pagel            = 0xD8;
-     bs2              = 0xE2;
-     reset            = io;
-     chip_erase_delay = 9000;
+	 signature        = 0x1e 0x93 0x81;
+	 pagel            = 0xD8;
+	 bs2              = 0xE2;
+	 reset            = io;
+	 chip_erase_delay = 9000;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0   0",
-                           "  0  0  0  0   a11 a10 a9  a8",
-                           " a7 a6 a5  x   x   x   x   x",
-                           "  x  x  x  x   x   x   x   x";
+		 writepage       = "  0  1  0  0   1   1   0   0",
+						   "  0  0  0  0   a11 a10 a9  a8",
+						   " a7 a6 a5  x   x   x   x   x",
+						   "  x  x  x  x   x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	   ;
 #   AT90PWM2 has Signature Bytes: 0x1E 0x93 0x81.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  x x o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  x x o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  0    o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -9081,180 +9081,180 @@ part
 # Same as AT90PWM2 but different signature.
 
 part
-     id            = "pwm2b";
-     desc          = "AT90PWM2B";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-     stk500_devcode   = 0x65;
+	 id            = "pwm2b";
+	 desc          = "AT90PWM2B";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	 stk500_devcode   = 0x65;
 ##  avr910_devcode   = ?;
-     signature        = 0x1e 0x93 0x83;
-     pagel            = 0xD8;
-     bs2              = 0xE2;
-     reset            = io;
-     chip_erase_delay = 9000;
+	 signature        = 0x1e 0x93 0x83;
+	 pagel            = 0xD8;
+	 bs2              = 0xE2;
+	 reset            = io;
+	 chip_erase_delay = 9000;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0   0",
-                           "  0  0  0  0   a11 a10 a9  a8",
-                           " a7 a6 a5  x   x   x   x   x",
-                           "  x  x  x  x   x   x   x   x";
+		 writepage       = "  0  1  0  0   1   1   0   0",
+						   "  0  0  0  0   a11 a10 a9  a8",
+						   " a7 a6 a5  x   x   x   x   x",
+						   "  x  x  x  x   x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-       ;
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	   ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  x x o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  x x o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  0    o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -9264,180 +9264,180 @@ part
 # Completely identical to AT90PWM2B (including the signature!)
 
 part
-     id            = "pwm3b";
-     desc          = "AT90PWM3B";
-     has_debugwire = yes;
-     flash_instr   = 0xB6, 0x01, 0x11;
-     eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
-	             0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
-	             0x99, 0xF9, 0xBB, 0xAF;
-     stk500_devcode   = 0x65;
+	 id            = "pwm3b";
+	 desc          = "AT90PWM3B";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB6, 0x01, 0x11;
+	 eeprom_instr  = 0xBD, 0xF2, 0xBD, 0xE1, 0xBB, 0xCF, 0xB4, 0x00,
+				 0xBE, 0x01, 0xB6, 0x01, 0xBC, 0x00, 0xBB, 0xBF,
+				 0x99, 0xF9, 0xBB, 0xAF;
+	 stk500_devcode   = 0x65;
 ##  avr910_devcode   = ?;
-     signature        = 0x1e 0x93 0x83;
-     pagel            = 0xD8;
-     bs2              = 0xE2;
-     reset            = io;
-     chip_erase_delay = 9000;
+	 signature        = 0x1e 0x93 0x83;
+	 pagel            = 0xD8;
+	 bs2              = 0xE2;
+	 reset            = io;
+	 chip_erase_delay = 9000;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0  i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0   a11 a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0   a11 a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0   0",
-                           "  0  0  0  0   a11 a10 a9  a8",
-                           " a7 a6 a5  x   x   x   x   x",
-                           "  x  x  x  x   x   x   x   x";
+		 writepage       = "  0  1  0  0   1   1   0   0",
+						   "  0  0  0  0   a11 a10 a9  a8",
+						   " a7 a6 a5  x   x   x   x   x",
+						   "  x  x  x  x   x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 64;
-	readsize	= 256;
-       ;
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 64;
+	readsize    = 256;
+	   ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  x  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  x x o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  x x o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  0    o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  0    o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -9445,179 +9445,179 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t25";
-     desc          = "ATtiny25";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x02, 0x12;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	 id            = "t25";
+	 desc          = "ATtiny25";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x02, 0x12;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 ## no STK500 devcode in XML file, use the ATtiny45 one
-     stk500_devcode   = 0x14;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x91 0x08;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x91 0x08;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 128;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 128;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 2048;
-         page_size       = 32;
-         num_pages       = 64;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 2048;
+		 page_size       = 32;
+		 num_pages       = 64;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1  1  0  0",
-                           "  0  0  0  0   0  0 a9 a8",
-                           " a7 a6 a5 a4   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1  1  0  0",
+						   "  0  0  0  0   0  0 a9 a8",
+						   " a7 a6 a5 a4   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny25 has Signature Bytes: 0x1E 0x91 0x08.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 2;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 2;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -9625,178 +9625,178 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t45";
-     desc          = "ATtiny45";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x02, 0x12;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
-     stk500_devcode   = 0x14;
+	 id            = "t45";
+	 desc          = "ATtiny45";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x02, 0x12;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x92 0x06;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x92 0x06;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack     =
+	hvsp_controlstack     =
 	0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 256;
-         page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 256;
+		 page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 4096;
-         page_size       = 64;
-         num_pages       = 64;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0    0  a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 4096;
+		 page_size       = 64;
+		 num_pages       = 64;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0    0  a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0    0  a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0    0  a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1  1  0  0",
-                           "  0  0  0  0   0 a10 a9 a8",
-                           " a7 a6 a5  x   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1  1  0  0",
+						   "  0  0  0  0   0 a10 a9 a8",
+						   " a7 a6 a5  x   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny45 has Signature Bytes: 0x1E 0x92 0x08. (Data sheet 2586C-AVR-06/05 (doc2586.pdf) indicates otherwise!)
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 2;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 2;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -9804,179 +9804,179 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t85";
-     desc          = "ATtiny85";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x02, 0x12;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	 id            = "t85";
+	 desc          = "ATtiny85";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x02, 0x12;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x02, 0xB4, 0x02, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 ## no STK500 devcode in XML file, use the ATtiny45 one
-     stk500_devcode   = 0x14;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x93 0x0b;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x93 0x0b;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x00;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x a8",
-                           "a8 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x a8",
+						   "a8 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x  a8",
 			  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0  a11 a10  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0  a11 a10  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0  a11 a10  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0  a11 a10  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0  0",
-                           "  0  0  0  0  a11 a10 a9 a8",
-                           " a7 a6 a5  x   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1   1   0  0",
+						   "  0  0  0  0  a11 a10 a9 a8",
+						   " a7 a6 a5  x   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny85 has Signature Bytes: 0x1E 0x93 0x08.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 2;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 2;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -9985,187 +9985,187 @@ part
 # Almost same as ATmega1280, except for different memory sizes
 
 part
-    id               = "m640";
-    desc             = "ATMEGA640";
-    signature        = 0x1e 0x96 0x08;
-    has_jtag         = yes;
+	id               = "m640";
+	desc             = "ATMEGA640";
+	signature        = 0x1e 0x96 0x08;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -10173,187 +10173,187 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m1280";
-    desc             = "ATMEGA1280";
-    signature        = 0x1e 0x97 0x03;
-    has_jtag         = yes;
+	id               = "m1280";
+	desc             = "ATMEGA1280";
+	signature        = 0x1e 0x97 0x03;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -10362,187 +10362,187 @@ part
 # Identical to ATmega1280
 
 part
-    id               = "m1281";
-    desc             = "ATMEGA1281";
-    signature        = 0x1e 0x97 0x04;
-    has_jtag         = yes;
+	id               = "m1281";
+	desc             = "ATMEGA1281";
+	signature        = 0x1e 0x97 0x04;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -10550,192 +10550,192 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m2560";
-    desc             = "ATMEGA2560";
-    signature        = 0x1e 0x98 0x01;
-    has_jtag         = yes;
+	id               = "m2560";
+	desc             = "ATMEGA2560";
+	signature        = 0x1e 0x98 0x01;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 262144;
-        page_size       = 256;
-        num_pages       = 1024;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 262144;
+		page_size       = 256;
+		num_pages       = 1024;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-        load_ext_addr   = "  0   1   0   0      1   1   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0 a16",
-                          "  0   0   0   0      0   0   0   0";
+		load_ext_addr   = "  0   1   0   0      1   1   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0 a16",
+						  "  0   0   0   0      0   0   0   0";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -10743,192 +10743,192 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m2561";
-    desc             = "ATMEGA2561";
-    signature        = 0x1e 0x98 0x02;
-    has_jtag         = yes;
+	id               = "m2561";
+	desc             = "ATMEGA2561";
+	signature        = 0x1e 0x98 0x02;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 262144;
-        page_size       = 256;
-        num_pages       = 1024;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 262144;
+		page_size       = 256;
+		num_pages       = 1024;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-        load_ext_addr   = "  0   1   0   0      1   1   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0 a16",
-                          "  0   0   0   0      0   0   0   0";
+		load_ext_addr   = "  0   1   0   0      1   1   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0 a16",
+						  "  0   0   0   0      0   0   0   0";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -10937,187 +10937,187 @@ part
 # Identical to ATmega2561 but half the ROM
 
 part
-    id               = "m128rfa1";
-    desc             = "ATMEGA128RFA1";
-    signature        = 0x1e 0xa7 0x01;
-    has_jtag         = yes;
+	id               = "m128rfa1";
+	desc             = "ATMEGA128RFA1";
+	signature        = 0x1e 0xa7 0x01;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xE2;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xE2;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x    a11 a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  x i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  x i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -11125,181 +11125,181 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t24";
-     desc          = "ATtiny24";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x07, 0x17;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	 id            = "t24";
+	 desc          = "ATtiny24";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x07, 0x17;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 ## no STK500 devcode in XML file, use the ATtiny45 one
-     stk500_devcode   = 0x14;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x91 0x0b;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x91 0x0b;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 70;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 70;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 128;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 128;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
-                           "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0   0 0 0 x  x x x x",
+						   "x a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 2048;
-         page_size       = 32;
-         num_pages       = 64;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 2048;
+		 page_size       = 32;
+		 num_pages       = 64;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0    0   0  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0    0   0  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x   x   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x   x   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1  1  0  0",
-                           "  0  0  0  0   0  0 a9 a8",
-                           " a7 a6 a5 a4   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1  1  0  0",
+						   "  0  0  0  0   0  0 a9 a8",
+						   " a7 a6 a5 a4   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny24 has Signature Bytes: 0x1E 0x91 0x0B.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  x x x x  x x i i";
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "0 0 0 0  0 0 0 0  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  x x x x  x x i i";
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -11307,181 +11307,181 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t44";
-     desc          = "ATtiny44";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x07, 0x17;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-                     0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
-                     0x99, 0xE1, 0xBB, 0xAC;
+	 id            = "t44";
+	 desc          = "ATtiny44";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x07, 0x17;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+					 0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
+					 0x99, 0xE1, 0xBB, 0xAC;
 ## no STK500 devcode in XML file, use the ATtiny45 one
-     stk500_devcode   = 0x14;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x92 0x07;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x92 0x07;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 70;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 70;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 256;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 256;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x x",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x x",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 4096;
-         page_size       = 64;
-         num_pages       = 64;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0    0  a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 4096;
+		 page_size       = 64;
+		 num_pages       = 64;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0    0  a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0    0  a10 a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0    0  a10 a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1  1  0  0",
-                           "  0  0  0  0   0 a10 a9 a8",
-                           " a7 a6 a5  x   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1  1  0  0",
+						   "  0  0  0  0   0 a10 a9 a8",
+						   " a7 a6 a5  x   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny44 has Signature Bytes: 0x1E 0x92 0x07.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  x x x x  x x i i";
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "0 0 0 0  0 0 0 0  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  x x x x  x x i i";
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -11489,182 +11489,182 @@ part
 #------------------------------------------------------------
 
 part
-     id            = "t84";
-     desc          = "ATtiny84";
-     has_debugwire = yes;
-     flash_instr   = 0xB4, 0x07, 0x17;
-     eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
-	             0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
-	             0x99, 0xE1, 0xBB, 0xAC;
+	 id            = "t84";
+	 desc          = "ATtiny84";
+	 has_debugwire = yes;
+	 flash_instr   = 0xB4, 0x07, 0x17;
+	 eeprom_instr  = 0xBB, 0xFF, 0xBB, 0xEE, 0xBB, 0xCC, 0xB2, 0x0D,
+				 0xBC, 0x07, 0xB4, 0x07, 0xBA, 0x0D, 0xBB, 0xBC,
+				 0x99, 0xE1, 0xBB, 0xAC;
 ## no STK500 devcode in XML file, use the ATtiny45 one
-     stk500_devcode   = 0x14;
+	 stk500_devcode   = 0x14;
 ##  avr910_devcode   = ?;
 ##  Try the AT90S2313 devcode:
-     avr910_devcode   = 0x20;
-     signature        = 0x1e 0x93 0x0c;
-     reset            = io;
-     chip_erase_delay = 4500;
+	 avr910_devcode   = 0x20;
+	 signature        = 0x1e 0x93 0x0c;
+	 reset            = io;
+	 chip_erase_delay = 4500;
 
-     pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+						"x x x x  x x x x    x x x x  x x x x";
 
-     chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                        "x x x x  x x x x    x x x x  x x x x";
+	 chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+						"x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    hvsp_controlstack   =
-        0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
-        0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
-        0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
-        0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
-    hventerstabdelay    = 100;
-    hvspcmdexedelay     = 0;
-    synchcycles         = 6;
-    latchcycles         = 1;
-    togglevtg           = 1;
-    poweroffdelay       = 25;
-    resetdelayms        = 0;
-    resetdelayus        = 70;
-    hvleavestabdelay    = 100;
-    resetdelay          = 25;
-    chiperasepolltimeout = 40;
-    chiperasetime       = 0;
-    programfusepolltimeout = 25;
-    programlockpolltimeout = 25;
+	hvsp_controlstack   =
+		0x4C, 0x0C, 0x1C, 0x2C, 0x3C, 0x64, 0x74, 0x66,
+		0x68, 0x78, 0x68, 0x68, 0x7A, 0x6A, 0x68, 0x78,
+		0x78, 0x7D, 0x6D, 0x0C, 0x80, 0x40, 0x20, 0x10,
+		0x11, 0x08, 0x04, 0x02, 0x03, 0x08, 0x04, 0x0F;
+	hventerstabdelay    = 100;
+	hvspcmdexedelay     = 0;
+	synchcycles         = 6;
+	latchcycles         = 1;
+	togglevtg           = 1;
+	poweroffdelay       = 25;
+	resetdelayms        = 0;
+	resetdelayus        = 70;
+	hvleavestabdelay    = 100;
+	resetdelay          = 25;
+	chiperasepolltimeout = 40;
+	chiperasetime       = 0;
+	programfusepolltimeout = 25;
+	programlockpolltimeout = 25;
 
-     memory "eeprom"
-         size            = 512;
-        paged           = no;
-        page_size       = 4;
-         min_write_delay = 4000;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x a8",
-                           "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
+	 memory "eeprom"
+		 size            = 512;
+		paged           = no;
+		page_size       = 4;
+		 min_write_delay = 4000;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read            = "1  0  1  0   0  0  0  0    0 0 0 x  x x x a8",
+						   "a7 a6 a5 a4  a3 a2 a1 a0   o o o o  o o o o";
 
-         write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x a8",
-                           "a8 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
+		 write           = "1  1  0  0   0  0  0  0    0 0 0 x  x x x a8",
+						   "a8 a6 a5 a4  a3 a2 a1 a0   i i i i  i i i i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x   x   x   x",
 			  "  x  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 4;
-	readsize	= 256;
-       ;
-     memory "flash"
-         paged           = yes;
-         size            = 8192;
-         page_size       = 64;
-         num_pages       = 128;
-         min_write_delay = 4500;
-         max_write_delay = 4500;
-         readback_p1     = 0xff;
-         readback_p2     = 0xff;
-         read_lo         = "  0   0   1   0    0   0   0   0",
-                           "  0   0   0   0  a11 a10  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 4;
+	readsize    = 256;
+	   ;
+	 memory "flash"
+		 paged           = yes;
+		 size            = 8192;
+		 page_size       = 64;
+		 num_pages       = 128;
+		 min_write_delay = 4500;
+		 max_write_delay = 4500;
+		 readback_p1     = 0xff;
+		 readback_p2     = 0xff;
+		 read_lo         = "  0   0   1   0    0   0   0   0",
+						   "  0   0   0   0  a11 a10  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         read_hi         = "  0   0   1   0    1   0   0   0",
-                           "  0   0   0   0  a11 a10  a9  a8",
-                           " a7  a6  a5  a4   a3  a2  a1  a0",
-                           "  o   o   o   o    o   o   o   o";
+		 read_hi         = "  0   0   1   0    1   0   0   0",
+						   "  0   0   0   0  a11 a10  a9  a8",
+						   " a7  a6  a5  a4   a3  a2  a1  a0",
+						   "  o   o   o   o    o   o   o   o";
 
-         loadpage_lo     = "  0   1   0   0    0   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_lo     = "  0   1   0   0    0   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         loadpage_hi     = "  0   1   0   0    1   0   0   0",
-                           "  0   0   0   x    x   x   x   x",
-                           "  x   x   x  a4   a3  a2  a1  a0",
-                           "  i   i   i   i    i   i   i   i";
+		 loadpage_hi     = "  0   1   0   0    1   0   0   0",
+						   "  0   0   0   x    x   x   x   x",
+						   "  x   x   x  a4   a3  a2  a1  a0",
+						   "  i   i   i   i    i   i   i   i";
 
-         writepage       = "  0  1  0  0   1   1   0  0",
-                           "  0  0  0  0  a11 a10 a9 a8",
-                           " a7 a6 a5  x   x  x  x  x",
-                           "  x  x  x  x   x  x  x  x";
+		 writepage       = "  0  1  0  0   1   1   0  0",
+						   "  0  0  0  0  a11 a10 a9 a8",
+						   " a7 a6 a5  x   x  x  x  x",
+						   "  x  x  x  x   x  x  x  x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 32;
-	readsize	= 256;
-       ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 32;
+	readsize    = 256;
+	   ;
 #   ATtiny84 has Signature Bytes: 0x1E 0x93 0x0C.
-     memory "signature"
-         size            = 3;
-         read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                           "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-       ;
+	 memory "signature"
+		 size            = 3;
+		 read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						   "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	   ;
 
-     memory "lock"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
-                           "x x x x  x x x x  x x x x  x x i i";
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
-                           "0 0 0 0  0 0 0 0  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+	 memory "lock"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 1 1 x  x x x x",
+						   "x x x x  x x x x  x x x x  x x i i";
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  0 0 0 0",
+						   "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "lfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "lfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "hfuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                           "x x x x  x x x x  i i i i  i i i i";
+	 memory "hfuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						   "x x x x  x x x x  i i i i  i i i i";
 
-         read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-       ;
+		 read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	   ;
 
-     memory "efuse"
-         size            = 1;
-         write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                           "x x x x  x x x x  x x x x  x x x i";
+	 memory "efuse"
+		 size            = 1;
+		 write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						   "x x x x  x x x x  x x x x  x x x i";
 
-         read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                           "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-     ;
+		 read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						   "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	 ;
 
-     memory "calibration"
-         size            = 1;
-         read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
-                           "0  0  0  0   0  0  0  a0   o o o o  o o o o";
-     ;
+	 memory "calibration"
+		 size            = 1;
+		 read            = "0  0  1  1   1  0  0  0    0 0 0 x  x x x x",
+						   "0  0  0  0   0  0  0  a0   o o o o  o o o o";
+	 ;
   ;
 
 #------------------------------------------------------------
@@ -11672,187 +11672,187 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m32u4";
-    desc             = "ATmega32U4";
-    signature        = 0x1e 0x95 0x87;
-    has_jtag         = yes;
+	id               = "m32u4";
+	desc             = "ATmega32U4";
+	signature        = 0x1e 0x95 0x87;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -11860,187 +11860,187 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "usb646";
-    desc             = "AT90USB646";
-    signature        = 0x1e 0x96 0x82;
-    has_jtag         = yes;
+	id               = "usb646";
+	desc             = "AT90USB646";
+	signature        = 0x1e 0x96 0x82;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -12049,187 +12049,187 @@ part
 # identical to AT90USB646
 
 part
-    id               = "usb647";
-    desc             = "AT90USB647";
-    signature        = 0x1e 0x96 0x82;
-    has_jtag         = yes;
+	id               = "usb647";
+	desc             = "AT90USB647";
+	signature        = 0x1e 0x96 0x82;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -12237,187 +12237,187 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "usb1286";
-    desc             = "AT90USB1286";
-    signature        = 0x1e 0x97 0x82;
-    has_jtag         = yes;
+	id               = "usb1286";
+	desc             = "AT90USB1286";
+	signature        = 0x1e 0x97 0x82;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -12426,187 +12426,187 @@ part
 # identical to AT90USB1286
 
 part
-    id               = "usb1287";
-    desc             = "AT90USB1287";
-    signature        = 0x1e 0x97 0x82;
-    has_jtag         = yes;
+	id               = "usb1287";
+	desc             = "AT90USB1287";
+	signature        = 0x1e 0x97 0x82;
+	has_jtag         = yes;
 #    stk500_devcode   = 0xB2;
 #    avr910_devcode   = 0x43;
-    chip_erase_delay = 9000;
-    pagel            = 0xD7;
-    bs2              = 0xA0;
-    reset            = dedicated;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase_delay = 9000;
+	pagel            = 0xD7;
+	bs2              = 0xA0;
+	reset            = dedicated;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "x x x x  x x x x    x x x x  x x x x";
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    rampz               = 0x3b;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	rampz               = 0x3b;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 4096;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 4096;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  x   x   x   x    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  x   x   x   x    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0  a2  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
 			  "  0   0   x   x      x a10  a9  a8",
 			  " a7  a6  a5  a4     a3   0   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 10;
-	blocksize	= 8;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 10;
+	blocksize   = 8;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 131072;
-        page_size       = 256;
-        num_pages       = 512;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 131072;
+		page_size       = 256;
+		num_pages       = 512;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7   x   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7   x   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 256;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 256;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  x x x x  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  x x x x  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    x x x x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   x  x  x  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 
@@ -12615,179 +12615,179 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "usb162";
-    desc             = "AT90USB162";
-    has_jtag         = no;
-    has_debugwire    = yes;
-    signature        = 0x1e 0x94 0x82;
-    chip_erase_delay = 9000;
-    reset            = io;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
-    pagel            = 0xD7;
-    bs2              = 0xC6;
+	id               = "usb162";
+	desc             = "AT90USB162";
+	has_jtag         = no;
+	has_debugwire    = yes;
+	signature        = 0x1e 0x94 0x82;
+	chip_erase_delay = 9000;
+	reset            = io;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
+	pagel            = 0xD7;
+	bs2              = 0xC6;
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        num_pages       = 128;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		num_pages       = 128;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2   0   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 4;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 4;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 16384;
-        page_size       = 128;
-        num_pages       = 128;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 16384;
+		page_size       = 128;
+		num_pages       = 128;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -12799,179 +12799,179 @@ part
 #        num_pages       = 64;
 
 part
-    id               = "usb82";
-    desc             = "AT90USB82";
-    has_jtag         = no;
-    has_debugwire    = yes;
-    signature        = 0x1e 0x93 0x82;
-    chip_erase_delay = 9000;
-    reset            = io;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "x x x x  x x x x    x x x x  x x x x";
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
-                       "x x x x  x x x x    x x x x  x x x x";
-    pagel            = 0xD7;
-    bs2              = 0xC6;
+	id               = "usb82";
+	desc             = "AT90USB82";
+	has_jtag         = no;
+	has_debugwire    = yes;
+	signature        = 0x1e 0x93 0x82;
+	chip_erase_delay = 9000;
+	reset            = io;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "x x x x  x x x x    x x x x  x x x x";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 x  x x x x",
+					   "x x x x  x x x x    x x x x  x x x x";
+	pagel            = 0xD7;
+	bs2              = 0xC6;
 
-    timeout		= 200;
-    stabdelay		= 100;
-    cmdexedelay		= 25;
-    synchloops		= 32;
-    bytedelay		= 0;
-    pollindex		= 3;
-    pollvalue		= 0x53;
-    predelay		= 1;
-    postdelay		= 1;
-    pollmethod		= 1;
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	timeout     = 200;
+	stabdelay       = 100;
+	cmdexedelay     = 25;
+	synchloops      = 32;
+	bytedelay       = 0;
+	pollindex       = 3;
+	pollvalue       = 0x53;
+	predelay        = 1;
+	postdelay       = 1;
+	pollmethod      = 1;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 512;
-        num_pages       = 128;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 512;
+		num_pages       = 128;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-	loadpage_lo	= "  1   1   0   0      0   0   0   1",
+	loadpage_lo = "  1   1   0   0      0   0   0   1",
 			  "  0   0   0   0      0   0   0   0",
 			  "  0   0   0   0      0   0  a1  a0",
 			  "  i   i   i   i      i   i   i   i";
 
-	writepage	= "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2   0   0",
+	writepage   = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2   0   0",
 			  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 20;
-	blocksize	= 4;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 20;
+	blocksize   = 4;
+	readsize    = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 8192;
-        page_size       = 128;
-        num_pages       = 64;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0x00;
-        readback_p2     = 0x00;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 8192;
+		page_size       = 128;
+		num_pages       = 64;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0x00;
+		readback_p2     = 0x00;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  x   x   x   x      x   x   x   x",
-                          "  x   x  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  x   x   x   x      x   x   x   x",
+						  "  x   x  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "a15 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6   x   x      x   x   x   x",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "a15 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6   x   x      x   x   x   x",
+						  "  x   x   x   x      x   x   x   x";
 
-	mode		= 0x41;
-	delay		= 6;
-	blocksize	= 128;
-	readsize	= 256;
-      ;
+	mode        = 0x41;
+	delay       = 6;
+	blocksize   = 128;
+	readsize    = 256;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "lfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "hfuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  1 0 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  1 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "x x x x  x x x x  i i i i  i i i i";
+	memory "efuse"
+		size            = 1;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "x x x x  x x x x  i i i i  i i i i";
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "x x x x  x x x x  o o o o  o o o o";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "x x x x  x x x x  o o o o  o o o o";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
-                          "x x x x  x x x x   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 x  x x x x",
+						  "x x x x  x x x x   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "calibration"
-        size            = 1;
-        read            = "0 0 1 1  1 0 0 0    0 0 0 x  x x x x",
-                          "0 0 0 0  0 0 0 0    o o o o  o o o o";
-      ;
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
-                          "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "calibration"
+		size            = 1;
+		read            = "0 0 1 1  1 0 0 0    0 0 0 x  x x x x",
+						  "0 0 0 0  0 0 0 0    o o o o  o o o o";
+	  ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  x   x  x  x  x",
+						  "x  x  x  x   x  x a1 a0   o  o  o  o   o  o  o  o";
+	  ;
   ;
 
 #------------------------------------------------------------
@@ -12979,188 +12979,188 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m325";
-    desc             = "ATMEGA325";
-    signature        = 0x1e 0x95 0x05;
-    has_jtag         = yes;
+	id               = "m325";
+	desc             = "ATMEGA325";
+	signature        = 0x1e 0x95 0x05;
+	has_jtag         = yes;
 #   stk500_devcode   = 0x??; # No STK500v1 support?
 #   avr910_devcode   = 0x??; # Try the ATmega16 one
-    avr910_devcode   = 0x74;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	avr910_devcode   = 0x74;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    timeout             = 200;
-    stabdelay           = 100;
-    cmdexedelay         = 25;
-    synchloops          = 32;
-    bytedelay           = 0;
-    pollindex           = 3;
-    pollvalue           = 0x53;
-    predelay            = 1;
-    postdelay           = 1;
-    pollmethod          = 1;
+	timeout             = 200;
+	stabdelay           = 100;
+	cmdexedelay         = 25;
+	synchloops          = 32;
+	bytedelay           = 0;
+	pollindex           = 3;
+	pollvalue           = 0x53;
+	predelay            = 1;
+	postdelay           = 1;
+	pollmethod          = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_lo     = "  1   1   0   0      0   0   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  1   1   0   0      0   0   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2   0   0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2   0   0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 4;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 4;
+		readsize        = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 128;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 128;
+		readsize        = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
-                          "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
+						  "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 #------------------------------------------------------------
@@ -13168,188 +13168,188 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m645";
-    desc             = "ATMEGA645";
-    signature        = 0x1E 0x96 0x05;
-    has_jtag         = yes;
+	id               = "m645";
+	desc             = "ATMEGA645";
+	signature        = 0x1E 0x96 0x05;
+	has_jtag         = yes;
 #   stk500_devcode   = 0x??; # No STK500v1 support?
 #   avr910_devcode   = 0x??; # Try the ATmega16 one
-    avr910_devcode   = 0x74;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	avr910_devcode   = 0x74;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    timeout             = 200;
-    stabdelay           = 100;
-    cmdexedelay         = 25;
-    synchloops          = 32;
-    bytedelay           = 0;
-    pollindex           = 3;
-    pollvalue           = 0x53;
-    predelay            = 1;
-    postdelay           = 1;
-    pollmethod          = 1;
+	timeout             = 200;
+	stabdelay           = 100;
+	cmdexedelay         = 25;
+	synchloops          = 32;
+	bytedelay           = 0;
+	pollindex           = 3;
+	pollvalue           = 0x53;
+	predelay            = 1;
+	postdelay           = 1;
+	pollmethod          = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_lo     = "  1   1   0   0      0   0   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  1   1   0   0      0   0   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3   0   0   0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3   0   0   0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 8;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 8;
+		readsize        = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "   0   0   1   0      0   0   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "   0   0   1   0      0   0   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   o   o   o   o      o   o   o   o";
 
-        read_hi         = "   0   0   1   0      1   0   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   o   o   o   o      o   o   o   o";
+		read_hi         = "   0   0   1   0      1   0   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          "  a7 a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  "  a7 a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          "  a7 a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  "  a7 a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "   0   1   0   0      1   1   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   0   0   0   0      0   0   0   0";
+		writepage       = "   0   1   0   0      1   1   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   0   0   0   0      0   0   0   0";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 128;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 128;
+		readsize        = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
-                          "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
+						  "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 #------------------------------------------------------------
@@ -13357,188 +13357,188 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m3250";
-    desc             = "ATMEGA3250";
-    signature        = 0x1E 0x95 0x06;
-    has_jtag         = yes;
+	id               = "m3250";
+	desc             = "ATMEGA3250";
+	signature        = 0x1E 0x95 0x06;
+	has_jtag         = yes;
 #   stk500_devcode   = 0x??; # No STK500v1 support?
 #   avr910_devcode   = 0x??; # Try the ATmega16 one
-    avr910_devcode   = 0x74;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	avr910_devcode   = 0x74;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    timeout             = 200;
-    stabdelay           = 100;
-    cmdexedelay         = 25;
-    synchloops          = 32;
-    bytedelay           = 0;
-    pollindex           = 3;
-    pollvalue           = 0x53;
-    predelay            = 1;
-    postdelay           = 1;
-    pollmethod          = 1;
+	timeout             = 200;
+	stabdelay           = 100;
+	cmdexedelay         = 25;
+	synchloops          = 32;
+	bytedelay           = 0;
+	pollindex           = 3;
+	pollvalue           = 0x53;
+	predelay            = 1;
+	postdelay           = 1;
+	pollmethod          = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 4;  /* for parallel programming */
-        size            = 1024;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 4;  /* for parallel programming */
+		size            = 1024;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_lo     = "  1   1   0   0      0   0   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  1   1   0   0      0   0   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0      0   0  a9  a8",
-                          " a7  a6  a5  a4     a3  a2   0   0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0      0   0  a9  a8",
+						  " a7  a6  a5  a4     a3  a2   0   0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 4;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 4;
+		readsize        = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 32768;
-        page_size       = 128;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "  0   0   1   0      0   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 32768;
+		page_size       = 128;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "  0   0   1   0      0   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        read_hi         = "  0   0   1   0      1   0   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+		read_hi         = "  0   0   1   0      1   0   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  0   1   0   0      1   1   0   0",
-                          "  0 a14 a13 a12    a11 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  0   1   0   0      1   1   0   0",
+						  "  0 a14 a13 a12    a11 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 128;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 128;
+		readsize        = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
-                          "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
+						  "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 #------------------------------------------------------------
@@ -13546,188 +13546,188 @@ part
 #------------------------------------------------------------
 
 part
-    id               = "m6450";
-    desc             = "ATMEGA6450";
-    signature        = 0x1E 0x96 0x06;
-    has_jtag         = yes;
+	id               = "m6450";
+	desc             = "ATMEGA6450";
+	signature        = 0x1E 0x96 0x06;
+	has_jtag         = yes;
 #   stk500_devcode   = 0x??; # No STK500v1 support?
 #   avr910_devcode   = 0x??; # Try the ATmega16 one
-    avr910_devcode   = 0x74;
-    pagel            = 0xd7;
-    bs2              = 0xa0;
-    chip_erase_delay = 9000;
-    pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	avr910_devcode   = 0x74;
+	pagel            = 0xd7;
+	bs2              = 0xa0;
+	chip_erase_delay = 9000;
+	pgm_enable       = "1 0 1 0  1 1 0 0    0 1 0 1  0 0 1 1",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
-                       "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
+	chip_erase       = "1 0 1 0  1 1 0 0    1 0 0 0  0 0 0 0",
+					   "0 0 0 0  0 0 0 0    0 0 0 0  0 0 0 0";
 
-    timeout             = 200;
-    stabdelay           = 100;
-    cmdexedelay         = 25;
-    synchloops          = 32;
-    bytedelay           = 0;
-    pollindex           = 3;
-    pollvalue           = 0x53;
-    predelay            = 1;
-    postdelay           = 1;
-    pollmethod          = 1;
+	timeout             = 200;
+	stabdelay           = 100;
+	cmdexedelay         = 25;
+	synchloops          = 32;
+	bytedelay           = 0;
+	pollindex           = 3;
+	pollvalue           = 0x53;
+	predelay            = 1;
+	postdelay           = 1;
+	pollmethod          = 1;
 
-    pp_controlstack     =
-        0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
-        0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
-        0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
-        0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
-    hventerstabdelay    = 100;
-    progmodedelay       = 0;
-    latchcycles         = 5;
-    togglevtg           = 1;
-    poweroffdelay       = 15;
-    resetdelayms        = 1;
-    resetdelayus        = 0;
-    hvleavestabdelay    = 15;
-    chiperasepulsewidth = 0;
-    chiperasepolltimeout = 10;
-    programfusepulsewidth = 0;
-    programfusepolltimeout = 5;
-    programlockpulsewidth = 0;
-    programlockpolltimeout = 5;
+	pp_controlstack     =
+		0x0E, 0x1E, 0x0F, 0x1F, 0x2E, 0x3E, 0x2F, 0x3F,
+		0x4E, 0x5E, 0x4F, 0x5F, 0x6E, 0x7E, 0x6F, 0x7F,
+		0x66, 0x76, 0x67, 0x77, 0x6A, 0x7A, 0x6B, 0x7B,
+		0xBE, 0xFD, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00;
+	hventerstabdelay    = 100;
+	progmodedelay       = 0;
+	latchcycles         = 5;
+	togglevtg           = 1;
+	poweroffdelay       = 15;
+	resetdelayms        = 1;
+	resetdelayus        = 0;
+	hvleavestabdelay    = 15;
+	chiperasepulsewidth = 0;
+	chiperasepolltimeout = 10;
+	programfusepulsewidth = 0;
+	programfusepolltimeout = 5;
+	programlockpulsewidth = 0;
+	programlockpolltimeout = 5;
 
-    idr                 = 0x31;
-    spmcr               = 0x57;
-    allowfullpagebitstream = no;
+	idr                 = 0x31;
+	spmcr               = 0x57;
+	allowfullpagebitstream = no;
 
-    memory "eeprom"
-        paged           = no; /* leave this "no" */
-        page_size       = 8;  /* for parallel programming */
-        size            = 2048;
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read            = "  1   0   1   0      0   0   0   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  o   o   o   o      o   o   o   o";
+	memory "eeprom"
+		paged           = no; /* leave this "no" */
+		page_size       = 8;  /* for parallel programming */
+		size            = 2048;
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read            = "  1   0   1   0      0   0   0   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  o   o   o   o      o   o   o   o";
 
-        write           = "  1   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		write           = "  1   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_lo     = "  1   1   0   0      0   0   0   1",
-                          "  0   0   0   0      0   0   0   0",
-                          "  0   0   0   0      0  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  1   1   0   0      0   0   0   1",
+						  "  0   0   0   0      0   0   0   0",
+						  "  0   0   0   0      0  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "  1   1   0   0      0   0   1   0",
-                          "  0   0   0   0      0 a10  a9  a8",
-                          " a7  a6  a5  a4     a3   0   0   0",
-                          "  x   x   x   x      x   x   x   x";
+		writepage       = "  1   1   0   0      0   0   1   0",
+						  "  0   0   0   0      0 a10  a9  a8",
+						  " a7  a6  a5  a4     a3   0   0   0",
+						  "  x   x   x   x      x   x   x   x";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 4;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 4;
+		readsize        = 256;
+	  ;
 
-    memory "flash"
-        paged           = yes;
-        size            = 65536;
-        page_size       = 256;
-        num_pages       = 256;
-        min_write_delay = 4500;
-        max_write_delay = 4500;
-        readback_p1     = 0xff;
-        readback_p2     = 0xff;
-        read_lo         = "   0   0   1   0      0   0   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   o   o   o   o      o   o   o   o";
+	memory "flash"
+		paged           = yes;
+		size            = 65536;
+		page_size       = 256;
+		num_pages       = 256;
+		min_write_delay = 4500;
+		max_write_delay = 4500;
+		readback_p1     = 0xff;
+		readback_p2     = 0xff;
+		read_lo         = "   0   0   1   0      0   0   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   o   o   o   o      o   o   o   o";
 
-        read_hi         = "   0   0   1   0      1   0   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   o   o   o   o      o   o   o   o";
+		read_hi         = "   0   0   1   0      1   0   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   o   o   o   o      o   o   o   o";
 
-        loadpage_lo     = "  0   1   0   0      0   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          "  a7 a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_lo     = "  0   1   0   0      0   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  "  a7 a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        loadpage_hi     = "  0   1   0   0      1   0   0   0",
-                          "  0   0   0   0      0   0   0   0",
-                          "  a7 a6  a5  a4     a3  a2  a1  a0",
-                          "  i   i   i   i      i   i   i   i";
+		loadpage_hi     = "  0   1   0   0      1   0   0   0",
+						  "  0   0   0   0      0   0   0   0",
+						  "  a7 a6  a5  a4     a3  a2  a1  a0",
+						  "  i   i   i   i      i   i   i   i";
 
-        writepage       = "   0   1   0   0      1   1   0   0",
-                          " a15 a14 a13 a12    a11 a10  a9  a8",
-                          "  a7  a6  a5  a4     a3  a2  a1  a0",
-                          "   0   0   0   0      0   0   0   0";
+		writepage       = "   0   1   0   0      1   1   0   0",
+						  " a15 a14 a13 a12    a11 a10  a9  a8",
+						  "  a7  a6  a5  a4     a3  a2  a1  a0",
+						  "   0   0   0   0      0   0   0   0";
 
-        mode            = 0x41;
-        delay           = 10;
-        blocksize       = 128;
-        readsize        = 256;
-      ;
+		mode            = 0x41;
+		delay           = 10;
+		blocksize       = 128;
+		readsize        = 256;
+	  ;
 
-    memory "lock"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "x x x x  x x x x   x x o o  o o o o";
+	memory "lock"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "x x x x  x x x x   x x o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 1 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   1 1 i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "lfuse"
-        size            = 1;
-        read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "lfuse"
+		size            = 1;
+		read            = "0 1 0 1  0 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "hfuse"
-        size            = 1;
-        read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
+	memory "hfuse"
+		size            = 1;
+		read            = "0 1 0 1  1 0 0 0   0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0   i i i i  i i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0   1 0 1 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0   i i i i  i i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "efuse"
-        size            = 1;
+	memory "efuse"
+		size            = 1;
 
-        read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
-                          "0 0 0 0  0 0 0 0  o o o o  o o o o";
+		read            = "0 1 0 1  0 0 0 0  0 0 0 0  1 0 0 0",
+						  "0 0 0 0  0 0 0 0  o o o o  o o o o";
 
-        write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
-                          "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
-        min_write_delay = 9000;
-        max_write_delay = 9000;
-      ;
+		write           = "1 0 1 0  1 1 0 0  1 0 1 0  0 1 0 0",
+						  "0 0 0 0  0 0 0 0  1 1 1 1  1 i i i";
+		min_write_delay = 9000;
+		max_write_delay = 9000;
+	  ;
 
-    memory "signature"
-        size            = 3;
-        read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
-                          "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
-      ;
+	memory "signature"
+		size            = 3;
+		read            = "0  0  1  1   0  0  0  0   0  0  0  0   0  0  0  0",
+						  "0  0  0  0   0  0 a1 a0   o  o  o  o   o  o  o  o";
+	  ;
 
-    memory "calibration"
-        size            = 1;
+	memory "calibration"
+		size            = 1;
 
-        read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
-                          "0 0 0 0  0 0 0 0   o o o o  o o o o";
-        ;
+		read            = "0 0 1 1  1 0 0 0   0 0 0 0  0 0 0 0",
+						  "0 0 0 0  0 0 0 0   o o o o  o o o o";
+		;
   ;
 
 #------------------------------------------------------------
@@ -13735,96 +13735,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x64a1";
-    desc	= "ATXMEGA64A1";
-    signature	= 0x1e 0x96 0x4e;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x64a1";
+	desc    = "ATXMEGA64A1";
+	signature   = 0x1e 0x96 0x4e;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00010000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00010000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00001000;
-        offset		= 0x0080f000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00001000;
+		offset      = 0x0080f000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00001000;
-        offset		= 0x00810000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00001000;
+		offset      = 0x00810000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00011000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00011000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -13832,96 +13832,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x128a1";
-    desc	= "ATXMEGA128A1";
-    signature	= 0x1e 0x97 0x4c;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x128a1";
+	desc    = "ATXMEGA128A1";
+	signature   = 0x1e 0x97 0x4c;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00020000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00020000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0081e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0081e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00820000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00820000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00022000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00022000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -13929,96 +13929,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x128a1d";
-    desc	= "ATXMEGA128A1REVD";
-    signature	= 0x1e 0x97 0x41;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x128a1d";
+	desc    = "ATXMEGA128A1REVD";
+	signature   = 0x1e 0x97 0x41;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00020000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00020000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0081e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0081e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00820000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00820000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00022000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00022000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14026,96 +14026,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x192a1";
-    desc	= "ATXMEGA192A1";
-    signature	= 0x1e 0x97 0x4e;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x192a1";
+	desc    = "ATXMEGA192A1";
+	signature   = 0x1e 0x97 0x4e;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00030000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00030000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0082e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0082e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00830000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00830000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00032000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00032000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14123,96 +14123,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x256a1";
-    desc	= "ATXMEGA256A1";
-    signature	= 0x1e 0x98 0x46;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x256a1";
+	desc    = "ATXMEGA256A1";
+	signature   = 0x1e 0x98 0x46;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x1000;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x1000;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00040000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00040000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0083e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0083e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00840000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00840000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00042000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00042000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14220,96 +14220,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x64a3";
-    desc	= "ATXMEGA64A3";
-    signature	= 0x1e 0x96 0x42;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x64a3";
+	desc    = "ATXMEGA64A3";
+	signature   = 0x1e 0x96 0x42;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00010000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00010000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00001000;
-        offset		= 0x0080f000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00001000;
+		offset      = 0x0080f000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00001000;
-        offset		= 0x00810000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00001000;
+		offset      = 0x00810000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00011000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00011000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14317,96 +14317,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x128a3";
-    desc	= "ATXMEGA128A3";
-    signature	= 0x1e 0x97 0x42;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x128a3";
+	desc    = "ATXMEGA128A3";
+	signature   = 0x1e 0x97 0x42;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00020000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00020000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0081e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0081e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00820000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00820000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00022000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00022000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14414,96 +14414,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x192a3";
-    desc	= "ATXMEGA192A3";
-    signature	= 0x1e 0x97 0x44;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x192a3";
+	desc    = "ATXMEGA192A3";
+	signature   = 0x1e 0x97 0x44;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00030000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00030000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0082e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0082e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00830000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00830000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00032000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00032000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14511,96 +14511,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x256a3";
-    desc	= "ATXMEGA256A3";
-    signature	= 0x1e 0x98 0x42;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x256a3";
+	desc    = "ATXMEGA256A3";
+	signature   = 0x1e 0x98 0x42;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x1000;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x1000;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00040000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00040000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0083e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0083e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00840000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00840000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00042000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00042000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14608,96 +14608,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x256a3b";
-    desc	= "ATXMEGA256A3B";
-    signature	= 0x1e 0x98 0x43;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x256a3b";
+	desc    = "ATXMEGA256A3B";
+	signature   = 0x1e 0x98 0x43;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x1000;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x1000;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00040000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00040000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0083e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0083e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00840000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00840000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00042000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00042000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14705,96 +14705,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x16a4";
-    desc	= "ATXMEGA16A4";
-    signature	= 0x1e 0x94 0x41;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x16a4";
+	desc    = "ATXMEGA16A4";
+	signature   = 0x1e 0x94 0x41;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0400;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0400;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00004000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00004000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00001000;
-        offset		= 0x00803000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00001000;
+		offset      = 0x00803000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00001000;
-        offset		= 0x00804000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00001000;
+		offset      = 0x00804000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00005000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00005000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14802,96 +14802,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x32a4";
-    desc	= "ATXMEGA32A4";
-    signature	= 0x1e 0x95 0x41;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x32a4";
+	desc    = "ATXMEGA32A4";
+	signature   = 0x1e 0x95 0x41;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0400;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0400;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00008000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00008000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00001000;
-        offset		= 0x00807000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00001000;
+		offset      = 0x00807000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00001000;
-        offset		= 0x00808000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00001000;
+		offset      = 0x00808000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00009000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00009000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14899,96 +14899,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x64a4";
-    desc	= "ATXMEGA64A4";
-    signature	= 0x1e 0x96 0x46;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x64a4";
+	desc    = "ATXMEGA64A4";
+	signature   = 0x1e 0x96 0x46;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00010000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00010000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00001000;
-        offset		= 0x0080f000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00001000;
+		offset      = 0x0080f000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00001000;
-        offset		= 0x00810000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00001000;
+		offset      = 0x00810000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00011000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00011000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 #------------------------------------------------------------
@@ -14996,96 +14996,96 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "x128a4";
-    desc	= "ATXMEGA128A4";
-    signature	= 0x1e 0x97 0x46;
-    has_jtag	= yes;
-    has_pdi	= yes;
-    nvm_base	= 0x01c0;
+	id      = "x128a4";
+	desc    = "ATXMEGA128A4";
+	signature   = 0x1e 0x97 0x46;
+	has_jtag    = yes;
+	has_pdi = yes;
+	nvm_base    = 0x01c0;
 
-    memory "eeprom"
-        size		= 0x0800;
-        offset		= 0x08c0000;
-        page_size	= 0x20;
-        readsize	= 0x100;
-    ;
+	memory "eeprom"
+		size        = 0x0800;
+		offset      = 0x08c0000;
+		page_size   = 0x20;
+		readsize    = 0x100;
+	;
 
-    memory "application"
-        size		= 0x00020000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "application"
+		size        = 0x00020000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "apptable"
-        size		= 0x00002000;
-        offset		= 0x0081e000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "apptable"
+		size        = 0x00002000;
+		offset      = 0x0081e000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "boot"
-        size		= 0x00002000;
-        offset		= 0x00820000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "boot"
+		size        = 0x00002000;
+		offset      = 0x00820000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "flash"
-        size		= 0x00022000;
-        offset		= 0x0800000;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "flash"
+		size        = 0x00022000;
+		offset      = 0x0800000;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "prodsig"
-        size		= 0x200;
-        offset		= 0x8e0200;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "prodsig"
+		size        = 0x200;
+		offset      = 0x8e0200;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "usersig"
-        size		= 0x200;
-        offset		= 0x8e0400;
-        page_size	= 0x100;
-        readsize	= 0x100;
-    ;
+	memory "usersig"
+		size        = 0x200;
+		offset      = 0x8e0400;
+		page_size   = 0x100;
+		readsize    = 0x100;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x1000090;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x1000090;
+	;
 
-    memory "fuse0"
-        size		= 1;
-        offset		= 0x8f0020;
-    ;
+	memory "fuse0"
+		size        = 1;
+		offset      = 0x8f0020;
+	;
 
-    memory "fuse1"
-        size		= 1;
-        offset		= 0x8f0021;
-    ;
+	memory "fuse1"
+		size        = 1;
+		offset      = 0x8f0021;
+	;
 
-    memory "fuse2"
-        size		= 1;
-        offset		= 0x8f0022;
-    ;
+	memory "fuse2"
+		size        = 1;
+		offset      = 0x8f0022;
+	;
 
-    memory "fuse4"
-        size		= 1;
-        offset		= 0x8f0024;
-    ;
+	memory "fuse4"
+		size        = 1;
+		offset      = 0x8f0024;
+	;
 
-    memory "fuse5"
-        size		= 1;
-        offset		= 0x8f0025;
-    ;
+	memory "fuse5"
+		size        = 1;
+		offset      = 0x8f0025;
+	;
 
-    memory "lock"
-        size		= 1;
-        offset		= 0x8f0027;
-    ;
+	memory "lock"
+		size        = 1;
+		offset      = 0x8f0027;
+	;
 ;
 
 
@@ -15094,20 +15094,20 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "ucr2";
-    desc	= "32UC3A0512";
-    signature	= 0xED 0xC0 0x3F;
-    has_jtag	= yes;
-    is_avr32    = yes;
+	id      = "ucr2";
+	desc    = "32UC3A0512";
+	signature   = 0xED 0xC0 0x3F;
+	has_jtag    = yes;
+	is_avr32    = yes;
 
-    memory "flash"
-        paged           = yes;
-        page_size		= 512;               # bytes
-        readsize		= 512;				 # bytes
-        num_pages       = 1024;              # could be set dynamicly
-        size			= 0x00080000;		 # could be set dynamicly
-        offset			= 0x80000000;
-    ;
+	memory "flash"
+		paged           = yes;
+		page_size       = 512;               # bytes
+		readsize        = 512;               # bytes
+		num_pages       = 1024;              # could be set dynamicly
+		size            = 0x00080000;        # could be set dynamicly
+		offset          = 0x80000000;
+	;
 ;
 
 #------------------------------------------------------------
@@ -15115,38 +15115,38 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "t4";
-    desc	= "ATtiny4";
-    signature	= 0x1e 0x8f 0x0a;
-    has_tpi	= yes;
+	id      = "t4";
+	desc    = "ATtiny4";
+	signature   = 0x1e 0x8f 0x0a;
+	has_tpi = yes;
 
-    memory "flash"
-        size		= 512;
-        offset		= 0x4000;
-        page_size	= 16;
-        blocksize	= 128;
-    ;
+	memory "flash"
+		size        = 512;
+		offset      = 0x4000;
+		page_size   = 16;
+		blocksize   = 128;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x3fc0;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x3fc0;
+	;
 
-    memory "fuse"
-        size		= 1;
-        offset		= 0x3f40;
-	blocksize	= 4;
-    ;
+	memory "fuse"
+		size        = 1;
+		offset      = 0x3f40;
+	blocksize   = 4;
+	;
 
-    memory "calibration"
-        size		= 1;
-        offset		= 0x3f80;
-    ;
+	memory "calibration"
+		size        = 1;
+		offset      = 0x3f80;
+	;
 
-    memory "lockbits"
-        size		= 1;
-        offset		= 0x3f00;
-    ;
+	memory "lockbits"
+		size        = 1;
+		offset      = 0x3f00;
+	;
 ;
 
 
@@ -15155,38 +15155,38 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "t5";
-    desc	= "ATtiny5";
-    signature	= 0x1e 0x8f 0x09;
-    has_tpi	= yes;
+	id      = "t5";
+	desc    = "ATtiny5";
+	signature   = 0x1e 0x8f 0x09;
+	has_tpi = yes;
 
-    memory "flash"
-        size		= 512;
-        offset		= 0x4000;
-        page_size	= 16;
-        blocksize	= 128;
-    ;
+	memory "flash"
+		size        = 512;
+		offset      = 0x4000;
+		page_size   = 16;
+		blocksize   = 128;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x3fc0;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x3fc0;
+	;
 
-    memory "fuse"
-        size		= 1;
-        offset		= 0x3f40;
-	blocksize	= 4;
-    ;
+	memory "fuse"
+		size        = 1;
+		offset      = 0x3f40;
+	blocksize   = 4;
+	;
 
-    memory "calibration"
-        size		= 1;
-        offset		= 0x3f80;
-    ;
+	memory "calibration"
+		size        = 1;
+		offset      = 0x3f80;
+	;
 
-    memory "lockbits"
-        size		= 1;
-        offset		= 0x3f00;
-    ;
+	memory "lockbits"
+		size        = 1;
+		offset      = 0x3f00;
+	;
 ;
 
 
@@ -15195,38 +15195,38 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "t8";
-    desc	= "ATtiny9";
-    signature	= 0x1e 0x90 0x08;
-    has_tpi	= yes;
+	id      = "t8";
+	desc    = "ATtiny9";
+	signature   = 0x1e 0x90 0x08;
+	has_tpi = yes;
 
-    memory "flash"
-        size		= 1024;
-        offset		= 0x4000;
-        page_size	= 16;
-        blocksize	= 128;
-    ;
+	memory "flash"
+		size        = 1024;
+		offset      = 0x4000;
+		page_size   = 16;
+		blocksize   = 128;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x3fc0;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x3fc0;
+	;
 
-    memory "fuse"
-        size		= 1;
-        offset		= 0x3f40;
-	blocksize	= 4;
-    ;
+	memory "fuse"
+		size        = 1;
+		offset      = 0x3f40;
+	blocksize   = 4;
+	;
 
-    memory "calibration"
-        size		= 1;
-        offset		= 0x3f80;
-    ;
+	memory "calibration"
+		size        = 1;
+		offset      = 0x3f80;
+	;
 
-    memory "lockbits"
-        size		= 1;
-        offset		= 0x3f00;
-    ;
+	memory "lockbits"
+		size        = 1;
+		offset      = 0x3f00;
+	;
 ;
 
 
@@ -15235,38 +15235,38 @@ part
 #------------------------------------------------------------
 
 part
-    id		= "t10";
-    desc	= "ATtiny10";
-    signature	= 0x1e 0x90 0x03;
-    has_tpi	= yes;
+	id      = "t10";
+	desc    = "ATtiny10";
+	signature   = 0x1e 0x90 0x03;
+	has_tpi = yes;
 
-    memory "flash"
-        size		= 1024;
-        offset		= 0x4000;
-        page_size	= 16;
-        blocksize	= 128;
-    ;
+	memory "flash"
+		size        = 1024;
+		offset      = 0x4000;
+		page_size   = 16;
+		blocksize   = 128;
+	;
 
-    memory "signature"
-        size		= 3;
-        offset		= 0x3fc0;
-    ;
+	memory "signature"
+		size        = 3;
+		offset      = 0x3fc0;
+	;
 
-    memory "fuse"
-        size		= 1;
-        offset		= 0x3f40;
-	blocksize	= 4;
-    ;
+	memory "fuse"
+		size        = 1;
+		offset      = 0x3f40;
+	blocksize   = 4;
+	;
 
-    memory "calibration"
-        size		= 1;
-        offset		= 0x3f80;
-    ;
+	memory "calibration"
+		size        = 1;
+		offset      = 0x3f80;
+	;
 
-    memory "lockbits"
-        size		= 1;
-        offset		= 0x3f00;
-    ;
+	memory "lockbits"
+		size        = 1;
+		offset      = 0x3f00;
+	;
 ;
 
 
diff --git a/buildroot/tests/mks_tinybee b/buildroot/tests/mks_tinybee
index 8b5aa0f075..9dcc33ede7 100755
--- a/buildroot/tests/mks_tinybee
+++ b/buildroot/tests/mks_tinybee
@@ -21,10 +21,10 @@ exec_test $1 "$2" "MKS TinyBee with ESP3D_WIFISUPPORT" "$3"
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_MKS_TINYBEE \
-	LCD_LANGUAGE en \
-	LCD_INFO_SCREEN_STYLE 0 \
-	DISPLAY_CHARSET_HD44780 WESTERN \
-	NEOPIXEL_TYPE NEO_RGB
+        LCD_LANGUAGE en \
+        LCD_INFO_SCREEN_STYLE 0 \
+        DISPLAY_CHARSET_HD44780 WESTERN \
+        NEOPIXEL_TYPE NEO_RGB
 opt_enable FYSETC_MINI_12864_2_1 SDSUPPORT
 opt_enable LED_CONTROL_MENU LED_USER_PRESET_STARTUP LED_COLOR_PRESETS NEOPIXEL_LED
 exec_test $1 $2 "MKS TinyBee with NeoPixel LCD, SD and Speaker" "$3"
diff --git a/buildroot/web-ui/data/www/webmarlin.js b/buildroot/web-ui/data/www/webmarlin.js
index 943f7b9c08..3eb5139fb1 100644
--- a/buildroot/web-ui/data/www/webmarlin.js
+++ b/buildroot/web-ui/data/www/webmarlin.js
@@ -41,7 +41,7 @@ var WmButtonGroups = {
 var wmWebSoket = {
   WSObject: null,
   Connect: function() {
-	WsUrl=`ws://${location.host}/ws`;
+    WsUrl=`ws://${location.host}/ws`;
     try {
       if(wmWebSoket.WSObject === null) {
         jsLog.Debug("WebSocket: Trying connecting to " + WsUrl);