From 34d2a71fdd3c14c980a57d5247dae9ac7586fe5b Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Mon, 24 Jan 2005 14:26:24 +0000 Subject: More int -> long git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5654 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/ata.c | 4 ++-- firmware/drivers/fat.c | 2 +- firmware/export/kernel.h | 2 +- firmware/kernel.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/drivers/ata.c b/firmware/drivers/ata.c index 20e6247fb9..0983fb52ee 100644 --- a/firmware/drivers/ata.c +++ b/firmware/drivers/ata.c @@ -287,7 +287,7 @@ static void copy_read_sectors(unsigned char* buf, int wordcount) #ifdef PREFER_C_READING unsigned short tmp = 0; - if ( (unsigned int)buf & 1) + if ( (unsigned long)buf & 1) { /* not 16-bit aligned, copy byte by byte */ unsigned char* bufend = buf + wordcount*2; do @@ -567,7 +567,7 @@ static void copy_write_sectors(const unsigned char* buf, int wordcount) { #ifdef PREFER_C_WRITING - if ( (unsigned int)buf & 1) + if ( (unsigned long)buf & 1) { /* not 16-bit aligned, copy byte by byte */ unsigned short tmp = 0; const unsigned char* bufend = buf + wordcount*2; diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c index 4c63498b8c..3adca5e864 100644 --- a/firmware/drivers/fat.c +++ b/firmware/drivers/fat.c @@ -199,7 +199,7 @@ struct bpb int bpb_fatsz16; /* Number of used sectors per FAT structure */ unsigned long bpb_totsec32; /* Number of sectors on the volume (new 32-bit) */ - int last_word; /* 0xAA55 */ + unsigned int last_word; /* 0xAA55 */ /**** FAT32 specific *****/ long bpb_fatsz32; diff --git a/firmware/export/kernel.h b/firmware/export/kernel.h index df4f8c4d76..1a238a66af 100644 --- a/firmware/export/kernel.h +++ b/firmware/export/kernel.h @@ -74,7 +74,7 @@ int tick_remove_task(void (*f)(void)); extern void queue_init(struct event_queue *q); extern void queue_wait(struct event_queue *q, struct event *ev); extern void queue_wait_w_tmo(struct event_queue *q, struct event *ev, int ticks); -extern void queue_post(struct event_queue *q, int id, void *data); +extern void queue_post(struct event_queue *q, long id, void *data); extern bool queue_empty(const struct event_queue* q); void queue_clear(struct event_queue* q); extern int queue_broadcast(int id, void *data); diff --git a/firmware/kernel.c b/firmware/kernel.c index 7c0226421a..06a5ec708d 100644 --- a/firmware/kernel.c +++ b/firmware/kernel.c @@ -113,7 +113,7 @@ void queue_wait_w_tmo(struct event_queue *q, struct event *ev, int ticks) } } -void queue_post(struct event_queue *q, int id, void *data) +void queue_post(struct event_queue *q, long id, void *data) { int wr; int oldlevel; -- cgit v1.2.3