ISA: fix ram_address() to use phys_addr_t for completeness
I don't know of any driver actually making use of it, but some weird architecture might want to emulate an ISA bus to reuse a driver maybe...
This commit is contained in:
@@ -48,7 +48,7 @@ typedef struct isa_module_info {
|
|||||||
uint32 (*read_io_32) (int mapped_io_addr);
|
uint32 (*read_io_32) (int mapped_io_addr);
|
||||||
void (*write_io_32) (int mapped_io_addr, uint32 value);
|
void (*write_io_32) (int mapped_io_addr, uint32 value);
|
||||||
|
|
||||||
void * (*ram_address) (const void *physical_address_in_system_memory);
|
phys_addr_t (*ram_address) (phys_addr_t physical_address_in_system_memory);
|
||||||
|
|
||||||
long (*make_isa_dma_table) (
|
long (*make_isa_dma_table) (
|
||||||
const void *buffer, /* buffer to make a table for */
|
const void *buffer, /* buffer to make a table for */
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ typedef struct isa2_module_info {
|
|||||||
void (*write_io_32)(int mapped_io_addr, uint32 value);
|
void (*write_io_32)(int mapped_io_addr, uint32 value);
|
||||||
|
|
||||||
// don't know what it's for, remains for compatibility
|
// don't know what it's for, remains for compatibility
|
||||||
void *(*ram_address)(const void *physical_address_in_system_memory);
|
phys_addr_t (*ram_address)(phys_addr_t physical_address_in_system_memory);
|
||||||
|
|
||||||
// start dma transfer (scattered DMA is not supported as it's EISA specific)
|
// start dma transfer (scattered DMA is not supported as it's EISA specific)
|
||||||
status_t (*start_isa_dma)(
|
status_t (*start_isa_dma)(
|
||||||
|
|||||||
@@ -69,11 +69,11 @@ arch_isa_write_io_32(int mapped_io_addr, uint32 value)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void *
|
phys_addr_t
|
||||||
arch_isa_ram_address(const void *physical_address_in_system_memory)
|
arch_isa_ram_address(phys_addr_t physical_address_in_system_memory)
|
||||||
{
|
{
|
||||||
// this is what the BeOS kernel does
|
// this is what the BeOS kernel does
|
||||||
return (void *)physical_address_in_system_memory;
|
return physical_address_in_system_memory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -69,11 +69,11 @@ arch_isa_write_io_32(int mapped_io_addr, uint32 value)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void *
|
phys_addr_t
|
||||||
arch_isa_ram_address(const void *physical_address_in_system_memory)
|
arch_isa_ram_address(phys_addr_t physical_address_in_system_memory)
|
||||||
{
|
{
|
||||||
// this is what the BeOS kernel does
|
// this is what the BeOS kernel does
|
||||||
return (void *)physical_address_in_system_memory;
|
return physical_address_in_system_memory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -70,11 +70,11 @@ arch_isa_write_io_32(int mapped_io_addr, uint32 value)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void *
|
phys_addr_t
|
||||||
arch_isa_ram_address(const void *physical_address_in_system_memory)
|
arch_isa_ram_address(phys_addr_t physical_address_in_system_memory)
|
||||||
{
|
{
|
||||||
// this is what the BeOS kernel does
|
// this is what the BeOS kernel does
|
||||||
return (void *)physical_address_in_system_memory;
|
return physical_address_in_system_memory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -69,11 +69,11 @@ arch_isa_write_io_32(int mapped_io_addr, uint32 value)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void *
|
phys_addr_t
|
||||||
arch_isa_ram_address(const void *physical_address_in_system_memory)
|
arch_isa_ram_address(phys_addr_t physical_address_in_system_memory)
|
||||||
{
|
{
|
||||||
// this is what the BeOS kernel does
|
// this is what the BeOS kernel does
|
||||||
return (void *)physical_address_in_system_memory;
|
return physical_address_in_system_memory;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ extern uint16 arch_isa_read_io_16(int mapped_io_addr);
|
|||||||
extern void arch_isa_write_io_16(int mapped_io_addr, uint16 value);
|
extern void arch_isa_write_io_16(int mapped_io_addr, uint16 value);
|
||||||
extern uint32 arch_isa_read_io_32(int mapped_io_addr);
|
extern uint32 arch_isa_read_io_32(int mapped_io_addr);
|
||||||
extern void arch_isa_write_io_32(int mapped_io_addr, uint32 value);
|
extern void arch_isa_write_io_32(int mapped_io_addr, uint32 value);
|
||||||
extern void *arch_isa_ram_address(const void *);
|
extern phys_addr_t arch_isa_ram_address(phys_addr_t);
|
||||||
extern status_t arch_start_isa_dma(long channel, void *buf,
|
extern status_t arch_start_isa_dma(long channel, void *buf,
|
||||||
long transfer_count,
|
long transfer_count,
|
||||||
uchar mode, uchar e_mode);
|
uchar mode, uchar e_mode);
|
||||||
|
|||||||
Reference in New Issue
Block a user