From cfb984e9bd3a29b02c450e8ab437f243d42b6e9e Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Tue, 20 Jun 2006 08:40:26 +0000 Subject: [PATCH] . renamed __str to __makestr to allow for g++ . changed some CMOS ioctl codes to have correct sizes (struct tm instead of u32_t), a disk ioctl code from W to RW, and memory ioctl codes from R to W, needed for proper matching of grant in FS --- include/assert.h | 4 ++-- include/sys/ioc_cmos.h | 4 ++-- include/sys/ioc_disk.h | 2 +- include/sys/ioc_memory.h | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/assert.h b/include/assert.h index c97b35fbc..13f3422dd 100755 --- a/include/assert.h +++ b/include/assert.h @@ -25,8 +25,8 @@ #else /* Debugging enabled -- verify assertions at run time. */ #ifdef _ANSI -#define __str(x) # x -#define __xstr(x) __str(x) +#define __makestr(x) # x +#define __xstr(x) __makestr(x) _PROTOTYPE( void __bad_assertion, (const char *_mess) ); #define assert(expr) ((expr)? (void)0 : \ diff --git a/include/sys/ioc_cmos.h b/include/sys/ioc_cmos.h index e89355ef2..dfb26e7e0 100755 --- a/include/sys/ioc_cmos.h +++ b/include/sys/ioc_cmos.h @@ -6,8 +6,8 @@ #include -#define CIOCGETTIME _IOR('c', 1, u32_t) -#define CIOCGETTIMEY2K _IOR('c', 2, u32_t) +#define CIOCGETTIME _IOR('c', 1, struct tm) +#define CIOCGETTIMEY2K _IOR('c', 2, struct tm) #define CIOCSETTIME _IOW('c', 3, u32_t) #define CIOCSETTIMEY2K _IOW('c', 4, u32_t) diff --git a/include/sys/ioc_disk.h b/include/sys/ioc_disk.h index f5650637d..4743f7e51 100755 --- a/include/sys/ioc_disk.h +++ b/include/sys/ioc_disk.h @@ -11,7 +11,7 @@ #define DIOCSETP _IOW('d', 3, struct partition) #define DIOCGETP _IOR('d', 4, struct partition) #define DIOCEJECT _IO ('d', 5) -#define DIOCTIMEOUT _IOW('d', 6, int) +#define DIOCTIMEOUT _IORW('d', 6, int) #define DIOCOPENCT _IOR('d', 7, int) #endif /* _S_I_DISK_H */ diff --git a/include/sys/ioc_memory.h b/include/sys/ioc_memory.h index d7f5fd4da..94c561c02 100755 --- a/include/sys/ioc_memory.h +++ b/include/sys/ioc_memory.h @@ -10,7 +10,7 @@ #include #define MIOCRAMSIZE _IOW('m', 3, u32_t) -#define MIOCMAP _IOR('m', 4, struct mapreq) -#define MIOCUNMAP _IOR('m', 5, struct mapreq) +#define MIOCMAP _IOW('m', 4, struct mapreq) +#define MIOCUNMAP _IOW('m', 5, struct mapreq) #endif /* _S_I_MEMORY_H */ -- 2.44.0