---

yaml --- r: 4640 b: refs/heads/master c: c12a828 h: refs/heads/master v: v3
git-mirror · Jul 12, 2005 · adb5a31 · adb5a31
1 parent a7c5c4b
commit adb5a31
Show file tree

Hide file tree

Showing 140 changed files with 1,468 additions and 2,988 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ffc7a0ebfcace0ed3eb77fb77e159f6f9443ec5
+refs/heads/master: c12a828982ee27e0d9f742177016896d6c3a5acb
diff --git a/trunk/Documentation/usb/sn9c102.txt b/trunk/Documentation/usb/sn9c102.txt
@@ -297,7 +297,6 @@ Vendor ID  Product ID
 0x0c45     0x602a
 0x0c45     0x602b
 0x0c45     0x602c
-0x0c45     0x602d
 0x0c45     0x6030
 0x0c45     0x6080
 0x0c45     0x6082
@@ -334,7 +333,6 @@ Model       Manufacturer
 -----       ------------
 HV7131D     Hynix Semiconductor, Inc.
 MI-0343     Micron Technology, Inc.
-OV7630      OmniVision Technologies, Inc.
 PAS106B     PixArt Imaging, Inc.
 PAS202BCB   PixArt Imaging, Inc.
 TAS5110C1B  Taiwan Advanced Sensor Corporation
@@ -472,11 +470,9 @@ order):
 - Luca Capello for the donation of a webcam;
 - Joao Rodrigo Fuzaro, Joao Limirio, Claudio Filho and Caio Begotti for the
   donation of a webcam;
-- Jon Hollstrom for the donation of a webcam;
 - Carlos Eduardo Medaglia Dyonisio, who added the support for the PAS202BCB
   image sensor;
 - Stefano Mozzi, who donated 45 EU;
-- Andrew Pearce for the donation of a webcam;
 - Bertrik Sikken, who reverse-engineered and documented the Huffman compression
   algorithm used in the SN9C10x controllers and implemented the first decoder;
 - Mizuno Takafumi for the donation of a webcam;

diff --git a/trunk/Documentation/usb/usbmon.txt b/trunk/Documentation/usb/usbmon.txt
@@ -101,13 +101,6 @@ Here is the list of words, from left to right:
   or 3 and 2 positions, correspondingly.
 - URB Status. This field makes no sense for submissions, but is present
   to help scripts with parsing. In error case, it contains the error code.
-  In case of a setup packet, it contains a Setup Tag. If scripts read a number
-  in this field, the proceed to read Data Length. Otherwise, they read
-  the setup packet before reading the Data Length.
-- Setup packet, if present, consists of 5 words: one of each for bmRequestType,
-  bRequest, wValue, wIndex, wLength, as specified by the USB Specification 2.0.
-  These words are safe to decode if Setup Tag was 's'. Otherwise, the setup
-  packet was present, but not captured, and the fields contain filler.
 - Data Length. This is the actual length in the URB.
 - Data tag. The usbmon may not always capture data, even if length is nonzero.
   Only if tag is '=', the data words are present.
@@ -132,31 +125,25 @@ class ParsedLine {
 			String data_str = st.nextToken();
 			int len = data_str.length() / 2;
 			int i;
-			int b;	// byte is signed, apparently?! XXX
 			for (i = 0; i < len; i++) {
-				// data[data_len] = Byte.parseByte(
-				//     data_str.substring(i*2, i*2 + 2),
-				//     16);
-				b = Integer.parseInt(
-				     data_str.substring(i*2, i*2 + 2),
-				     16);
-				if (b >= 128)
-					b *= -1;
-				data[data_len] = (byte) b;
+				data[data_len] = Byte.parseByte(
+				    data_str.substring(i*2, i*2 + 2),
+				    16);
 				data_len++;
 			}
 		}
 	}
 }
 
