oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make memory driver arch-neutral

Browse Source 
-Use PAGE_SIZE instead of I386_PAGE_SIZE
-No need to grant ioport access for ARM
This commit is contained in:
Arun Thomas 2012-08-13 17:21:47 +02:00
parent 697f0d097f
commit 93eadc7040
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/memory/memory.c
View File

@ -307,7 +307,7 @@ static int m_transfer(
count = dv_size - position; count = dv_size - position;
mem_phys = position; mem_phys = position;
page_off = mem_phys % I386_PAGE_SIZE; page_off = mem_phys % PAGE_SIZE;
pagestart = mem_phys - page_off; pagestart = mem_phys - page_off;
/* All memory to the map call has to be page-aligned. /* All memory to the map call has to be page-aligned.
@ -315,11 +315,11 @@ static int m_transfer(
*/ */
if(!any_mapped || pagestart_mapped != pagestart) { if(!any_mapped || pagestart_mapped != pagestart) {
if(any_mapped) { if(any_mapped) {
if(vm_unmap_phys(SELF, vaddr, I386_PAGE_SIZE) != OK) if(vm_unmap_phys(SELF, vaddr, PAGE_SIZE) != OK)
panic("vm_unmap_phys failed"); panic("vm_unmap_phys failed");
any_mapped = 0; any_mapped = 0;
} }
vaddr = vm_map_phys(SELF, (void *) pagestart, I386_PAGE_SIZE); vaddr = vm_map_phys(SELF, (void *) pagestart, PAGE_SIZE);
if(vaddr == MAP_FAILED) if(vaddr == MAP_FAILED)
r = ENOMEM; r = ENOMEM;
else else
@ -333,7 +333,7 @@ static int m_transfer(
} }
/* how much to be done within this page. */ /* how much to be done within this page. */
subcount = I386_PAGE_SIZE-page_off; subcount = PAGE_SIZE-page_off;
if(subcount > count) if(subcount > count)
subcount = count; subcount = count;
@ -388,6 +388,7 @@ static int m_do_open(message *m_ptr)
/* Check device number on open. */ /* Check device number on open. */
if (m_prepare(m_ptr->DEVICE) == NULL) return(ENXIO); if (m_prepare(m_ptr->DEVICE) == NULL) return(ENXIO);
#if defined(__i386__)
if (m_device == MEM_DEV) if (m_device == MEM_DEV)
{ {
r = sys_enable_iop(m_ptr->USER_ENDPT); r = sys_enable_iop(m_ptr->USER_ENDPT);
@ -398,6 +399,7 @@ static int m_do_open(message *m_ptr)
return r; return r;
} }
} }
#endif
openct[m_device]++; openct[m_device]++;