Re: [Xenomai-help] make xenomai/serial/16550A module error

[Jan Kiszka <jan.kiszka@domain.hid>]

[-- Attachment #1.1: Type: text/plain, Size: 862 bytes --]

Dennis Nguyen wrote:
> I tried to build linux kernel 2.6.20.10 with xenomai 2.3.4 with serial 
> 16550A Module (I selected serial 16550A as a M). 
> (adeos-ipipe-2.6.20-i386-1.10-10.patch)
> 
> I had an error:
>    CC [M]  drivers/xenomai/serial/16550A.o
> drivers/xenomai/serial/16550A.c: In function ‘rt_16550_open’:
> drivers/xenomai/serial/16550A.c:448: error: incompatible types in assignment
> make[3]: *** [drivers/xenomai/serial/16550A.o] Error 1
> make[2]: *** [drivers/xenomai/serial] Error 2
> make[1]: *** [drivers/xenomai] Error 2
> make: *** [drivers] Error 2
> [root@domain.hid linux-2.6.20.10]#
> 
> Any suggestion please?

So far for "please use the latest patch". :-/

Some assumption of the 2.3.x branch about what is when defined became
invalid with ipipe-1.10-10, attached patch fixes it. Philippe, please apply.

Jan

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: fix-lock-wrapping.patch --]
[-- Type: text/x-patch; name="fix-lock-wrapping.patch", Size: 1520 bytes --]

Index: xenomai-2.3.x/include/asm-generic/hal.h
===================================================================
--- xenomai-2.3.x/include/asm-generic/hal.h	(Revision 3130)
+++ xenomai-2.3.x/include/asm-generic/hal.h	(Arbeitskopie)
@@ -84,20 +84,27 @@
 
 typedef struct ipipe_domain rthal_pipeline_stage_t;
 
-#ifdef IPIPE_RW_LOCK_UNLOCKED
+#ifdef IPIPE_SPIN_LOCK_UNLOCKED
 typedef ipipe_spinlock_t rthal_spinlock_t;
 #define RTHAL_SPIN_LOCK_UNLOCKED IPIPE_SPIN_LOCK_UNLOCKED
+#else /* !IPIPE_SPIN_LOCK_UNLOCKED */
+#ifdef RAW_SPIN_LOCK_UNLOCKED
+typedef raw_spinlock_t rthal_spinlock_t;
+#define RTHAL_SPIN_LOCK_UNLOCKED RAW_SPIN_LOCK_UNLOCKED
+#else /* !RAW_SPIN_LOCK_UNLOCKED */
+typedef spinlock_t rthal_spinlock_t;
+#define RTHAL_SPIN_LOCK_UNLOCKED SPIN_LOCK_UNLOCKED
+#endif /* !RAW_SPIN_LOCK_UNLOCKED */
+#endif /* !IPIPE_SPIN_LOCK_UNLOCKED */
+
+#ifdef IPIPE_RW_LOCK_UNLOCKED
 typedef ipipe_rwlock_t rthal_rwlock_t;
 #define RTHAL_RW_LOCK_UNLOCKED   IPIPE_RW_LOCK_UNLOCKED
 #else /* !IPIPE_RW_LOCK_UNLOCKED */
 #ifdef RAW_RW_LOCK_UNLOCKED
-typedef raw_spinlock_t rthal_spinlock_t;
-#define RTHAL_SPIN_LOCK_UNLOCKED RAW_SPIN_LOCK_UNLOCKED
 typedef raw_rwlock_t rthal_rwlock_t;
 #define RTHAL_RW_LOCK_UNLOCKED RAW_RW_LOCK_UNLOCKED
 #else /* !RAW_RW_LOCK_UNLOCKED */
-typedef spinlock_t rthal_spinlock_t;
-#define RTHAL_SPIN_LOCK_UNLOCKED SPIN_LOCK_UNLOCKED
 typedef rwlock_t rthal_rwlock_t;
 #define RTHAL_RW_LOCK_UNLOCKED RW_LOCK_UNLOCKED
 #endif /* RAW_RW_LOCK_UNLOCKED */

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 252 bytes --]