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

echo: fixed driver init on x86_64.

Browse Source 
* tested with echo3g without external box connected.
This commit is contained in:
Jérôme Duval
2013-11-25 00:06:14 +01:00
parent fb0cb1c67c
commit c9a5d95df2
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/drivers/audio/echo/util.c
+5 -6
View File
@@ -34,7 +34,7 @@
#include "debug.h" #include "debug.h"
#include "util.h" #include "util.h"
spinlock slock = 0; spinlock slock = B_SPINLOCK_INITIALIZER;
uint32 round_to_pagesize(uint32 size); uint32 round_to_pagesize(uint32 size);
@@ -71,7 +71,7 @@ alloc_mem(phys_addr_t *phy, void **log, size_t size, const char *name)
area_id area; area_id area;
status_t rv; status_t rv;
LOG(("allocating %d bytes for %s\n",size,name)); LOG(("allocating %d bytes for %s\n", size, name));
size = round_to_pagesize(size); size = round_to_pagesize(size);
area = create_area(name, &logadr, B_ANY_KERNEL_ADDRESS, size, area = create_area(name, &logadr, B_ANY_KERNEL_ADDRESS, size,
@@ -79,7 +79,7 @@ alloc_mem(phys_addr_t *phy, void **log, size_t size, const char *name)
// TODO: The rest of the code doesn't deal correctly with physical // TODO: The rest of the code doesn't deal correctly with physical
// addresses > 4 GB, so we have to force 32 bit addresses here. // addresses > 4 GB, so we have to force 32 bit addresses here.
if (area < B_OK) { if (area < B_OK) {
PRINT(("couldn't allocate area %s\n",name)); PRINT(("couldn't allocate area %s\n", name));
return B_ERROR; return B_ERROR;
} }
rv = get_memory_map(logadr, size, &pe, 1); rv = get_memory_map(logadr, size, &pe, 1);
@@ -109,16 +109,15 @@ map_mem(void **log, phys_addr_t phy, size_t size, const char *name)
LOG(("mapping physical address %p with %#x bytes for %s\n",phy,size,name)); LOG(("mapping physical address %p with %#x bytes for %s\n",phy,size,name));
offset = phy & (B_PAGE_SIZE - 1); offset = (uint32)phy & (B_PAGE_SIZE - 1);
phyadr = phy - offset; phyadr = phy - offset;
size = round_to_pagesize(size + offset); size = round_to_pagesize(size + offset);
area = map_physical_memory(name, phyadr, size, B_ANY_KERNEL_ADDRESS, area = map_physical_memory(name, phyadr, size, B_ANY_KERNEL_ADDRESS,
0, &mapadr); 0, &mapadr);
*log = (void*) ((uint32)mapadr + offset); *log = mapadr + offset;
LOG(("physical = %p, logical = %p, offset = %#x, phyadr = %p, mapadr = %p, size = %#x, area = %#x\n", LOG(("physical = %p, logical = %p, offset = %#x, phyadr = %p, mapadr = %p, size = %#x, area = %#x\n",
phy, *log, offset, phyadr, mapadr, size, area)); phy, *log, offset, phyadr, mapadr, size, area));
return area; return area;
} }