chrissy
/
P8000
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make the code looking less nice but more performant

This commit is contained in:
Oliver Lehmann 2012-06-17 16:40:42 +00:00
parent 307e662ae8
commit 5053445699
2 changed files with 131 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_drv_pata.c
View File

@ -26,7 +26,7 @@
*/ */
/* /*
* $Id: wdc_drv_pata.c,v 1.9 2012/06/17 13:21:55 olivleh1 Exp $ * $Id: wdc_drv_pata.c,v 1.10 2012/06/17 16:40:42 olivleh1 Exp $
*/ */
#include "wdc_config.h" #include "wdc_config.h"
@ -121,7 +121,6 @@ void pata_set_lowbyte ( uint8_t byte )
enable_rdwrtoata(); enable_rdwrtoata();
nop(); nop();
nop(); nop();
nop();
disable_rdwrtoata(); disable_rdwrtoata();
} }
@ -131,7 +130,6 @@ void pata_set_highbyte ( uint8_t byte )
enable_atalatch(); enable_atalatch();
nop(); nop();
nop(); nop();
nop();
disable_atalatch(); disable_atalatch();
} }
@ -156,7 +154,6 @@ uint8_t pata_get_highbyte ()
enable_atalatch(); enable_atalatch();
nop(); nop();
nop(); nop();
nop();
byte = port_data_get(); byte = port_data_get();
disable_atalatch(); disable_atalatch();
@ -200,7 +197,11 @@ void pata_read_bytes ( uint8_t *buffer, uint16_t bytes )
/* Wait for BSY goes low and DRQ goes high */ /* Wait for BSY goes low and DRQ goes high */
while ( pata_bsy() & !pata_drq() ); while ( pata_bsy() & !pata_drq() );
set_io_register ( PATA_RW_DATA_REGISTER ); /* PATA_RW_DATA_REGISTER */
ata_cs0_enable();
ata_da0_enable();
ata_da1_enable();
ata_da2_enable();
ata_rd_enable(); ata_rd_enable();
for ( i = 0; i < PATA_BLOCKLEN / 2; i++ ) { for ( i = 0; i < PATA_BLOCKLEN / 2; i++ ) {
@ -209,7 +210,10 @@ void pata_read_bytes ( uint8_t *buffer, uint16_t bytes )
} }
ata_rd_disable(); ata_rd_disable();
ata_ctl_high(); ata_cs0_disable();
ata_da0_disable();
ata_da1_disable();
ata_da2_disable();
} }
} }
@ -226,7 +230,11 @@ void pata_write_bytes ( uint8_t *buffer, uint16_t bytes )
configure_port_data_write(); configure_port_data_write();
set_io_register ( PATA_RW_DATA_REGISTER ); /* PATA_RW_DATA_REGISTER */
ata_cs0_enable();
ata_da0_enable();
ata_da1_enable();
ata_da2_enable();
ata_wr_enable(); ata_wr_enable();
for ( i = 0; i < PATA_BLOCKLEN / 2; i++ ) { for ( i = 0; i < PATA_BLOCKLEN / 2; i++ ) {
@ -234,11 +242,12 @@ void pata_write_bytes ( uint8_t *buffer, uint16_t bytes )
pata_set_lowbyte ( buffer[a] ); pata_set_lowbyte ( buffer[a] );
a += 2; a += 2;
} }
ata_wr_disable(); ata_wr_disable();
ata_ctl_high(); ata_cs0_disable();
ata_da0_disable();
configure_port_data_read(); ata_da1_disable();
ata_da2_disable();
} }
} }
@ -331,22 +340,6 @@ uint8_t pata_init ()
write_io_register ( PATA_W_COMMAND_REGISTER, CMD_RECALIBRATE ); write_io_register ( PATA_W_COMMAND_REGISTER, CMD_RECALIBRATE );
while ( pata_bsy() ); while ( pata_bsy() );
/* CHS Mode, Software Reset, PIO mode without IORDY
write_io_register ( PATA_RW_DEVICE_HEAD_REGISTER, 0 );
while ( ( pata_drq() ) & pata_bsy() );
write_io_register ( PATA_W_DEVICE_CONTROL_REGISTER, 0x40 | 0x20 );
_delay_ms(20);
write_io_register ( PATA_W_DEVICE_CONTROL_REGISTER, 0x20 );
_delay_ms(20);
while ( ( !pata_rdy() ) & pata_bsy() );
write_io_register ( PATA_W_FEATURE_REGISTER, 3 );
write_io_register ( PATA_RW_SECTOR_COUNT_REGISTER, 1 );
write_io_register ( PATA_W_COMMAND_REGISTER, CMD_SET_FEATURES );
while ( pata_bsy() );
*/
uart_puts_p ( PSTR ( "disk is now ready\n" ) ); uart_puts_p ( PSTR ( "disk is now ready\n" ) );
ata_identify(); ata_identify();
@ -364,17 +357,57 @@ uint8_t pata_write_block ( uint32_t addr, uint8_t *buffer )
return pata_write_multiblock ( addr, buffer, 1 ); return pata_write_multiblock ( addr, buffer, 1 );
} }
typedef union {
uint32_t value32;
struct {
uint8_t ll;
uint8_t lh;
uint8_t hl;
uint8_t hh;
} value8;
} sint32;
uint8_t pata_read_multiblock ( uint32_t addr, uint8_t *buffer, uint8_t numblocks ) uint8_t pata_read_multiblock ( uint32_t addr, uint8_t *buffer, uint8_t numblocks )
{ {
sint32 x;
write_io_register ( PATA_RW_SECTOR_COUNT_REGISTER, numblocks ); x.value32 = addr;
write_io_register ( PATA_RW_SECTOR_NUMBER_REGISTER, ( uint8_t ) addr ); configure_port_data_write();
write_io_register ( PATA_RW_CYLINDER_LOW_REGISTER, ( uint8_t ) ( addr >> 8 ) ); ata_wr_enable();
write_io_register ( PATA_RW_CYLINDER_HIGH_REGISTER, ( uint8_t ) ( addr >> 16 ) );
write_io_register ( PATA_RW_DEVICE_HEAD_REGISTER, ( ( uint8_t ) ( addr >> 24 ) & 0x0F ) | ATA_LBA_DRIVE_0 );
write_io_register ( PATA_W_COMMAND_REGISTER, CMD_READ_SECTORS ); /* PATA_RW_SECTOR_COUNT_REGISTER */
ata_cs0_enable();
ata_da0_enable();
ata_da2_enable();
pata_set_lowbyte ( numblocks );
/* PATA_RW_SECTOR_NUMBER_REGISTER */
ata_da0_disable();
pata_set_lowbyte ( x.value8.ll );
/* PATA_RW_CYLINDER_LOW_REGISTER */
ata_da0_enable();
ata_da1_enable();
ata_da2_disable();
pata_set_lowbyte ( x.value8.lh );
/* PATA_RW_CYLINDER_HIGH_REGISTER */
ata_da0_disable();
pata_set_lowbyte ( x.value8.hl );
/* PATA_RW_DEVICE_HEAD_REGISTER */
ata_da0_enable();
ata_da1_disable();
pata_set_lowbyte ( ( x.value8.hh & 0x0F ) | ATA_LBA_DRIVE_0 );
/* PATA_W_COMMAND_REGISTER */
ata_da0_disable();
pata_set_lowbyte ( CMD_READ_SECTORS );
ata_cs0_disable();
ata_wr_disable();
pata_read_bytes ( buffer, numblocks * PATA_BLOCKLEN ); pata_read_bytes ( buffer, numblocks * PATA_BLOCKLEN );
@ -383,19 +416,49 @@ uint8_t pata_read_multiblock ( uint32_t addr, uint8_t *buffer, uint8_t numblocks
uint8_t pata_write_multiblock ( uint32_t addr, uint8_t *buffer, uint8_t numblocks ) uint8_t pata_write_multiblock ( uint32_t addr, uint8_t *buffer, uint8_t numblocks )
{ {
write_io_register ( PATA_RW_SECTOR_COUNT_REGISTER, numblocks ); sint32 x;
write_io_register ( PATA_RW_SECTOR_NUMBER_REGISTER, ( uint8_t ) addr ); x.value32 = addr;
write_io_register ( PATA_RW_CYLINDER_LOW_REGISTER, ( uint8_t ) ( addr >> 8 ) );
write_io_register ( PATA_RW_CYLINDER_HIGH_REGISTER, ( uint8_t ) ( addr >> 16 ) );
write_io_register ( PATA_RW_DEVICE_HEAD_REGISTER, ( ( uint8_t ) ( addr >> 24 ) & 0x0F ) | ATA_LBA_DRIVE_0 );
write_io_register ( PATA_W_COMMAND_REGISTER, CMD_WRITE_SECTORS ); configure_port_data_write();
ata_wr_enable();
/* PATA_RW_SECTOR_COUNT_REGISTER */
ata_cs0_enable();
ata_da0_enable();
ata_da2_enable();
pata_set_lowbyte ( numblocks );
/* PATA_RW_SECTOR_NUMBER_REGISTER */
ata_da0_disable();
pata_set_lowbyte ( x.value8.ll );
/* PATA_RW_CYLINDER_LOW_REGISTER */
ata_da0_enable();
ata_da1_enable();
ata_da2_disable();
pata_set_lowbyte ( x.value8.lh );
/* PATA_RW_CYLINDER_HIGH_REGISTER */
ata_da0_disable();
pata_set_lowbyte ( x.value8.hl );
/* PATA_RW_DEVICE_HEAD_REGISTER */
ata_da0_enable();
ata_da1_disable();
pata_set_lowbyte ( ( x.value8.hh & 0x0F ) | ATA_LBA_DRIVE_0 );
/* PATA_W_COMMAND_REGISTER */
ata_da0_disable();
pata_set_lowbyte ( CMD_WRITE_SECTORS );
ata_cs0_disable();
ata_wr_disable();
pata_write_bytes ( buffer, numblocks * PATA_BLOCKLEN ); pata_write_bytes ( buffer, numblocks * PATA_BLOCKLEN );
/* wait until drive completed write */ /* wait until drive completed write */
while(pata_bsy()); while ( pata_bsy() );
return pata_err(); return pata_err();
} }

55
P8000_WDC_Emulator/P8000_WDC_Emulator/wdc_if_disk_perf.c
View File

@ -26,7 +26,7 @@
*/ */
/* /*
* $Id: wdc_if_disk_perf.c,v 1.8 2012/06/17 13:21:55 olivleh1 Exp $ * $Id: wdc_if_disk_perf.c,v 1.9 2012/06/17 16:40:42 olivleh1 Exp $
*/ */
#include <avr/io.h> #include <avr/io.h>
@ -42,7 +42,7 @@
#include "uart.h" #include "uart.h"
#ifdef MEASURE_DISK_PERFORMANCE #ifdef MEASURE_DISK_PERFORMANCE
#define BLOCKNO 0 #define BLOCKNO 300000
extern uint32_t overflow; extern uint32_t overflow;
@ -51,7 +51,7 @@ uint8_t data_buffer[4096];
uint8_t cmd_buffer[9]; uint8_t cmd_buffer[9];
void test_write4k(uint8_t numblocks, uint8_t nr_of_tests) void test_write4k ( uint8_t numblocks, uint8_t nr_of_tests )
{ {
uint32_t starttime; uint32_t starttime;
uint32_t blockno = 0; uint32_t blockno = 0;
@ -62,7 +62,7 @@ void test_write4k(uint8_t numblocks, uint8_t nr_of_tests)
memset ( &data_buffer[0], 0xCC, WDC_BLOCKLEN * numblocks ); memset ( &data_buffer[0], 0xCC, WDC_BLOCKLEN * numblocks );
for ( i8 = 0; i8 < nr_of_tests; i8++ ) { for ( i8 = 0; i8 < nr_of_tests; i8++ ) {
blockno = BLOCKNO; blockno = BLOCKNO;
for ( starttime = overflow; blockno < ( BLOCKNO + 5000 ); blockno += numblocks ) { for ( starttime = overflow; blockno < ( ( uint32_t ) BLOCKNO + 5000 ); blockno += numblocks ) {
errorcode = wdc_write_multiblock ( blockno, data_buffer, numblocks ); errorcode = wdc_write_multiblock ( blockno, data_buffer, numblocks );
if ( errorcode ) { if ( errorcode ) {
break; break;
@ -76,7 +76,7 @@ void test_write4k(uint8_t numblocks, uint8_t nr_of_tests)
} }
void test_read4k(uint8_t numblocks, uint8_t nr_of_tests) void test_read4k ( uint8_t numblocks, uint8_t nr_of_tests )
{ {
uint32_t starttime; uint32_t starttime;
uint32_t blockno = 0; uint32_t blockno = 0;
@ -87,7 +87,7 @@ void test_read4k(uint8_t numblocks, uint8_t nr_of_tests)
for ( i8 = 0; i8 < nr_of_tests; i8++ ) { for ( i8 = 0; i8 < nr_of_tests; i8++ ) {
blockno = BLOCKNO; blockno = BLOCKNO;
for ( starttime = overflow; blockno < ( BLOCKNO + 5000 ); blockno += numblocks ) { for ( starttime = overflow; blockno < ( ( uint32_t ) BLOCKNO + 5000 ); blockno += numblocks ) {
errorcode = wdc_read_multiblock ( blockno, data_buffer, numblocks ); errorcode = wdc_read_multiblock ( blockno, data_buffer, numblocks );
if ( errorcode ) { if ( errorcode ) {
break; break;
@ -101,7 +101,7 @@ void test_read4k(uint8_t numblocks, uint8_t nr_of_tests)
} }
void test_write512(uint8_t numblocks, uint8_t nr_of_tests) void test_write512 ( uint8_t numblocks, uint8_t nr_of_tests )
{ {
uint32_t starttime; uint32_t starttime;
uint32_t blockno = 0; uint32_t blockno = 0;
@ -112,7 +112,7 @@ void test_write512(uint8_t numblocks, uint8_t nr_of_tests)
memset ( &data_buffer[0], 0xEF, WDC_BLOCKLEN * numblocks ); memset ( &data_buffer[0], 0xEF, WDC_BLOCKLEN * numblocks );
for ( i8 = 0; i8 < nr_of_tests; i8++ ) { for ( i8 = 0; i8 < nr_of_tests; i8++ ) {
blockno = BLOCKNO; blockno = BLOCKNO;
for ( starttime = overflow; blockno < ( BLOCKNO + 5000 ); blockno++ ) { for ( starttime = overflow; blockno < ( ( uint32_t ) BLOCKNO + 5000 ); blockno++ ) {
errorcode = wdc_write_sector ( blockno, data_buffer ); errorcode = wdc_write_sector ( blockno, data_buffer );
if ( errorcode ) { if ( errorcode ) {
break; break;
@ -126,25 +126,19 @@ void test_write512(uint8_t numblocks, uint8_t nr_of_tests)
} }
void test_read512(uint8_t numblocks, uint8_t nr_of_tests) void test_read512 ( uint8_t numblocks, uint8_t nr_of_tests )
{ {
uint32_t starttime; uint32_t starttime;
uint32_t blockno = 0; uint32_t blockno = 0;
uint8_t i8, errorcode; uint8_t i8, errorcode;
/* uint16_t a; */
uart_puts_p ( PSTR ( "Test Read 5000 512B-Blocks with Singleblock-Read (512B Blocksize):" ) ); uart_puts_p ( PSTR ( "Test Read 5000 512B-Blocks with Singleblock-Read (512B Blocksize):" ) );
uart_putc ( '\n' ); uart_putc ( '\n' );
for ( i8 = 0; i8 < nr_of_tests; i8++ ) { for ( i8 = 0; i8 < nr_of_tests; i8++ ) {
blockno = BLOCKNO; blockno = BLOCKNO;
for ( starttime = overflow; blockno < ( BLOCKNO + 5000 ); blockno++ ) { for ( starttime = overflow; blockno < ( ( uint32_t ) BLOCKNO + 5000 ); blockno++ ) {
errorcode = wdc_read_sector ( blockno, data_buffer ); errorcode = wdc_read_sector ( blockno, data_buffer );
/*
for ( a = 0 ; a < 512 ; a++ )
uart_putc_hex ( data_buffer[a] );
uart_putc ( '\n' );
*/
if ( errorcode ) { if ( errorcode ) {
break; break;
} }
@ -172,21 +166,20 @@ void measure_performance()
uart_puts_p ( PSTR ( "Timer is initialized with a Prescaler 8" ) ); uart_puts_p ( PSTR ( "Timer is initialized with a Prescaler 8" ) );
uart_putc ( '\n' ); uart_putc ( '\n' );
test_write512(numblocks,nr_of_tests); test_write512 ( numblocks, nr_of_tests );
/* test_read512 ( numblocks, nr_of_tests );
test_read512(numblocks,nr_of_tests); test_write512 ( numblocks, nr_of_tests );
test_write512(numblocks,nr_of_tests); test_read4k ( numblocks, nr_of_tests );
test_read4k(numblocks,nr_of_tests); test_write4k ( numblocks, nr_of_tests );
test_write4k(numblocks,nr_of_tests); test_read4k ( numblocks, nr_of_tests );
test_read4k(numblocks,nr_of_tests); test_write512 ( numblocks, nr_of_tests );
test_write512(numblocks,nr_of_tests); test_write4k ( numblocks, nr_of_tests );
test_write4k(numblocks,nr_of_tests); test_read512 ( numblocks, nr_of_tests );
test_read512(numblocks,nr_of_tests); test_read4k ( numblocks, nr_of_tests );
test_read4k(numblocks,nr_of_tests); test_read512 ( numblocks, nr_of_tests );
test_read512(numblocks,nr_of_tests); test_write4k ( numblocks, nr_of_tests );
test_write4k(numblocks,nr_of_tests); test_write512 ( numblocks, nr_of_tests );
test_write512(numblocks,nr_of_tests);
*/
uart_puts_p ( PSTR ( "End" ) ); uart_puts_p ( PSTR ( "End" ) );
uart_putc ( '\n' ); uart_putc ( '\n' );