diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/uart.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/uart.c
index 1119659..f3cf0ed 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/uart.c
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/uart.c
@@ -1,198 +1,145 @@
-/*
- * Copyright (c) 2006-2011 by Roland Riegel <feedback@roland-riegel.de>
+/*-
+ * Copyright (c) 2013 Oliver Lehmann
+ * All rights reserved.
  *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * $Id: uart.c,v 1.6 2013/05/04 15:40:14 olivleh1 Exp $
  */
 
 #include <stdio.h>
 #include <avr/interrupt.h>
 #include <avr/io.h>
-#include <avr/pgmspace.h>
 #include <avr/sfr_defs.h>
 #include <avr/sleep.h>
 
 #include "uart.h"
 #include "wdc_config.h"
 
-/* some mcus have multiple uarts */
-#ifdef UDR0
-#define UBRRH UBRR0H
-#define UBRRL UBRR0L
-#define UDR UDR0
+/* Define baud rate */
+#define BAUD         9600UL
+#define UBBR_VALUE   (( F_CPU / ( BAUD * 16 )) - 1 )
 
-#define UCSRA UCSR0A
-#define UDRE UDRE0
-#define RXC RXC0
 
-#define UCSRB UCSR0B
-#define RXEN RXEN0
-#define TXEN TXEN0
-#define RXCIE RXCIE0
-
-#define UCSRC UCSR0C
-#define URSEL 
-#define UCSZ0 UCSZ00
-#define UCSZ1 UCSZ01
-#define UCSRC_SELECT 0
-#else
-#define UCSRC_SELECT (1 << URSEL)
-#endif
-
-#ifndef USART_RXC_vect
-#if defined(UART0_RX_vect)
-#define USART_RXC_vect UART0_RX_vect
-#elif defined(UART_RX_vect)
-#define USART_RXC_vect UART_RX_vect
-#elif defined(USART0_RX_vect)
-#define USART_RXC_vect USART0_RX_vect
-#elif defined(USART_RX_vect)
-#define USART_RXC_vect USART_RX_vect
-#elif defined(USART0_RXC_vect)
-#define USART_RXC_vect USART0_RXC_vect
-#elif defined(USART_RXC_vect)
-#define USART_RXC_vect USART_RXC_vect
-#else
-#error "Uart receive complete interrupt not defined!"
-#endif
-#endif
-
-#define BAUD 9600UL
-#define UBRRVAL (F_CPU/(BAUD*16)-1)
-#define USE_SLEEP 1
-
-void uart_init()
+void uart_init ()
 {
-    /* set baud rate */
-    UBRRH = UBRRVAL >> 8;
-    UBRRL = UBRRVAL & 0xff;
-    /* set frame format: 8 bit, no parity, 1 bit */
-    UCSRC = UCSRC_SELECT | (1 << UCSZ1) | (1 << UCSZ0);
-    /* enable serial receiver and transmitter */
-#if !USE_SLEEP
-    UCSRB = (1 << RXEN) | (1 << TXEN);
-#else
-    UCSRB = (1 << RXEN) | (1 << TXEN) | (1 << RXCIE);
-#endif
+    /* Set baud rate */
+    UBRR0H = (uint8_t)( UBBR_VALUE >> 8 );
+    UBRR0L = (uint8_t)UBBR_VALUE;
+    /* Set frame format to 8 data bits, no parity, 1 stop bit */
+    UCSR0C = ( 0 << USBS0 ) | ( 1 << UCSZ01 ) | ( 1 << UCSZ00 );
+    /* Enable receiver and transmitter */
+    UCSR0B = ( 1 << RXEN0 ) | ( 1 << TXEN0 );
 }
 
-void uart_putc(uint8_t c)
+void uart_putc ( uint8_t data )
 {
-    if(c == '\n')
-        uart_putc('\r');
+    /* Wait if a byte is being transmitted */
+    while ( ( UCSR0A & ( 1 << UDRE0 ) ) == 0 ) {}
 
-    /* wait until transmit buffer is empty */
-    while(!(UCSRA & (1 << UDRE)));
-
-    /* send next byte */
-    UDR = c;
+    /* Transmit data */
+    UDR0 = data;
 }
 
-void uart_putc_hex(uint8_t b)
+void uart_putc_hex ( uint8_t b )
 {
     /* upper nibble */
-    if((b >> 4) < 0x0a)
-        uart_putc((b >> 4) + '0');
-    else
-        uart_putc((b >> 4) - 0x0a + 'a');
+    if ( ( b >> 4 ) < 0x0a ) {
+        uart_putc ( ( b >> 4 ) + '0' );
+    } else {
+        uart_putc ( ( b >> 4 ) - 0x0a + 'a' );
+    }
 
     /* lower nibble */
-    if((b & 0x0f) < 0x0a)
-        uart_putc((b & 0x0f) + '0');
-    else
-        uart_putc((b & 0x0f) - 0x0a + 'a');
+    if ( ( b & 0x0f ) < 0x0a ) {
+        uart_putc ( ( b & 0x0f ) + '0' );
+    } else {
+        uart_putc ( ( b & 0x0f ) - 0x0a + 'a' );
+    }
 }
 
