ref: 0e03a5f9fd033eb1f3defe58d799ec7e1dba564a
parent: 5c29603f502d83955f87be7385e0323a43e1ee2c
author: cinap_lenrek <cinap_lenrek@felloff.net>
date: Tue Dec 16 04:41:05 EST 2014
kernel: replace ulong with uintptr in ucallocb() and fix unneeded parentheses
--- a/sys/src/9/port/allocb.c
+++ b/sys/src/9/port/allocb.c
@@ -28,7 +28,7 @@
b->next = nil;
b->list = nil;
- b->free = 0;
+ b->free = nil;
b->flag = 0;
/* align start of data portion by rounding up */
@@ -37,9 +37,9 @@
b->base = (uchar*)addr;
/* align end of data portion by rounding down */
- b->lim = ((uchar*)b) + msize(b);
- addr = (uintptr)(b->lim);
- addr = addr & ~(BLOCKALIGN-1);
+ b->lim = (uchar*)b + msize(b);
+ addr = (uintptr)b->lim;
+ addr &= ~(BLOCKALIGN-1);
b->lim = (uchar*)addr;
/* leave sluff at beginning for added headers */
@@ -129,7 +129,7 @@
* drivers which perform non cache coherent DMA manage their own buffer
* pool of uncached buffers and provide their own free routine.
*/
- if(b->free) {+ if(b->free != nil) {b->free(b);
return;
}
--- a/sys/src/9/port/ucallocb.c
+++ b/sys/src/9/port/ucallocb.c
@@ -24,7 +24,7 @@
_ucallocb(int size)
{Block *b;
- ulong addr;
+ uintptr addr;
if((b = ucalloc(sizeof(Block)+size+Hdrspc)) == nil)
return nil;
@@ -31,18 +31,18 @@
b->next = nil;
b->list = nil;
- b->free = 0;
+ b->free = nil;
b->flag = 0;
/* align start of data portion by rounding up */
- addr = (ulong)b;
+ addr = (uintptr)b;
addr = ROUND(addr + sizeof(Block), BLOCKALIGN);
b->base = (uchar*)addr;
/* align end of data portion by rounding down */
- b->lim = ((uchar*)b) + msize(b);
- addr = (ulong)(b->lim);
- addr = addr & ~(BLOCKALIGN-1);
+ b->lim = (uchar*)b + msize(b);
+ addr = (uintptr)b->lim;
+ addr &= ~(BLOCKALIGN-1);
b->lim = (uchar*)addr;
/* leave sluff at beginning for added headers */
@@ -123,7 +123,7 @@
* drivers which perform non cache coherent DMA manage their own buffer
* pool of uncached buffers and provide their own free routine.
*/
- if(b->free) {+ if(b->free != nil) {b->free(b);
return;
}