URL
https://opencores.org/ocsvn/or1k/or1k/trunk
Subversion Repositories or1k
Compare Revisions
- This comparison shows the changes necessary to convert path
/
- from Rev 1697 to Rev 1698
- ↔ Reverse comparison
Rev 1697 → Rev 1698
/trunk/or1ksim/peripheral/atadevice.h
123,9 → 123,9
int dma_mode; |
|
/* databuffer */ |
unsigned short dbuf[4096]; |
unsigned short *dbuf_ptr; |
unsigned short dbuf_cnt; |
uint16_t dbuf[4096]; |
uint16_t *dbuf_ptr; |
uint16_t dbuf_cnt; |
|
/* current statemachine state */ |
int state; |
138,18 → 138,18
|
/******* ATA Device Registers *********************************/ |
struct { |
unsigned char command; |
unsigned char cylinder_low; |
unsigned char cylinder_high; |
unsigned char device_control; |
unsigned char device_head; |
unsigned char error; |
unsigned char features; |
unsigned char sector_count; |
unsigned char sector_number; |
unsigned char status; |
uint8_t command; |
uint8_t cylinder_low; |
uint8_t cylinder_high; |
uint8_t device_control; |
uint8_t device_head; |
uint8_t error; |
uint8_t features; |
uint8_t sector_count; |
uint8_t sector_number; |
uint8_t status; |
|
short dataport_i; |
uint16_t dataport_i; |
} regs; |
|
/******** ata device output signals **************************/ |
/trunk/or1ksim/peripheral/atahost.h
116,15 → 116,15
|
/* ata host registers */ |
struct { |
int ctrl; |
int stat; |
int pctr; |
int pftr0; |
int pftr1; |
int dtr0; |
int dtr1; |
int txb; |
int rxb; |
uint32_t ctrl; |
uint32_t stat; |
uint32_t pctr; |
uint32_t pftr0; |
uint32_t pftr1; |
uint32_t dtr0; |
uint32_t dtr1; |
uint32_t txb; |
uint32_t rxb; |
} regs; |
|
/* connected ATA devices (slaves) */ |
/trunk/or1ksim/peripheral/atadevice_cmdi.c
24,8 → 24,15
For fun, count the number of FIXMEs :-( |
*/ |
|
#include "config.h" |
|
#include <string.h> |
|
#ifdef HAVE_INTTYPES_H |
#include <inttypes.h> |
#endif |
|
#include "port.h" |
#include "atadevice.h" |
#include "atadevice_cmdi.h" |
#include "atacmd.h" |