-void uart_putw_hex(uint16_t w)
-{
-    uart_putc_hex((uint8_t) (w >> 8));
-    uart_putc_hex((uint8_t) (w & 0xff));
-}
-
-void uart_putdw_hex(uint32_t dw)
-{
-    uart_putw_hex((uint16_t) (dw >> 16));
-    uart_putw_hex((uint16_t) (dw & 0xffff));
-}
-
-void uart_putw_dec(uint16_t w)
+void uart_putw_dec ( uint16_t w )
 {
     uint16_t num = 10000;
-    uint8_t started = 0;
+    uint8_t  started = 0;
 
-    while(num > 0)
-    {
+    while ( num > 0 ) {
         uint8_t b = w / num;
-        if(b > 0 || started || num == 1)
-        {
-            uart_putc('0' + b);
+
+        if ( b > 0 || started || num == 1 ) {
+            uart_putc ( '0' + b );
             started = 1;
         }
-        w -= b * num;
 
+        w -= b * num;
         num /= 10;
     }
 }
 
-void uart_putdw_dec(uint32_t dw)
+void uart_putdw_dec ( uint32_t dw )
 {
     uint32_t num = 1000000000;
-    uint8_t started = 0;
+    uint8_t  started = 0;
 
-    while(num > 0)
-    {
+    while ( num > 0 ) {
         uint8_t b = dw / num;
-        if(b > 0 || started || num == 1)
-        {
-            uart_putc('0' + b);
+
+        if ( b > 0 || started || num == 1 ) {
+            uart_putc ( '0' + b );
             started = 1;
         }
-        dw -= b * num;
 
+        dw -= b * num;
         num /= 10;
     }
 }
 
-void uart_puts(const char* str)
+void uart_put_nl ()
 {
-    while(*str)
-        uart_putc(*str++);
+    uart_putc ( '\n' );
+    uart_putc ( '\r' );
 }
 
-void uart_puts_p(PGM_P str)
+void uart_putstring ( PGM_P str, bool newline )
 {
-    while(1)
-    {
-        uint8_t b = pgm_read_byte_near(str++);
-        if(!b)
-            break;
+    uint8_t i = 0;
 
-        uart_putc(b);
+    while ( 1 ) {
+        char c = pgm_read_byte ( &str[i] );
+
+        if ( c != '\0' ) {
+            uart_putc ( c );
+            i++;
+        } else {
+            break;
+        }
+    }
+
+    if ( newline ) {
+        uart_put_nl();
     }
 }
 
-uint8_t uart_getc()
-{
-    uint8_t b;
-    /* wait until receive buffer is full */
-#if USE_SLEEP
-    uint8_t sreg = SREG;
-    sei();
-
-    while(!(UCSRA & (1 << RXC)))
-        sleep_mode();
-
-    SREG = sreg;
-#else
-    while(!(UCSRA & (1 << RXC)));
-#endif
-
-    b = UDR;
-    if(b == '\r')
-        b = '\n';
-
-    return b;
-}
-
-EMPTY_INTERRUPT(USART_RXC_vect)
\ No newline at end of file
+EMPTY_INTERRUPT ( USART0_RX_vect )
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/uart.h b/P8000_WDC_Emulator/P8000_WDC_Emulator/uart.h
index 15658ca..8be2d71 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/uart.h
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/uart.h
@@ -1,15 +1,39 @@
-/*
- * Copyright (c) 2006-2011 by Roland Riegel <feedback@roland-riegel.de>
+/*-
+ * Copyright (c) 2013 Oliver Lehmann
+ * All rights reserved.
  *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer
+ *    in this position and unchanged.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ */
+
+/*
+ * $Id: uart.h,v 1.2 2013/05/04 15:40:14 olivleh1 Exp $
  */
 
 #ifndef UART_H
 #define UART_H
 
 #include <stdint.h>
+#include <stdbool.h>
 #include <avr/pgmspace.h>
 
 #ifdef __cplusplus
@@ -17,21 +41,19 @@ extern "C"
 {
 #endif
 
-void uart_init();
+void uart_init ();
 
-void uart_putc(uint8_t c);
+void uart_putc ( uint8_t c );
 
-void uart_putc_hex(uint8_t b);
-void uart_putw_hex(uint16_t w);
-void uart_putdw_hex(uint32_t dw);
+void uart_putc_hex ( uint8_t b );
 
-void uart_putw_dec(uint16_t w);
-void uart_putdw_dec(uint32_t dw);
+void uart_putw_dec ( uint16_t w );
+void uart_putdw_dec ( uint32_t dw );
 
-void uart_puts(const char* str);
-void uart_puts_p(PGM_P str);
+void uart_puts ( const char *str );
+void uart_putstring ( PGM_P str, bool newline );
 
-uint8_t uart_getc();
+void uart_put_nl ();
 
 #ifdef __cplusplus
 }
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_avr.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_avr.c
index 7279ba3..4702b42 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_avr.c
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_avr.c
@@ -26,10 +26,9 @@
  */
 
 /*
- * $Id: wdc_avr.c,v 1.5 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_avr.c,v 1.6 2013/05/04 15:40:14 olivleh1 Exp $
  */
 
-
 #include <avr/io.h>
 #include "wdc_config.h"
 #include "wdc_avr.h"
@@ -37,7 +36,7 @@
 #include "wdc_drv_pata.h"
 #include "wdc_if_disk.h"
 
-void wdc_init_avr()
+void wdc_init_avr ()
 {
     /* configure the P8000 interface */
     configure_pin_status0();
@@ -81,11 +80,12 @@ void wdc_init_avr()
     ata_da2_disable();
 }
 
-void wdc_get_sysconf()
+void wdc_get_sysconf ()
 {
     enable_sysconf();
     nop();
     nop();
+
     if ( jumper_pata_set() ) {
         drv_init = pata_init;
         drv_read_block = pata_read_block;
@@ -99,5 +99,6 @@ void wdc_get_sysconf()
         drv_read_multiblock = mmc_read_multiblock;
         drv_write_multiblock = mmc_write_multiblock;
     }
+
     disable_sysconf();
 }
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_avr.h b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_avr.h
index 55e2729..15f7b20 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_avr.h
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_avr.h
@@ -26,26 +26,25 @@
  */
 
 /*
- * $Id: wdc_avr.h,v 1.6 2013/04/21 20:19:41 olivleh1 Exp $
+ * $Id: wdc_avr.h,v 1.7 2013/05/04 15:40:14 olivleh1 Exp $
  */
 
-
 #ifndef WDC_AVR_H_
 #define WDC_AVR_H_
 
 #define configure_port_data_read()  DDR_DATA = 0x00                /* programs the DATA-Port as Input-only for reading from the P8000*/
 #define configure_port_data_write() DDR_DATA = 0xff                /* programs the DATA-Port as Out-only for writing to the P8000*/
 
-#define configure_pin_status0()     DDR_INFO |=  ( 1 << PIN_INFO_STATUS0 )
-#define configure_pin_status1()     DDR_INFO |=  ( 1 << PIN_INFO_STATUS1 )
-#define configure_pin_status2()     DDR_INFO |=  ( 1 << PIN_INFO_STATUS2 )
+#define configure_pin_status0()     DDR_INFO |= ( 1 << PIN_INFO_STATUS0 )
+#define configure_pin_status1()     DDR_INFO |= ( 1 << PIN_INFO_STATUS1 )
+#define configure_pin_status2()     DDR_INFO |= ( 1 << PIN_INFO_STATUS2 )
 #define configure_pin_te()          DDR_INFO &= ~( 1 << PIN_INFO_TE )
 #define configure_pin_wdardy()      DDR_INFO &= ~( 1 << PIN_INFO_WDARDY )
-#define configure_pin_tr()          DDR_INFO |=  ( 1 << PIN_INFO_TR )
+#define configure_pin_tr()          DDR_INFO |= ( 1 << PIN_INFO_TR )
 #define configure_pin_reset()       DDR_INFO &= ~( 1 << PIN_INFO_RST ); PORT_INFO |= ( 1 << PIN_INFO_RST )
 
-#define port_data_set(x)            ( PORT_DATA = ( x ) )
-#define port_info_set(x)            ( PORT_INFO = ( x ) )
+#define port_data_set( x )            ( PORT_DATA = ( x ) )
+#define port_info_set( x )            ( PORT_INFO = ( x ) )
 #define port_data_get()             PIN_DATA
 #define port_info_get()             PIN_INFO
 
@@ -54,30 +53,30 @@
 #define configure_pin_addr1()       DDR_ADRDEC |= ( 1 << PIN_ADRDEC_ADDR1 )
 #define configure_pin_addr2()       DDR_ADRDEC |= ( 1 << PIN_ADRDEC_ADDR2 )
 
-#define init_addressdecoder()       PORT_ADRDEC &=  ~( ( 1 << PIN_ADRDEC_ADDR0 ) | ( 1 << PIN_ADRDEC_ADDR1 ) | ( 1 << PIN_ADRDEC_ADDR2 ) )
-#define enable_p8000com()           PORT_ADRDEC |=   ( 1 << PIN_ADRDEC_ADDR0 )
-#define disable_p8000com()          PORT_ADRDEC &=  ~( 1 << PIN_ADRDEC_ADDR0 )
-#define enable_rdwrtoata()          PORT_ADRDEC |=   ( 1 << PIN_ADRDEC_ADDR1 )
-#define disable_rdwrtoata()         PORT_ADRDEC &=  ~( 1 << PIN_ADRDEC_ADDR1 )
-#define enable_atalatch()           PORT_ADRDEC |=   ( ( 1 << PIN_ADRDEC_ADDR0 ) | ( 1 << PIN_ADRDEC_ADDR1 ))
-#define disable_atalatch()          PORT_ADRDEC &=  ~( ( 1 << PIN_ADRDEC_ADDR0 ) | ( 1 << PIN_ADRDEC_ADDR1 ))
-#define enable_sysconf()            PORT_ADRDEC |=   ( ( 1 << PIN_ADRDEC_ADDR0 ) | ( 1 << PIN_ADRDEC_ADDR1 ) | ( 1 << PIN_ADRDEC_ADDR2 ) )
-#define disable_sysconf()           PORT_ADRDEC &=  ~( ( 1 << PIN_ADRDEC_ADDR0 ) | ( 1 << PIN_ADRDEC_ADDR1 ) | ( 1 << PIN_ADRDEC_ADDR2 ) )
+#define init_addressdecoder()       PORT_ADRDEC &= ~( ( 1 << PIN_ADRDEC_ADDR0 ) | ( 1 << PIN_ADRDEC_ADDR1 ) | ( 1 << PIN_ADRDEC_ADDR2 ) )
+#define enable_p8000com()           PORT_ADRDEC |= ( 1 << PIN_ADRDEC_ADDR0 )
+#define disable_p8000com()          PORT_ADRDEC &= ~( 1 << PIN_ADRDEC_ADDR0 )
+#define enable_rdwrtoata()          PORT_ADRDEC |= ( 1 << PIN_ADRDEC_ADDR1 )
+#define disable_rdwrtoata()         PORT_ADRDEC &= ~( 1 << PIN_ADRDEC_ADDR1 )
+#define enable_atalatch()           PORT_ADRDEC |= ( ( 1 << PIN_ADRDEC_ADDR0 ) | ( 1 << PIN_ADRDEC_ADDR1 ))
+#define disable_atalatch()          PORT_ADRDEC &= ~( ( 1 << PIN_ADRDEC_ADDR0 ) | ( 1 << PIN_ADRDEC_ADDR1 ))
+#define enable_sysconf()            PORT_ADRDEC |= ( ( 1 << PIN_ADRDEC_ADDR0 ) | ( 1 << PIN_ADRDEC_ADDR1 ) | ( 1 << PIN_ADRDEC_ADDR2 ) )
+#define disable_sysconf()           PORT_ADRDEC &= ~( ( 1 << PIN_ADRDEC_ADDR0 ) | ( 1 << PIN_ADRDEC_ADDR1 ) | ( 1 << PIN_ADRDEC_ADDR2 ) )
 
 /* functions dealing with the MMC interface */
-#define configure_pin_miso()        DDR_MMC &= ~ ( 1 << PIN_MMC_MISO )
+#define configure_pin_miso()        DDR_MMC &= ~( 1 << PIN_MMC_MISO )
 #define configure_pin_sck()         DDR_MMC |= ( 1 << PIN_MMC_SCK )
 #define configure_pin_mosi()        DDR_MMC |= ( 1 << PIN_MMC_MOSI )
 #define configure_pin_mmc_cs()      DDR_MMC |= ( 1 << PIN_MMC_CS )
 
-#define disable_mmc()               PORT_MMC |= (1<<PIN_MMC_CS);
-#define enable_mmc()                PORT_MMC &=~(1<<PIN_MMC_CS);
+#define disable_mmc()               PORT_MMC |= ( 1 << PIN_MMC_CS );
+#define enable_mmc()                PORT_MMC &= ~( 1 << PIN_MMC_CS );
 
 /* functions dealing with the sysconf jumperpad */
-#define jumper_pata_set()           ~port_data_get() & (1<<PIN_DATA_D0)
-#define jumper_nn2_set()            ~port_data_get() & (1<<PIN_DATA_D1)
-#define jumper_nn3_set()            ~port_data_get() & (1<<PIN_DATA_D2)
-#define jumper_nn4_set()            ~port_data_get() & (1<<PIN_DATA_D3)
+#define jumper_pata_set()           ~port_data_get() & ( 1 << PIN_DATA_D0 )
+#define jumper_nn2_set()            ~port_data_get() & ( 1 << PIN_DATA_D1 )
+#define jumper_nn3_set()            ~port_data_get() & ( 1 << PIN_DATA_D2 )
+#define jumper_nn4_set()            ~port_data_get() & ( 1 << PIN_DATA_D3 )
 
 /* functions dealing with the ATA interface */
 #define configure_ata_wr()          DDR_ATARDWR |= ( 1 << PIN_ATARDWR_WR )
@@ -88,22 +87,22 @@
 #define configure_ata_da1()         DDR_ATADA |= ( 1 << PIN_ATADA_DA1 )
 #define configure_ata_da2()         DDR_ATADA |= ( 1 << PIN_ATADA_DA2 )
 
-#define ata_wr_disable()            PORT_ATARDWR |=  (1<<PIN_ATARDWR_WR)
-#define ata_wr_enable()             PORT_ATARDWR &= ~(1<<PIN_ATARDWR_WR)
-#define ata_rd_disable()            PORT_ATARDWR |=  (1<<PIN_ATARDWR_RD)
-#define ata_rd_enable()             PORT_ATARDWR &= ~(1<<PIN_ATARDWR_RD)
-#define ata_cs0_disable()           PORT_ATACS |=  (1<<PIN_ATACS_CS0)
-#define ata_cs0_enable()            PORT_ATACS &= ~(1<<PIN_ATACS_CS0)
-#define ata_cs1_disable()           PORT_ATACS |=  (1<<PIN_ATACS_CS1)
-#define ata_cs1_enable()            PORT_ATACS &= ~(1<<PIN_ATACS_CS1)
-#define ata_da0_disable()           PORT_ATADA |=  (1<<PIN_ATADA_DA0)
-#define ata_da0_enable()            PORT_ATADA &= ~(1<<PIN_ATADA_DA0)
-#define ata_da1_disable()           PORT_ATADA |=  (1<<PIN_ATADA_DA1)
-#define ata_da1_enable()            PORT_ATADA &= ~(1<<PIN_ATADA_DA1)
-#define ata_da2_disable()           PORT_ATADA |=  (1<<PIN_ATADA_DA2)
-#define ata_da2_enable()            PORT_ATADA &= ~(1<<PIN_ATADA_DA2)
+#define ata_wr_disable()            PORT_ATARDWR |= ( 1 << PIN_ATARDWR_WR )
+#define ata_wr_enable()             PORT_ATARDWR &= ~( 1 << PIN_ATARDWR_WR )
+#define ata_rd_disable()            PORT_ATARDWR |= ( 1 << PIN_ATARDWR_RD )
+#define ata_rd_enable()             PORT_ATARDWR &= ~( 1 << PIN_ATARDWR_RD )
+#define ata_cs0_disable()           PORT_ATACS |= ( 1 << PIN_ATACS_CS0 )
+#define ata_cs0_enable()            PORT_ATACS &= ~( 1 << PIN_ATACS_CS0 )
+#define ata_cs1_disable()           PORT_ATACS |= ( 1 << PIN_ATACS_CS1 )
+#define ata_cs1_enable()            PORT_ATACS &= ~( 1 << PIN_ATACS_CS1 )
+#define ata_da0_disable()           PORT_ATADA |= ( 1 << PIN_ATADA_DA0 )
+#define ata_da0_enable()            PORT_ATADA &= ~( 1 << PIN_ATADA_DA0 )
+#define ata_da1_disable()           PORT_ATADA |= ( 1 << PIN_ATADA_DA1 )
+#define ata_da1_enable()            PORT_ATADA &= ~( 1 << PIN_ATADA_DA1 )
+#define ata_da2_disable()           PORT_ATADA |= ( 1 << PIN_ATADA_DA2 )
+#define ata_da2_enable()            PORT_ATADA &= ~( 1 << PIN_ATADA_DA2 )
 
-extern void wdc_init_avr();
-extern void wdc_get_sysconf();
+extern void wdc_init_avr ();
+extern void wdc_get_sysconf ();
 
 #endif /* WDC_AVR_H_ */
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_config.h b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_config.h
index 125a2d2..9c0c023 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_config.h
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_config.h
@@ -26,10 +26,9 @@
  */
 
 /*
- * $Id: wdc_config.h,v 1.21 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_config.h,v 1.22 2013/05/04 15:40:14 olivleh1 Exp $
  */
 
-
 #ifndef CONFIG_H_
 #define CONFIG_H_
 
@@ -124,6 +123,6 @@
 
 #define DEBUG 1
 
-#define nop()  __asm__ __volatile__ ("nop" ::)
+#define nop()  __asm__ __volatile__ ( "nop" ::)
 
 #endif /* CONFIG_H_ */
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_mmc.h b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_mmc.h
index fb95862..d5fcf0b 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_mmc.h
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_mmc.h
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_drv_mmc.h,v 1.9 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_drv_mmc.h,v 1.10 2013/05/04 15:40:14 olivleh1 Exp $
  */
 
 #ifndef WDC_DRV_MMC_H_
@@ -42,6 +42,4 @@ extern uint8_t mmc_write_multiblock ( uint32_t addr, uint8_t *buffer, uint8_t nu
 
 #define MMC_BLOCKLEN 512
 
-#endif /* WDC_DRV_MMC_H_ */
-
-
+#endif /* WDC_DRV_MMC_H_ */
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_pata.h b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_pata.h
index cc51507..6efa433 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_pata.h
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_pata.h
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_drv_pata.h,v 1.8 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_drv_pata.h,v 1.9 2013/05/04 15:40:14 olivleh1 Exp $
  */
 
 #ifndef WDC_DRV_PATA_H_
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk.c
index 5b937b5..bba1b1b 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk.c
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk.c
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_if_disk.c,v 1.14 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_if_disk.c,v 1.15 2013/05/04 15:40:14 olivleh1 Exp $
  */
 
 #include <stdint.h>
@@ -36,22 +36,22 @@
 #include "uart.h"
 #include "wdc_par.h"
 
-uint8_t wdc_init_disk()
+uint8_t wdc_init_disk ()
 {
-    return (*drv_init)();
+    return ( *drv_init )();
 }
 
 uint32_t wdc_sector2diskblock ( uint16_t req_cylinder, uint8_t req_head, uint8_t req_sector )
 {
-    return ( ( req_cylinder * wdc_get_hdd_heads() * wdc_get_hdd_sectors() )
-             + ( req_head * wdc_get_hdd_sectors() )
-             + ( req_sector - 1 ) );
+    return ( req_cylinder * wdc_get_hdd_heads() * wdc_get_hdd_sectors() )
+           + ( req_head * wdc_get_hdd_sectors() )
+           + ( req_sector - 1 );
 }
 
 uint32_t wdc_p8kblock2diskblock ( uint32_t blockno )
 {
-    return ( blockno
-             +  ( wdc_get_hdd_heads() * wdc_get_hdd_sectors() ) );
+    return blockno
+           + ( wdc_get_hdd_heads() * wdc_get_hdd_sectors() );
 }
 
 uint8_t wdc_write_sector ( uint32_t addr, uint8_t *sector )
@@ -59,15 +59,17 @@ uint8_t wdc_write_sector ( uint32_t addr, uint8_t *sector )
     uint8_t errorcode;
 
     errorcode = drv_write_block ( addr, sector );
+
     if ( errorcode ) {
-        uart_puts_p ( PSTR ( " write error at address: " ) );
+        uart_putstring ( PSTR ( "ERROR: write error at address: " ), false );
         uart_putdw_dec ( addr );
-        uart_puts_p ( PSTR ( " / errorcode is: " ) );
+        uart_putstring ( PSTR ( " / errorcode is: " ), false );
         uart_putc_hex ( errorcode );
-        uart_putc ( '\n' );
+        uart_put_nl();
         return errorcode;
-    } else
+    } else {
         return 0;
+    }
 }
 
 uint8_t wdc_read_sector ( uint32_t addr, uint8_t *sector )
@@ -75,15 +77,17 @@ uint8_t wdc_read_sector ( uint32_t addr, uint8_t *sector )
     uint8_t errorcode;
 
     errorcode = drv_read_block ( addr, sector );
+
     if ( errorcode ) {
-        uart_puts_p ( PSTR ( " read error at address: " ) );
+        uart_putstring ( PSTR ( "ERROR: read error at address: " ), false );
         uart_putdw_dec ( addr );
-        uart_puts_p ( PSTR ( " / errorcode is: " ) );
+        uart_putstring ( PSTR ( " / errorcode is: " ), false );
         uart_putc_hex ( errorcode );
-        uart_putc ( '\n' );
+        uart_put_nl();
         return errorcode;
-    } else
+    } else {
         return 0;
+    }
 }
 
 uint8_t wdc_read_multiblock ( uint32_t addr, uint8_t *sector, uint8_t numblocks )
@@ -91,15 +95,17 @@ uint8_t wdc_read_multiblock ( uint32_t addr, uint8_t *sector, uint8_t numblocks
     uint8_t errorcode;
 
     errorcode = drv_read_multiblock ( addr, sector, numblocks );
+
     if ( errorcode ) {
-        uart_puts_p ( PSTR ( " read error at address: " ) );
+        uart_putstring ( PSTR ( "ERROR: read error at address: " ), false );
         uart_putdw_dec ( addr );
-        uart_puts_p ( PSTR ( " / errorcode is: " ) );
+        uart_putstring ( PSTR ( " / errorcode is: " ), false );
         uart_putc_hex ( errorcode );
-        uart_putc ( '\n' );
+        uart_put_nl();
         return errorcode;
-    } else
+    } else {
         return 0;
+    }
 }
 
 uint8_t wdc_write_multiblock ( uint32_t addr, uint8_t *sector, uint8_t numblocks )
@@ -107,13 +113,15 @@ uint8_t wdc_write_multiblock ( uint32_t addr, uint8_t *sector, uint8_t numblocks
     uint8_t errorcode;
 
     errorcode = drv_write_multiblock ( addr, sector, numblocks );
+
     if ( errorcode ) {
-        uart_puts_p ( PSTR ( " write error at address: " ) );
+        uart_putstring ( PSTR ( "ERROR: write error at address: " ), false );
         uart_putdw_dec ( addr );
-        uart_puts_p ( PSTR ( " / errorcode is: " ) );
+        uart_putstring ( PSTR ( " / errorcode is: " ), false );
         uart_putc_hex ( errorcode );
-        uart_putc ( '\n' );
+        uart_put_nl();
         return errorcode;
-    } else
+    } else {
         return 0;
+    }
 }
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk.h b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk.h
index a5304b3..de72895 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk.h
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk.h
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_if_disk.h,v 1.9 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_if_disk.h,v 1.10 2013/05/04 15:40:14 olivleh1 Exp $
  */
 
 #ifndef WDC_IF_DISK_H_
