[pvrusb2] Kernel compilation issues 2.6.17-rc6

[Mike Isely]

Obviously I hadn't tried 2.6.17-rcX yet.  Now having done so....

I have a clean solution for the first issue:

Index: driver/compat.h
===================================================================
--- driver/compat.h     (revision 1165)
+++ driver/compat.h     (working copy)
@@ -200,12 +200,17 @@
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)) \
      || defined(PVR2_ENABLE_V4LCVS)
  #define PVR2_ENABLE_NEW_ROUTING
-#define PVR2_CX2341X_HDR_MEDIA
  #else
  #define PVR2_ENABLE_CX25840_FWSEND_HACK
  #endif

+/* Enable various things if kernel is recent enough or we're in V4L CVS */
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)) \
+    || defined(PVR2_ENABLE_V4LCVS)
+#define PVR2_CX2341X_HDR_MEDIA
+#endif

+
  /* Enable various things if kernel is recent enough or we're in V4L CVS */
  #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)) \
      || defined(PVR2_ENABLE_V4LCVS)

The problem is that the build configuration is relying on 
CX2341X_FIRM_ENC_FIRMWARE being defined in cx2341x.h, which was a change 
with the last snapshot.  There already is a usable copy of cx2341x.h 
included in the pvrusb2 snapshot (hiding in the ivtv subdirectory), and 
the build configuration will use that copy if the kernel you're compiling 
against is too "old".  The configuration had been set up to assume that 
cx2341x.h was recent enough in the 2.6.17 kernel series, which clearly it 
isn't.  So the above patch changes things to not allow use the kernel 
cx2341x.h in 2.6.17.



On Tue, 6 Jun 2006, Bill Crowell wrote:

> The include fixed this portion of the compile. Now the driver is
> complaining about pvrusb2-audio-old.c...

Still looking at this one.  I've already reproduced the error.

   -Mike


-- 
                         |         Mike Isely          |     PGP fingerprint
      Spammers Die!!     |                             | 03 54 43 4D 75 E5 CC 92
                         |   isely @ pobox (dot) com   | 71 16 01 E2 B5 F5 C1 E8
                         |                             |