i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

For interupt handling in PIO mode, use the "Task File Configuration + Status" interrupt status bit.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@19727 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Marcus Overhagen
2007-01-06 17:23:39 +00:00
parent 1c23ca6f79
commit ee6c8dde21
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/busses/ide/silicon_image_3112/silicon_image_3112.c
+18 -9
View File
@@ -44,12 +44,13 @@ static const struct {
uint16 ctl; uint16 ctl;
uint16 bmdma; uint16 bmdma;
uint16 sien; uint16 sien;
uint16 stat;
const char *name; const char *name;
} controller_channel_data[] = { } controller_channel_data[] = {
{ 0x80, 0x8A, 0x00, 0x148, "Primary Channel" }, { 0x80, 0x8A, 0x00, 0x148, 0xA0, "Primary Channel" },
{ 0xC0, 0xCA, 0x08, 0x1C8, "Secondary Channel" }, { 0xC0, 0xCA, 0x08, 0x1C8, 0xE0, "Secondary Channel" },
{ 0x280, 0x28A, 0x200, 0x348, "Tertiary Channel" }, { 0x280, 0x28A, 0x200, 0x348, 0x2A0, "Tertiary Channel" },
{ 0x2C0, 0x2CA, 0x208, 0x3C8, "Quaternary Channel" }, { 0x2C0, 0x2CA, 0x208, 0x3C8, 0x2E0, "Quaternary Channel" },
}; };
#define SI_SYSCFG 0x48 #define SI_SYSCFG 0x48
@@ -95,6 +96,8 @@ typedef struct channel_data {
volatile uint8 * bm_command_reg; volatile uint8 * bm_command_reg;
volatile uint32 * bm_prdt_address; volatile uint32 * bm_prdt_address;
volatile uint32 * stat;
area_id prd_area; area_id prd_area;
prd_entry * prdt; prd_entry * prdt;
void * prdt_phys; void * prdt_phys;
@@ -487,6 +490,7 @@ channel_init(device_node_handle node, void *user_cookie, void **channel_cookie)
channel->bm_prdt_address = (volatile uint32 *)(controller->mmio_addr + controller_channel_data[chan_index].bmdma + ide_bm_prdt_address); channel->bm_prdt_address = (volatile uint32 *)(controller->mmio_addr + controller_channel_data[chan_index].bmdma + ide_bm_prdt_address);
channel->bm_status_reg = (volatile uint8 *)(controller->mmio_addr + controller_channel_data[chan_index].bmdma + ide_bm_status_reg); channel->bm_status_reg = (volatile uint8 *)(controller->mmio_addr + controller_channel_data[chan_index].bmdma + ide_bm_status_reg);
channel->bm_command_reg = (volatile uint8 *)(controller->mmio_addr + controller_channel_data[chan_index].bmdma + ide_bm_command_reg); channel->bm_command_reg = (volatile uint8 *)(controller->mmio_addr + controller_channel_data[chan_index].bmdma + ide_bm_command_reg);
channel->stat = (volatile uint32 *)(controller->mmio_addr + controller_channel_data[chan_index].stat);
channel->lost = 0; channel->lost = 0;
channel->dma_active = 0; channel->dma_active = 0;
@@ -812,12 +816,13 @@ handle_interrupt(void *arg)
controller_data *controller = arg; controller_data *controller = arg;
ide_bm_status bm_status; ide_bm_status bm_status;
uint8 status; uint8 status;
int32 ret; int32 result, ret;
int i; int i;
FLOW("handle_interrupt\n"); FLOW("handle_interrupt\n");
// XXX This is bogus result = B_UNHANDLED_INTERRUPT;
for (i = 0; i < controller->channel_count; i++) { for (i = 0; i < controller->channel_count; i++) {
channel_data *channel = controller->channel[i]; channel_data *channel = controller->channel[i];
if (!channel || channel->lost) if (!channel || channel->lost)
@@ -827,16 +832,20 @@ handle_interrupt(void *arg)
*(uint8 *)&bm_status = *channel->bm_status_reg; *(uint8 *)&bm_status = *channel->bm_status_reg;
if (!bm_status.interrupt) if (!bm_status.interrupt)
continue; continue;
} else {
// for PIO, read the "Task File Configuration + Status" Interrupt status
if (!(*channel->stat & (1 << 11))
continue;
} }
// acknowledge IRQ // acknowledge IRQ
status = *(channel->command_block + 7); status = *(channel->command_block + 7);
ret = ide->irq_handler(channel->ide_channel, status); ret = ide->irq_handler(channel->ide_channel, status);
if (ret != B_UNHANDLED_INTERRUPT) if (ret == B_INVOKE_SHEDULER || result == B_UNHANDLED_INTERRUPT)
return ret; result = ret;
} }
return B_UNHANDLED_INTERRUPT; return result;
} }