@@ -34,26 +34,26 @@
 
 #include <stdio.h>
 
-extern uint8_t wdc_init_disk();
+extern uint8_t  wdc_init_disk ();
 extern uint32_t wdc_sector2diskblock ( uint16_t req_cylinder, uint8_t req_head, uint8_t req_sector );
 extern uint32_t wdc_p8kblock2diskblock ( uint32_t blockno );
-extern uint8_t wdc_write_sector ( uint32_t addr, uint8_t *sector );
-extern uint8_t wdc_read_sector ( uint32_t addr, uint8_t *sector );
-extern uint8_t wdc_read_multiblock ( uint32_t addr, uint8_t *sector, uint8_t numblocks );
-extern uint8_t wdc_write_multiblock ( uint32_t addr, uint8_t *sector, uint8_t numblocks );
+extern uint8_t  wdc_write_sector ( uint32_t addr, uint8_t *sector );
+extern uint8_t  wdc_read_sector ( uint32_t addr, uint8_t *sector );
+extern uint8_t  wdc_read_multiblock ( uint32_t addr, uint8_t *sector, uint8_t numblocks );
+extern uint8_t  wdc_write_multiblock ( uint32_t addr, uint8_t *sector, uint8_t numblocks );
 
-typedef uint8_t (*t_drv_init) ();
+typedef uint8_t ( *t_drv_init )();
 