-This format may be changed in the future.
+This format is obviously deficient. For example, the setup packet for control
+transfers is not delivered. This will change in the future.
 
 Examples:
 
-An input control transfer to get a port status.
+An input control transfer to get a port status:
 
-d5ea89a0 3575914555 S Ci:001:00 s a3 00 0000 0003 0004 4 <
-d5ea89a0 3575914560 C Ci:001:00 0 4 = 01050000
+d74ff9a0 2640288196 S Ci:001:00 -115 4 <
+d74ff9a0 2640288202 C Ci:001:00 0 4 = 01010100
 
 An output bulk transfer to send a SCSI command 0x5E in a 31-byte Bulk wrapper
 to a storage device at address 5:

diff --git a/trunk/arch/alpha/Kconfig b/trunk/arch/alpha/Kconfig
@@ -596,8 +596,6 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -700,8 +700,6 @@ config APM
 
 endmenu
 
-source "net/Kconfig"
-
 menu "Device Drivers"
 
 source "drivers/base/Kconfig"
@@ -734,7 +732,7 @@ source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
 
-source "drivers/net/Kconfig"
+source "net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 

diff --git a/trunk/arch/arm26/Kconfig b/trunk/arch/arm26/Kconfig
@@ -183,8 +183,6 @@ source "mm/Kconfig"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/base/Kconfig"
 
 source "drivers/parport/Kconfig"
@@ -195,7 +193,7 @@ source "drivers/block/Kconfig"
 
 source "drivers/md/Kconfig"
 
-source "drivers/net/Kconfig"
+source "net/Kconfig"
 
 source "drivers/ide/Kconfig"
 

diff --git a/trunk/arch/cris/Kconfig b/trunk/arch/cris/Kconfig
@@ -122,8 +122,6 @@ source arch/cris/arch-v10/Kconfig
 
 endmenu
 
-source "net/Kconfig"
-
 # bring in ETRAX built-in drivers
 menu "Drivers for built-in interfaces"
 source arch/cris/arch-v10/drivers/Kconfig
@@ -151,7 +149,7 @@ source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
 
-source "drivers/net/Kconfig"
+source "net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 

diff --git a/trunk/arch/frv/Kconfig b/trunk/arch/frv/Kconfig
@@ -346,8 +346,6 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/h8300/Kconfig b/trunk/arch/h8300/Kconfig
@@ -55,8 +55,6 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/base/Kconfig"
 
 source "drivers/mtd/Kconfig"
@@ -67,7 +65,7 @@ source "drivers/ide/Kconfig"
 
 source "arch/h8300/Kconfig.ide"
 
-source "drivers/net/Kconfig"
+source "net/Kconfig"
 
 #
 # input - input/joystick depends on it. As does USB.

diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
@@ -1285,8 +1285,6 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
@@ -423,8 +423,6 @@ endmenu
 
 endif
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/m32r/Kconfig b/trunk/arch/m32r/Kconfig
@@ -359,8 +359,6 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/m68k/Kconfig b/trunk/arch/m68k/Kconfig
@@ -450,8 +450,6 @@ source "drivers/zorro/Kconfig"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 menu "Character devices"

diff --git a/trunk/arch/m68knommu/Kconfig b/trunk/arch/m68knommu/Kconfig
@@ -575,8 +575,6 @@ config PM
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
@@ -1640,8 +1640,6 @@ config PM
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/parisc/Kconfig b/trunk/arch/parisc/Kconfig
@@ -190,8 +190,6 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/ppc/Kconfig b/trunk/arch/ppc/Kconfig
@@ -1355,8 +1355,6 @@ config PIN_TLB
 	depends on ADVANCED_OPTIONS && 8xx
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/ppc64/Kconfig b/trunk/arch/ppc64/Kconfig
@@ -429,8 +429,6 @@ config CMDLINE
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/s390/Kconfig b/trunk/arch/s390/Kconfig
@@ -465,8 +465,6 @@ config KEXEC
 
 endmenu
 
