diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/ata.c | 4 | ||||
-rw-r--r-- | firmware/drivers/fat.c | 2 | ||||
-rw-r--r-- | firmware/export/kernel.h | 2 | ||||
-rw-r--r-- | 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) | |||
287 | #ifdef PREFER_C_READING | 287 | #ifdef PREFER_C_READING |
288 | unsigned short tmp = 0; | 288 | unsigned short tmp = 0; |
289 | 289 | ||
290 | if ( (unsigned int)buf & 1) | 290 | if ( (unsigned long)buf & 1) |
291 | { /* not 16-bit aligned, copy byte by byte */ | 291 | { /* not 16-bit aligned, copy byte by byte */ |
292 | unsigned char* bufend = buf + wordcount*2; | 292 | unsigned char* bufend = buf + wordcount*2; |
293 | do | 293 | do |
@@ -567,7 +567,7 @@ static void copy_write_sectors(const unsigned char* buf, int wordcount) | |||
567 | { | 567 | { |
568 | #ifdef PREFER_C_WRITING | 568 | #ifdef PREFER_C_WRITING |
569 | 569 | ||
570 | if ( (unsigned int)buf & 1) | 570 | if ( (unsigned long)buf & 1) |
571 | { /* not 16-bit aligned, copy byte by byte */ | 571 | { /* not 16-bit aligned, copy byte by byte */ |
572 | unsigned short tmp = 0; | 572 | unsigned short tmp = 0; |
573 | const unsigned char* bufend = buf + wordcount*2; | 573 | 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 | |||
199 | int bpb_fatsz16; /* Number of used sectors per FAT structure */ | 199 | int bpb_fatsz16; /* Number of used sectors per FAT structure */ |
200 | unsigned long bpb_totsec32; /* Number of sectors on the volume | 200 | unsigned long bpb_totsec32; /* Number of sectors on the volume |
201 | (new 32-bit) */ | 201 | (new 32-bit) */ |
202 | int last_word; /* 0xAA55 */ | 202 | unsigned int last_word; /* 0xAA55 */ |
203 | 203 | ||
204 | /**** FAT32 specific *****/ | 204 | /**** FAT32 specific *****/ |
205 | long bpb_fatsz32; | 205 | 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)); | |||
74 | extern void queue_init(struct event_queue *q); | 74 | extern void queue_init(struct event_queue *q); |
75 | extern void queue_wait(struct event_queue *q, struct event *ev); | 75 | extern void queue_wait(struct event_queue *q, struct event *ev); |
76 | extern void queue_wait_w_tmo(struct event_queue *q, struct event *ev, int ticks); | 76 | extern void queue_wait_w_tmo(struct event_queue *q, struct event *ev, int ticks); |
77 | extern void queue_post(struct event_queue *q, int id, void *data); | 77 | extern void queue_post(struct event_queue *q, long id, void *data); |
78 | extern bool queue_empty(const struct event_queue* q); | 78 | extern bool queue_empty(const struct event_queue* q); |
79 | void queue_clear(struct event_queue* q); | 79 | void queue_clear(struct event_queue* q); |
80 | extern int queue_broadcast(int id, void *data); | 80 | 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) | |||
113 | } | 113 | } |
114 | } | 114 | } |
115 | 115 | ||
116 | void queue_post(struct event_queue *q, int id, void *data) | 116 | void queue_post(struct event_queue *q, long id, void *data) |
117 | { | 117 | { |
118 | int wr; | 118 | int wr; |
119 | int oldlevel; | 119 | int oldlevel; |