-typedef uint8_t (*t_drv_read_block) ( uint32_t addr, uint8_t *buffer );
-typedef uint8_t (*t_drv_write_block) ( uint32_t addr, uint8_t *buffer );
+typedef uint8_t ( *t_drv_read_block )( uint32_t addr, uint8_t *buffer );
+typedef uint8_t ( *t_drv_write_block )( uint32_t addr, uint8_t *buffer );
 
-typedef uint8_t (*t_drv_read_multiblock) ( uint32_t addr, uint8_t *buffer, uint8_t numblocks );
-typedef uint8_t (*t_drv_write_multiblock) ( uint32_t addr, uint8_t *buffer, uint8_t numblocks );
+typedef uint8_t ( *t_drv_read_multiblock )( uint32_t addr, uint8_t *buffer, uint8_t numblocks );
+typedef uint8_t ( *t_drv_write_multiblock )( uint32_t addr, uint8_t *buffer, uint8_t numblocks );
 
-t_drv_init drv_init;
-t_drv_read_block drv_read_block;
-t_drv_write_block drv_write_block;
-t_drv_read_multiblock drv_read_multiblock;
+t_drv_init             drv_init;
+t_drv_read_block       drv_read_block;
+t_drv_write_block      drv_write_block;
+t_drv_read_multiblock  drv_read_multiblock;
 t_drv_write_multiblock drv_write_multiblock;
 
 #define WDC_BLOCKLEN 512
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk_perf.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk_perf.c
index edee125..db1dd36 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk_perf.c
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk_perf.c
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_if_disk_perf.c,v 1.11 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_if_disk_perf.c,v 1.12 2013/05/04 15:40:15 olivleh1 Exp $
  */
 
 #include <avr/io.h>
