Changeset 3347

Timestamp:

07/24/99 15:19:29 (9 years ago)

Author:

frodo

Message:

mkpatch updates.

Video4Linux should now be able to live next to the our new i2c package.
v4l files are renamed i2c-old.c and i2c-old.h, but except for that, no
changes were necessary.

Files:

• i2c/trunk/kernel/i2c-core.c (modified) (1 diff)
• i2c/trunk/mkpatch/OLDI2C (added)
• i2c/trunk/mkpatch/mkpatch.pl (modified) (12 diffs)

i2c/trunk/kernel/i2c-core.c

@@ -1135 +1135 @@
-
-
-
+static 
-{
-        /* clear algorithms */

i2c/trunk/mkpatch/mkpatch.pl

@@ -20 +20 @@
-use strict;
-
+use vars qw($temp);
+$temp = "mkpatch/.temp";
+
-# $_[0]: i2c package root (like /tmp/i2c)
-# $_[1]: Linux kernel tree (like /usr/src/linux)
@@ -29 +32 @@
-  my ($diff_command,$dummy);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-  $dummy = <INPUT>;
-  $dummy = <INPUT>;
@@ -43 +55 @@
-}
-
+# $_[0]: sensors package root (like /tmp/sensors)
+# $_[1]: Linux kernel tree (like /usr/src/linux)
+sub patch_old_i2c
+{
+  my ($package_root,$kernel_root) = @_;
+  my (@files,$file);
+  print_diff $kernel_root,$kernel_root,"include/linux/i2c-old.h", 
+             "include/linux/i2c.h"
+        if (not -e "$kernel_root/include/linux/i2c-old.h");
+
+  open INPUT, "$package_root/mkpatch/OLDI2C" 
+        or die "Can't open `$package_root/mkpatch/OLDI2C'";
+  @files = <INPUT>;
+  close INPUT;
+
+  foreach $file (@files,"drivers/char/i2c-old.c") {
+    chomp $file;
+    if ($file eq "drivers/char/i2c-old.c") {
+      open INPUT, "$kernel_root/drivers/char/i2c.c"
+            or die "Can't open `$kernel_root/drivers/char/i2c.c'";
+    } else { 
+      open INPUT, "$kernel_root/$file"
+           or die "Can't open `$kernel_root/$file'";
+    }
+    open OUTPUT, ">$package_root/$temp"
+           or die "Can't open `$package_root/$temp'";
+    while (<INPUT>) {
+      s@(\s*#\s*include\s*)<linux/i2c.h>@\1<linux/i2c-old.h>@;
+      print OUTPUT;
+    }
+    close INPUT;
+    close OUTPUT;
+    print_diff $package_root,$kernel_root,$file,$temp;
+  }
+}
+
-# $_[0]: i2c package root (like /tmp/i2c)
-# $_[1]: Linux kernel tree (like /usr/src/linux)
@@ -49 +97 @@
-  my ($package_root,$kernel_root) = @_;
-  my $kernel_file = "Makefile";
-"mkpatch/.temp"
-
-
-
-mkpatch/.temp
+$temp
+
+
+
+$package_file
-        or die "Can't open $package_root/$package_file";
-  while(<INPUT>) {
@@ -82 +130 @@
-  my ($package_root,$kernel_root) = @_;
-  my $kernel_file = "drivers/Makefile";
-"mkpatch/.temp"
+$temp
-  my $i2c_present;
-
-  open INPUT,"$kernel_root/$kernel_file"
-        or die "Can't open `$kernel_root/$kernel_file'";
-mkpatch/.temp
+$package_file
-        or die "Can't open $package_root/$package_file";
-  while(<INPUT>) {
@@ -127 +175 @@
-# $_[0]: i2c package root (like /tmp/i2c)
-# $_[1]: Linux kernel tree (like /usr/src/linux)
+sub gen_drivers_char_Makefile
+{
+  my ($package_root,$kernel_root) = @_;
+  my $kernel_file = "drivers/char/Makefile";
+  my $package_file = $temp;
+  open INPUT,"$kernel_root/$kernel_file"
+        or die "Can't open `$kernel_root/$kernel_file'";
+  open OUTPUT,">$package_root/$package_file"
+        or die "Can't open $package_root/$package_file";
+  while(<INPUT>) {
+    s@i2c\.o@i2c-old\.o@;
+    print OUTPUT;
+  }
+  close INPUT;
+  close OUTPUT;
+  print_diff $package_root,$kernel_root,$kernel_file,$package_file;
+}
+
+# $_[0]: i2c package root (like /tmp/i2c)
+# $_[1]: Linux kernel tree (like /usr/src/linux)
-sub gen_drivers_char_Config_in
-{
-  my ($package_root,$kernel_root) = @_;
-  my $kernel_file = "drivers/char/Config.in";
-"mkpatch/.temp"
+$temp
-  my $ready = 0;
-  my $done = 0;
@@ -137 +205 @@
-  open INPUT,"$kernel_root/$kernel_file"
-        or die "Can't open `$kernel_root/$kernel_file'";
-mkpatch/.temp
+$package_file
-        or die "Can't open $package_root/$package_file";
-  while(<INPUT>) {
@@ -166 +234 @@
-  my ($package_root,$kernel_root) = @_;
-  my $kernel_file = "drivers/char/mem.c";
-"mkpatch/.temp"
+$temp
-  my $right_place = 0;
-  my $with_video = 0;
-  my $done = 0;
-  my $atstart = 1;
@@ -174 +241 @@
-  open INPUT,"$kernel_root/$kernel_file"
-        or die "Can't open `$kernel_root/$kernel_file'";
-
-
-
+
+
+
+
+
+
-    if ($atstart and m@#ifdef@) {
-      print OUTPUT << 'EOF';
+#ifdef CONFIG_VIDEO_BT848
+extern int i2c_init(void);
+#endif
-#ifdef CONFIG_I2C
-void
+int
-#endif
-EOF
-      $atstart = 0;
-    }
-if (not $right_place and m@CONFIG_I2C@
+while (not $right_place and (m@CONFIG_I2C@ or m@CONFIG_VIDEO_BT848@)
-      $_ = <INPUT> while not m@#endif@;
-      $_ = <INPUT>;
-    }
-    $with_video = 1 if m@CONFIG_VIDEO_BT848@;
-    $right_place = 1 if (m@lp_init\(\);@);
+    if ($right_place and m@CONFIG_I2C@) {
+      $_ = <INPUT> while not m@#endif@;
+      $_ = <INPUT>;
+    }
-    if ($right_place and not $done and
-
-
-
-
-
-
-
-
-
-
-
+
-      print OUTPUT <<'EOF';
-
+
-        i2c_init_all();
-#endif
@@ -231 +297 @@
-  die "Kernel root `$kernel_root' is not found\n" 
-        unless -f "$kernel_root/Rules.make";
+
+  patch_old_i2c $package_root, $kernel_root 
+         if not -e "$kernel_root/drivers/char/i2c-old.c";
-
-  # --> Read FILES
@@ -254 +323 @@
-  foreach $package_file (keys %files) {
-    $kernel_file = $files{$package_file};
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-    while (<INPUT>) {
-      eval $sedscript;
-
+ OUTPUT
-    }
-    close INPUT;
+    close OUTPUT;
+    print_diff "$package_root","$kernel_root","$kernel_file","$temp";
-  }
-
@@ -278 +340 @@
-  gen_drivers_char_Config_in $package_root, $kernel_root;
-  gen_drivers_char_mem_c $package_root, $kernel_root;
+  gen_drivers_char_Makefile $package_root, $kernel_root;
-}
-