-source "net/Kconfig"
-
 config PCMCIA
 	bool
 	default n
@@ -477,7 +475,7 @@ source "drivers/scsi/Kconfig"
 
 source "drivers/s390/Kconfig"
 
-source "drivers/net/Kconfig"
+source "net/Kconfig"
 
 source "fs/Kconfig"
 

diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig
@@ -784,8 +784,6 @@ config EMBEDDED_RAMDISK_IMAGE
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/sh64/Kconfig b/trunk/arch/sh64/Kconfig
@@ -268,8 +268,6 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig
@@ -268,8 +268,6 @@ source "mm/Kconfig"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 if !SUN4

diff --git a/trunk/arch/sparc64/Kconfig b/trunk/arch/sparc64/Kconfig
@@ -525,8 +525,6 @@ source "mm/Kconfig"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/base/Kconfig"
 
 source "drivers/video/Kconfig"
@@ -553,7 +551,7 @@ endif
 
 source "drivers/ieee1394/Kconfig"
 
-source "drivers/net/Kconfig"
+source "net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 

diff --git a/trunk/arch/sparc64/kernel/smp.c b/trunk/arch/sparc64/kernel/smp.c
@@ -45,8 +45,8 @@ extern void calibrate_delay(void);
 /* Please don't make this stuff initdata!!!  --DaveM */
 static unsigned char boot_cpu_id;
 
-cpumask_t cpu_online_map = CPU_MASK_NONE __read_mostly;
-cpumask_t phys_cpu_present_map = CPU_MASK_NONE __read_mostly;
+cpumask_t cpu_online_map __read_mostly = CPU_MASK_NONE;
+cpumask_t phys_cpu_present_map __read_mostly = CPU_MASK_NONE;
 static cpumask_t smp_commenced_mask;
 static cpumask_t cpu_callout_map;
 

diff --git a/trunk/arch/um/Kconfig b/trunk/arch/um/Kconfig
@@ -275,8 +275,6 @@ endmenu
 
 source "init/Kconfig"
 
-source "net/Kconfig"
-
 source "drivers/base/Kconfig"
 
 source "arch/um/Kconfig_char"
@@ -289,7 +287,7 @@ config NETDEVICES
 
 source "arch/um/Kconfig_net"
 
-source "drivers/net/Kconfig"
+source "net/Kconfig"
 
 source "fs/Kconfig"
 

diff --git a/trunk/arch/v850/Kconfig b/trunk/arch/v850/Kconfig
@@ -250,8 +250,6 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
-source "net/Kconfig"
-
 #############################################################################
 
 source "drivers/base/Kconfig"
@@ -285,7 +283,7 @@ source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
 
-source "drivers/net/Kconfig"
+source "net/Kconfig"
 
 source "drivers/isdn/Kconfig"
 

diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig
@@ -515,8 +515,6 @@ config UID16
 
 endmenu
 
-source "net/Kconfig"
-
 source drivers/Kconfig
 
 source "drivers/firmware/Kconfig"

diff --git a/trunk/arch/xtensa/Kconfig b/trunk/arch/xtensa/Kconfig
@@ -228,8 +228,6 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
-source "net/Kconfig"
-
 source "drivers/Kconfig"
 
 source "fs/Kconfig"

diff --git a/trunk/drivers/Kconfig b/trunk/drivers/Kconfig
@@ -28,7 +28,7 @@ source "drivers/message/i2o/Kconfig"
 
 source "drivers/macintosh/Kconfig"
 
-source "drivers/net/Kconfig"
+source "net/Kconfig"
 
 source "drivers/isdn/Kconfig"
-Original file line number
+Diff line change
@@ Expand Up / @@ -596,8 +596,6 @@ source "fs/Kconfig.binfmt" @@
     endmenu
-    source "net/Kconfig"
     source "drivers/Kconfig"
     source "fs/Kconfig"
@@ Expand Down @@