@@ -45,9 +45,8 @@
 #define BLOCKNO 300000
 
 volatile uint32_t overflow = 0;
-ISR ( TIMER0_OVF_vect )
-{
-    overflow ++;
+ISR ( TIMER0_OVF_vect ) {
+    overflow++;
 }
 
 /* switched from local to global for keeping an eye on memory usage */
@@ -59,103 +58,121 @@ void test_write4k ( uint8_t numblocks, uint8_t nr_of_tests )
 {
     uint32_t starttime;
     uint32_t blockno = 0;
-    uint8_t i8, errorcode;
+    uint8_t  i8, errorcode;
 
-    uart_puts_p ( PSTR ( "Test Write 5000 512B-Blocks with Multiblock-Write (4KB Blocksize):" ) );
+    uart_putstring ( PSTR ( "Test Write 5000 512B-Blocks with Multiblock-Write (4KB Blocksize):" ) );
     uart_putc ( '\n' );
     memset ( &data_buffer[0], 0xCC, WDC_BLOCKLEN * numblocks );
+
     for ( i8 = 0; i8 < nr_of_tests; i8++ ) {
         blockno = BLOCKNO;
-        for ( starttime = overflow; blockno < ( ( uint32_t ) BLOCKNO + 5000 ); blockno += numblocks ) {
+
+        for ( starttime = overflow; blockno < ( (uint32_t)BLOCKNO + 5000 ); blockno += numblocks ) {
             errorcode = wdc_write_multiblock ( blockno, data_buffer, numblocks );
+
             if ( errorcode ) {
                 break;
             }
         }
-        if ( errorcode )
+
+        if ( errorcode ) {
             break;
+        }
+
         uart_putdw_dec ( overflow - starttime );
         uart_putc ( '\n' );
     }
-
 }
 
 void test_read4k ( uint8_t numblocks, uint8_t nr_of_tests )
 {
     uint32_t starttime;
     uint32_t blockno = 0;
-    uint8_t i8, errorcode;
+    uint8_t  i8, errorcode;
 
-    uart_puts_p ( PSTR ( "Test Read 5000 512B-Blocks with Multiblock-Read (4KB Blocksize):" ) );
+    uart_putstring ( PSTR ( "Test Read 5000 512B-Blocks with Multiblock-Read (4KB Blocksize):" ) );
     uart_putc ( '\n' );
 
     for ( i8 = 0; i8 < nr_of_tests; i8++ ) {
         blockno = BLOCKNO;
-        for ( starttime = overflow; blockno < ( ( uint32_t ) BLOCKNO + 5000 ); blockno += numblocks ) {
+
+        for ( starttime = overflow; blockno < ( (uint32_t)BLOCKNO + 5000 ); blockno += numblocks ) {
             errorcode = wdc_read_multiblock ( blockno, data_buffer, numblocks );
+
             if ( errorcode ) {
                 break;
             }
         }
-        if ( errorcode )
+
+        if ( errorcode ) {
             break;
+        }
+
         uart_putdw_dec ( overflow - starttime );
         uart_putc ( '\n' );
     }
-
 }
 
 void test_write512 ( uint8_t numblocks, uint8_t nr_of_tests )
 {
     uint32_t starttime;
     uint32_t blockno = 0;
-    uint8_t i8, errorcode;
+    uint8_t  i8, errorcode;
 
-    uart_puts_p ( PSTR ( "Test Write 5000 512B-Blocks with Singleblock-Write (512B Blocksize):" ) );
+    uart_putstring ( PSTR ( "Test Write 5000 512B-Blocks with Singleblock-Write (512B Blocksize):" ) );
     uart_putc ( '\n' );
     memset ( &data_buffer[0], 0xEF, WDC_BLOCKLEN * numblocks );
+
     for ( i8 = 0; i8 < nr_of_tests; i8++ ) {
         blockno = BLOCKNO;
-        for ( starttime = overflow; blockno < ( ( uint32_t ) BLOCKNO + 5000 ); blockno++ ) {
+
+        for ( starttime = overflow; blockno < ( (uint32_t)BLOCKNO + 5000 ); blockno++ ) {
             errorcode = wdc_write_sector ( blockno, data_buffer );
+
             if ( errorcode ) {
                 break;
             }
         }
-        if ( errorcode )
+
+        if ( errorcode ) {
             break;
+        }
+
         uart_putdw_dec ( overflow - starttime );
         uart_putc ( '\n' );
     }
-
 }
 
 void test_read512 ( uint8_t numblocks, uint8_t nr_of_tests )
 {
     uint32_t starttime;
     uint32_t blockno = 0;
-    uint8_t i8, errorcode;
+    uint8_t  i8, errorcode;
 
-    uart_puts_p ( PSTR ( "Test Read 5000 512B-Blocks with Singleblock-Read (512B Blocksize):" ) );
+    uart_putstring ( PSTR ( "Test Read 5000 512B-Blocks with Singleblock-Read (512B Blocksize):" ) );
     uart_putc ( '\n' );
 
     for ( i8 = 0; i8 < nr_of_tests; i8++ ) {
         blockno = BLOCKNO;
-        for ( starttime = overflow; blockno < ( ( uint32_t ) BLOCKNO + 5000 ); blockno++ ) {
+
+        for ( starttime = overflow; blockno < ( (uint32_t)BLOCKNO + 5000 ); blockno++ ) {
             errorcode = wdc_read_sector ( blockno, data_buffer );
+
             if ( errorcode ) {
                 break;
             }
         }
-        if ( errorcode )
+
+        if ( errorcode ) {
             break;
+        }
+
         uart_putdw_dec ( overflow - starttime );
         uart_putc ( '\n' );
     }
-
 }
 
-void measure_performance()
+void measure_performance ()
 {
     uint8_t numblocks = 4;
     uint8_t nr_of_tests = 2;
@@ -164,12 +181,10 @@ void measure_performance()
     TIMSK0 |= ( 0x01 << TOIE0 );
     TCCR0B = ( 1 << CS01 ); /* Prescaler 8 */
     TCNT0 = 0x00;
-
-    uart_puts_p ( PSTR ( "Performance Measurement. Displayed are the Timer-Overflows." ) );
+    uart_putstring ( PSTR ( "Performance Measurement. Displayed are the Timer-Overflows." ) );
     uart_putc ( '\n' );
-    uart_puts_p ( PSTR ( "Timer is initialized with a Prescaler 8" ) );
+    uart_putstring ( PSTR ( "Timer is initialized with a Prescaler 8" ) );
     uart_putc ( '\n' );
-
     test_write512 ( numblocks, nr_of_tests );
     test_read512 ( numblocks, nr_of_tests );
     test_write512 ( numblocks, nr_of_tests );
@@ -183,11 +198,10 @@ void measure_performance()
     test_read512 ( numblocks, nr_of_tests );
     test_write4k ( numblocks, nr_of_tests );
     test_write512 ( numblocks, nr_of_tests );
-
-    uart_puts_p ( PSTR ( "End" ) );
+    uart_putstring ( PSTR ( "End" ) );
     uart_putc ( '\n' );
 
-    while ( 1 );
+    while ( 1 ) {}
 }
 
 #endif
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_p8000.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_p8000.c
index 5eea9fb..64ec847 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_p8000.c
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_p8000.c
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_if_p8000.c,v 1.15 2013/04/23 20:08:41 olivleh1 Exp $
+ * $Id: wdc_if_p8000.c,v 1.16 2013/05/04 15:40:15 olivleh1 Exp $
  */
 
 #include "wdc_config.h"
@@ -36,14 +36,13 @@
 #include "wdc_if_p8000.h"
 #include "wdc_par.h"
 
-void wdc_wait_for_reset()
+void wdc_wait_for_reset ()
 {
     while ( isset_info_reset() ) {
         port_data_set ( DATA_CLEAR );
         port_info_set ( INFO_CLEAR );
         wdc_set_initialized ( 1 );
     }
-
 }
 
 uint8_t wdc_read_data_from_p8k ( uint8_t *buffer, uint16_t count, uint8_t wdc_status )
@@ -55,16 +54,19 @@ uint8_t wdc_read_data_from_p8k ( uint8_t *buffer, uint16_t count, uint8_t wdc_st
     configure_port_data_read();
     datacnt = 0;
     port_info_set ( wdc_status );
-    while ( !isset_info_te() )
-        if ( isset_info_reset() )
+
+    while ( !isset_info_te() ) {
+        if ( isset_info_reset() ) {
             return 0;
-    while ( !isset_info_wdardy() );
+        }
+    }
+    while ( !isset_info_wdardy() ) {}
     do {
         enable_p8000com();  /* this also generates /ASTB in the moment /WDARDY gets low with a 7403 */
-        while ( isset_info_wdardy() );
+        while ( isset_info_wdardy() ) {}
         *buffer++ = port_data_get();
         disable_p8000com(); /* this additionally brings /ASTB to high */
-        while ( !isset_info_wdardy() );
+        while ( !isset_info_wdardy() ) {}
         datacnt++;
     } while ( datacnt < count );
     port_info_set ( INFO_CLEAR );
@@ -79,52 +81,53 @@ void wdc_write_data_to_p8k ( uint8_t *buffer, uint16_t count, uint8_t wdc_status
     _delay_us ( DELAY_PIO_US );
 
     port_info_set ( INFO_TR | wdc_status );
-    while ( isset_info_te() );
+    while ( isset_info_te() ) {}
     configure_port_data_write();
-    while ( !isset_info_wdardy() );
+    while ( !isset_info_wdardy() ) {}
     do {
         enable_p8000com();  /* this also generates /ASTB in the moment /WDARDY gets low with a 7403 */
-        while ( isset_info_wdardy() );
+        while ( isset_info_wdardy() ) {}
         port_data_set ( *buffer++ );
         disable_p8000com(); /* this additionally brings /ASTB to high */
-        while ( !isset_info_wdardy() );
-
+        while ( !isset_info_wdardy() ) {}
         datacnt++;
     } while ( datacnt < count );
-    while ( isset_info_wdardy() );
+
+    while ( isset_info_wdardy() ) {}
+
     enable_p8000com();
     nop();
     disable_p8000com();
     configure_port_data_read();
-    while ( !isset_info_wdardy() );
+    while ( !isset_info_wdardy() ) {}
     port_info_set ( INFO_CLEAR );
 }
 
 uint8_t wdc_receive_cmd ( uint8_t *buffer, uint16_t count )
 {
     return wdc_read_data_from_p8k ( buffer
-                                    , count
-                                    , INFO_STAT_GCMD
+                                  , count
+                                  , INFO_STAT_GCMD
                                   );
 }
 
 void wdc_receive_data ( uint8_t *buffer, uint16_t count )
 {
     wdc_read_data_from_p8k ( buffer
-                             , count
-                             , INFO_STAT_RDATA
+                           , count
+                           , INFO_STAT_RDATA
                            );
 }
 
 void wdc_send_data ( uint8_t *buffer, uint16_t count )
 {
     wdc_write_data_to_p8k ( buffer
-                            , count
-                            , INFO_STAT_WDATA
+                          , count
+                          , INFO_STAT_WDATA
                           );
 }
 
-void wdc_send_error()
+void wdc_send_error ()
 {
     wdc_send_errorcode ( 0x01 );
 }
@@ -136,7 +139,7 @@ void wdc_send_errorcode ( uint8_t error )
     buffer[0] = error;
 
     wdc_write_data_to_p8k ( buffer
-                            , 1
-                            , INFO_STAT_ERROR
+                          , 1
+                          , INFO_STAT_ERROR
                           );
 }
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_p8000.h b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_p8000.h
index fed0e3f..508c983 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_p8000.h
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_p8000.h
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_if_p8000.h,v 1.12 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_if_p8000.h,v 1.13 2013/05/04 15:40:15 olivleh1 Exp $
  */
 
 #ifndef WDC_IF_P8000_H_
@@ -35,26 +35,26 @@
 #define DELAY_PIO_US                550
 
 /* input pin handling */
-#define isset_info_reset()          ((PIN_INFO) & (1 << PIN_INFO_RST))
-#define isset_info_te()             ((PIN_INFO) & (1 << PIN_INFO_TE))
-#define isset_info_wdardy()         ((PIN_INFO) & (1 << PIN_INFO_WDARDY))
+#define isset_info_reset()          (( PIN_INFO ) & ( 1 << PIN_INFO_RST ))
+#define isset_info_te()             (( PIN_INFO ) & ( 1 << PIN_INFO_TE ))
+#define isset_info_wdardy()         (( PIN_INFO ) & ( 1 << PIN_INFO_WDARDY ))
 
 /* output pin handling */
 #define DATA_CLEAR          0x00
 #define INFO_CLEAR          0x00
 
-#define INFO_STAT_GCMD      ((1 << PIN_INFO_STATUS0)                                                    )      /* 0x01 */
-#define INFO_STAT_RDATA     (                          (1 << PIN_INFO_STATUS1)                          )      /* 0x02 */
-#define INFO_STAT_WDATA     ((1 << PIN_INFO_STATUS0) | (1 << PIN_INFO_STATUS1)                          )      /* 0x03 */
-#define _INFO_STAT_CRCERR   (                          (1 << PIN_INFO_STATUS1) | (1 << PIN_INFO_STATUS2))      /* 0x06 */
-#define INFO_STAT_ERROR     ((1 << PIN_INFO_STATUS0) | (1 << PIN_INFO_STATUS1) | (1 << PIN_INFO_STATUS2))      /* 0x07 */
-#define INFO_TR             (1 << PIN_INFO_TR)                                                                 /* 0x40 */
+#define INFO_STAT_GCMD      (( 1 << PIN_INFO_STATUS0 )                                                    )      /* 0x01 */
+#define INFO_STAT_RDATA     (                          ( 1 << PIN_INFO_STATUS1 )                          )      /* 0x02 */
+#define INFO_STAT_WDATA     (( 1 << PIN_INFO_STATUS0 ) | ( 1 << PIN_INFO_STATUS1 )                          )      /* 0x03 */
+#define _INFO_STAT_CRCERR   (                          ( 1 << PIN_INFO_STATUS1 ) | ( 1 << PIN_INFO_STATUS2 ))      /* 0x06 */
+#define INFO_STAT_ERROR     (( 1 << PIN_INFO_STATUS0 ) | ( 1 << PIN_INFO_STATUS1 ) | ( 1 << PIN_INFO_STATUS2 ))      /* 0x07 */
+#define INFO_TR             ( 1 << PIN_INFO_TR )                                                                 /* 0x40 */
 
-extern void wdc_wait_for_reset();
+extern void    wdc_wait_for_reset ();
 extern uint8_t wdc_receive_cmd ( uint8_t *buffer, uint16_t count );
-extern void wdc_receive_data ( uint8_t *buffer, uint16_t count );
-extern void wdc_send_data ( uint8_t *buffer, uint16_t count );
-extern void wdc_send_error();
-extern void wdc_send_errorcode ( uint8_t error );
+extern void    wdc_receive_data ( uint8_t *buffer, uint16_t count );
+extern void    wdc_send_data ( uint8_t *buffer, uint16_t count );
+extern void    wdc_send_error ();
+extern void    wdc_send_errorcode ( uint8_t error );
 
 #endif /* WDC_IF_P8000_H_ */
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.h b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.h
index 77d0551..9954c46 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.h
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_main.h
@@ -26,10 +26,9 @@
  */
 
 /*
- * $Id: wdc_main.h,v 1.13 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_main.h,v 1.14 2013/05/04 15:40:15 olivleh1 Exp $
  */
 
-
 #ifndef MAIN_H_
 #define MAIN_H_
 
@@ -57,7 +56,7 @@
 #define ___CMD_WRRDBTT_SECTOR 0x92              /* write and reread sector taking BTT into account  */
 #define ___CMD_CP_BLOCK       0xa1              /* copy block from drive 1 to drive 0               */
 #define ___CMD_WRRD_BLOCK     0xa2              /* write and reread block                           */
-#define CMD_ST_PARBTT         0xc2              /* store PAR and BTT on hard disk                   */
+#define CMD_ST_PARBTT         0xc2              /* store Parameter block and BTT on hard disk       */
 
 #define ERR_STANDARD          0x01
 #define ERR_SECT_N_ON_SURFACE 0x0A
@@ -65,4 +64,4 @@
 #define ERR_NO_DRIVE_READY    0x27
 #define ERR_CYL0_NOT_READABLE 0x31
 
-#endif /* MAIN_H_ */
+#endif /* MAIN_H_ */
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.c
index c93bfe9..bb099fa 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.c
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.c
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_par.c,v 1.8 2013/04/21 00:40:52 olivleh1 Exp $
+ * $Id: wdc_par.c,v 1.9 2013/05/04 15:40:15 olivleh1 Exp $
  */
 
 #include <avr/pgmspace.h>
@@ -75,28 +75,32 @@
 
 uint8_t par_table[512];
 const uint8_t
-par_tab_new_dsk[128] = {'W',  'D',  'C',  '_',  '4',  '.',  '2',  0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-                        0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x64, 0x00, 0x02, 0x12, 0x64, 0x00, 0x01, 0x81, 0x81,
-                        0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, /* init with sa.format ends here */
-                        /* to be initiated by controller starts here */             0xEB, 0x0D, 0x00, 0x00, 0x41, 0x00,
-                        0x01, 0x01, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-                        0x81, 0x81, 0x81, 0x81, 0x81, 0xEB, 0x0D, 0x00, 0x00, 0x24, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81,
-                        0x00, 0x81, 0x00, 0x80, 0xfe, 0x00, 0x00, 0x00, 0x01, 0x81, 0x81, 0x73, 0x00, 0x12, 0x81, 0x01,
-                        0x00, 0x02, 0x00, 0x00, 0x81, 0x81, 0x81, 0x00, 0x41, 0xd7, 0x28, 0x81, 0x81, 0x81, 0x81, 0x81,
-                        0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-                       };
+        par_tab_new_dsk[128] =
+{
+    'W', 'D', 'C', '_', '4', '.', '2', 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x64, 0x00, 0x02, 0x12, 0x64, 0x00, 0x01, 0x81, 0x81,
+    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, /* init with sa.format ends here */
+    /* to be initiated by controller starts here */ 0xEB, 0x0D, 0x00, 0x00, 0x41, 0x00,
+    0x01, 0x01, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+    0x81, 0x81, 0x81, 0x81, 0x81, 0xEB, 0x0D, 0x00, 0x00, 0x24, 0x00, 0x00, 0x81, 0x81, 0x81, 0x81,
+    0x00, 0x81, 0x00, 0x80, 0xfe, 0x00, 0x00, 0x00, 0x01, 0x81, 0x81, 0x73, 0x00, 0x12, 0x81, 0x01,
+    0x00, 0x02, 0x00, 0x00, 0x81, 0x81, 0x81, 0x00, 0x41, 0xd7, 0x28, 0x81, 0x81, 0x81, 0x81, 0x81,
+    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+};
 
 const uint8_t
-par_tab_no_dsk[128]  = {'W',  'D',  'C',  '_',  '4',  '.',  '2',  0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-                        0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x64, 0x00, 0x02, 0x12, 0x64, 0x00, 0x01, 0x81, 0x81,
-                        0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, /* init with sa.format ends here */
-                        /* to be initiated by controller starts here */             0x81, 0x81, 0x81, 0x81, 0x40, 0x00,
-                        0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-                        0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-                        0x00, 0x81, 0x00, 0x80, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x33, 0x00, 0x12, 0x81, 0x00,
-                        0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x40, 0xd7, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-                        0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
-                       };
+        par_tab_no_dsk[128] =
+{
+    'W', 'D', 'C', '_', '4', '.', '2', 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x64, 0x00, 0x02, 0x12, 0x64, 0x00, 0x01, 0x81, 0x81,
+    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, /* init with sa.format ends here */
+    /* to be initiated by controller starts here */ 0x81, 0x81, 0x81, 0x81, 0x40, 0x00,
+    0x00, 0x00, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+    0x00, 0x81, 0x00, 0x80, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x33, 0x00, 0x12, 0x81, 0x00,
+    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x00, 0x40, 0xd7, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+    0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81,
+};
 
 uint8_t valid_disk = 1;
 uint8_t initialized;
@@ -117,7 +121,6 @@ void wdc_write_par_table ( uint8_t *buffer, uint16_t count )
     } while ( count > 0 );
 }
 
-
 void wdc_read_wdc_par ( uint8_t *buffer, uint16_t count )
 {
     do {
@@ -134,11 +137,14 @@ void wdc_write_wdc_par ( uint8_t *buffer, uint16_t count )
     } while ( count > 0 );
 }
 
-void wdc_del_wdc_btt()
+void wdc_del_wdc_btt ()
 {
     uint8_t i;
-    for ( i = 0; i < 125; i++ )
+
+    for ( i = 0; i < 125; i++ ) {
         par_table[i + POS_PAR_WDC_BTT] = 0x00;
+    }
+
     par_table[122 + POS_PAR_WDC_BTT] = 0xff;
 }
 
@@ -158,14 +164,14 @@ void wdc_write_wdc_btt ( uint8_t *buffer, uint16_t count )
     } while ( count > 0 );
 }
 
-uint16_t wdc_get_btt_count()
+uint16_t wdc_get_btt_count ()
 {
-    return ( ( par_table[0 + POS_PAR_WDC_BTT] | ( par_table[1 + POS_PAR_WDC_BTT] << 8 ) ) );
+    return par_table[0 + POS_PAR_WDC_BTT] | ( par_table[1 + POS_PAR_WDC_BTT] << 8 );
 }
 
 void wdc_set_btt_count ( uint16_t btt_count )
 {
-    par_table[0 + POS_PAR_WDC_BTT] = ( uint8_t ) btt_count;
+    par_table[0 + POS_PAR_WDC_BTT] = (uint8_t)btt_count;
     par_table[1 + POS_PAR_WDC_BTT] = ( btt_count >> 8 );
 }
 
@@ -178,46 +184,49 @@ uint8_t wdc_add_btt_entry ( uint16_t cylinder, uint8_t head )
         /* storing the amount of bytes for the BTT */
         par_table[btt_count + 2 + POS_PAR_WDC_BTT] = ( cylinder >> 8 );
         btt_count++;
-        par_table[btt_count + 2 + POS_PAR_WDC_BTT] = ( uint8_t ) cylinder;
+        par_table[btt_count + 2 + POS_PAR_WDC_BTT] = (uint8_t)cylinder;
         btt_count++;
-        par_table[btt_count + 2 + POS_PAR_WDC_BTT] = ( uint8_t ) head;
+        par_table[btt_count + 2 + POS_PAR_WDC_BTT] = (uint8_t)head;
         btt_count++;
         wdc_set_btt_count ( btt_count );
-        return ( 0 );
-    } else {
-        return ( ERR_BTT_FULL );
+        return 0;
+    }else {
+        return ERR_BTT_FULL;
     }
 }
 
-uint8_t wdc_get_hdd_sectors()
+uint8_t wdc_get_hdd_sectors ()
 {
-    return ( par_table[18 + POS_PAR_WDC_PAR] );
+    return par_table[18 + POS_PAR_WDC_PAR];
 }
 
-uint8_t wdc_get_hdd_heads()
+uint8_t wdc_get_hdd_heads ()
 {
-    return ( par_table[17 + POS_PAR_WDC_PAR] );
-}
-uint16_t wdc_get_hdd_cylinder()
-{
-    return ( ( par_table[16 + POS_PAR_WDC_PAR] << 8 ) | par_table[15 + POS_PAR_WDC_PAR] );
+    return par_table[17 + POS_PAR_WDC_PAR];
 }
 
-void wdc_set_disk_invalid()
+uint16_t wdc_get_hdd_cylinder ()
+{
+    return ( par_table[16 + POS_PAR_WDC_PAR] << 8 ) | par_table[15 + POS_PAR_WDC_PAR];
+}
+
+void wdc_set_disk_invalid ()
 {
     uint8_t i;
 
     valid_disk = 0;
-    for ( i = 0; i < 128; i++ )
+
+    for ( i = 0; i < 128; i++ ) {
         par_table[i] = par_tab_new_dsk[i];
+    }
 }
 
-void wdc_set_disk_valid()
+void wdc_set_disk_valid ()
 {
     uint32_t blocks;
     uint16_t zw0, zw1;
 
-    blocks = (uint32_t)wdc_get_hdd_sectors() * (uint32_t)wdc_get_hdd_heads() * (uint32_t) wdc_get_hdd_cylinder()
+    blocks = (uint32_t)wdc_get_hdd_sectors() * (uint32_t)wdc_get_hdd_heads() * (uint32_t)wdc_get_hdd_cylinder()
              - (uint32_t)wdc_get_hdd_sectors() * (uint32_t)wdc_get_hdd_heads();
 
     zw0 = blocks / 65536;
@@ -239,30 +248,33 @@ void wdc_set_disk_valid()
     par_table[95] = 0x00;
 }
 
-void wdc_set_no_disk()
+void wdc_set_no_disk ()
 {
     uint8_t i;
+
     valid_disk = 0;
-    for ( i = 0; i < 128; i++ )
+
+    for ( i = 0; i < 128; i++ ) {
         par_table[i] = par_tab_no_dsk[i];
+    }
 }
 
-uint8_t wdc_get_disk_valid()
+uint8_t wdc_get_disk_valid ()
 {
     return valid_disk;
 }
 
-uint8_t wdc_get_num_of_drvs()
+uint8_t wdc_get_num_of_drvs ()
 {
     return par_table[49];
 }
 
-void wdc_set_initialized(uint8_t num)
+void wdc_set_initialized ( uint8_t num )
 {
-    initialized=num;
+    initialized = num;
 }
 
-uint8_t wdc_get_initialized()
+uint8_t wdc_get_initialized ()
 {
     return initialized;
 }
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.h b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.h
index a8d8e08..a1d2a4c 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.h
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_par.h
@@ -26,39 +26,39 @@
  */
 
 /*
- * $Id: wdc_par.h,v 1.5 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_par.h,v 1.6 2013/05/04 15:40:15 olivleh1 Exp $
  */
 
 #ifndef WDC_PAR_H_
 #define WDC_PAR_H_
 
-extern void wdc_read_par_table ( uint8_t *buffer, uint16_t count );
-extern void wdc_write_par_table ( uint8_t *buffer, uint16_t count );
+extern void     wdc_read_par_table ( uint8_t *buffer, uint16_t count );
+extern void     wdc_write_par_table ( uint8_t *buffer, uint16_t count );
 
-extern void wdc_read_wdc_par ( uint8_t *buffer, uint16_t count );
-extern void wdc_write_wdc_par ( uint8_t *buffer, uint16_t count );
+extern void     wdc_read_wdc_par ( uint8_t *buffer, uint16_t count );
+extern void     wdc_write_wdc_par ( uint8_t *buffer, uint16_t count );
 
-extern void wdc_del_wdc_btt();
-extern void wdc_read_wdc_btt ( uint8_t *buffer, uint16_t count );
-extern void wdc_write_wdc_btt ( uint8_t *buffer, uint16_t count );
-extern uint16_t wdc_get_btt_count();
-extern uint8_t wdc_add_btt_entry ( uint16_t cylinder, uint8_t head );
-extern uint8_t wdc_get_hdd_sectors();
-extern uint8_t wdc_get_hdd_heads();
-extern void wdc_set_disk_invalid();
-extern void wdc_set_disk_valid();
-extern uint8_t wdc_get_disk_valid();
-extern void wdc_set_no_disk();
-extern uint8_t wdc_get_num_of_drvs();
-extern void wdc_set_initialized ( uint8_t num );
-extern uint8_t wdc_get_initialized ();
+extern void     wdc_del_wdc_btt ();
+extern void     wdc_read_wdc_btt ( uint8_t *buffer, uint16_t count );
+extern void     wdc_write_wdc_btt ( uint8_t *buffer, uint16_t count );
+extern uint16_t wdc_get_btt_count ();
+extern uint8_t  wdc_add_btt_entry ( uint16_t cylinder, uint8_t head );
+extern uint8_t  wdc_get_hdd_sectors ();
+extern uint8_t  wdc_get_hdd_heads ();
+extern void     wdc_set_disk_invalid ();
+extern void     wdc_set_disk_valid ();
+extern uint8_t  wdc_get_disk_valid ();
+extern void     wdc_set_no_disk ();
+extern uint8_t  wdc_get_num_of_drvs ();
+extern void     wdc_set_initialized ( uint8_t num );
+extern uint8_t  wdc_get_initialized ();
 
-#define POS_PAR_VERSION     0
-#define POS_PAR_WDC_PAR     8
-#define POS_PAR_WDC_BTT     0x88
+#define POS_PAR_VERSION     0           /* defines at which position in the PAR table the WDC version string starts */
+#define POS_PAR_WDC_PAR     8           /* defines at which position in the PAR table the WDC parameter section starts */
+#define POS_PAR_WDC_BTT     0x88        /* defines at which position in the PAR table the BTT section starts */
 
-#define SIZE_PAR_VERSION    8
-#define SIZE_PAR_WDC_PAR    0x80
-#define SIZE_PAR_WDC_BTT    125
+#define SIZE_PAR_VERSION    8           /* defines the length of the WDC version string */
+#define SIZE_PAR_WDC_PAR    0x80        /* defines the length of the WDC parameter section */
+#define SIZE_PAR_WDC_BTT    125         /* defines the length of the BTT section */
 
 #endif /* WDC_PAR_H_ */
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_ram.c b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_ram.c
index 68877b8..3471867 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_ram.c
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_ram.c
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_ram.c,v 1.6 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_ram.c,v 1.7 2013/05/04 15:40:15 olivleh1 Exp $
  */
 
 #include <avr/pgmspace.h>
@@ -48,4 +48,4 @@ void wdc_read_data_from_ram ( uint8_t *buffer, uint16_t address, uint16_t count
         count--;
         buffer[count] = wdc_ram[address + count];
     } while ( count > 0 );
-}
+}
\ No newline at end of file
diff --git a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_ram.h b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_ram.h
index 2e80331..6501789 100644
--- a/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_ram.h
+++ b/P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_ram.h
@@ -26,7 +26,7 @@
  */
 
 /*
- * $Id: wdc_ram.h,v 1.6 2013/04/20 23:22:47 olivleh1 Exp $
+ * $Id: wdc_ram.h,v 1.7 2013/05/04 15:40:15 olivleh1 Exp $
  */
 
 #ifndef WDC_RAM_H_
@@ -35,6 +35,6 @@
 extern void wdc_write_data_to_ram ( uint8_t *buffer, uint16_t address, uint16_t count );
 extern void wdc_read_data_from_ram ( uint8_t *buffer, uint16_t address, uint16_t count );
 
-#define convert_ram_address(x) ((x) - 0x2000)        /* The S-RAM of the original WDC hardware starts at 0x2000. We use an array as RAM here and no direct RAM access     */
+#define convert_ram_address( x ) (( x ) - 0x2000 )        /* The S-RAM of the original WDC hardware starts at 0x2000. We use an array as RAM here and no direct RAM access     */
 
 #endif /* WDC_RAM_H_ */
\ No newline at end of file