diff options
author | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
---|---|---|
committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2005-12-20 23:03:50 -0500 |
commit | 041387d98460b3947587929ef3a4773b8c48538f (patch) | |
tree | 3330eebba3fa1aa7c13479e527f07b03d7fb53ed | |
parent | 56f0356321a876a1a356712f2486d6188a3b4992 (diff) | |
parent | b05948d9b7167e23af88cc65b9ffa4687eaf1f0d (diff) |
Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)
390 files changed, 6063 insertions, 5617 deletions
diff --git a/Documentation/arm/00-INDEX b/Documentation/arm/00-INDEX index d753fe59a248..2c6a3b38967e 100644 --- a/Documentation/arm/00-INDEX +++ b/Documentation/arm/00-INDEX | |||
@@ -16,5 +16,7 @@ empeg | |||
16 | - Empeg documentation | 16 | - Empeg documentation |
17 | mem_alignment | 17 | mem_alignment |
18 | - alignment abort handler documentation | 18 | - alignment abort handler documentation |
19 | memory.txt | ||
20 | - description of the virtual memory layout | ||
19 | nwfpe | 21 | nwfpe |
20 | - NWFPE floating point emulator documentation | 22 | - NWFPE floating point emulator documentation |
diff --git a/Documentation/dvb/README.dvb-usb b/Documentation/dvb/README.dvb-usb index ac0797ea646c..46b78b7331c2 100644 --- a/Documentation/dvb/README.dvb-usb +++ b/Documentation/dvb/README.dvb-usb | |||
@@ -50,12 +50,12 @@ http://www.linuxtv.org/wiki/index.php/DVB_USB | |||
50 | 0. History & News: | 50 | 0. History & News: |
51 | 2005-06-30 - added support for WideView WT-220U (Thanks to Steve Chang) | 51 | 2005-06-30 - added support for WideView WT-220U (Thanks to Steve Chang) |
52 | 2005-05-30 - added basic isochronous support to the dvb-usb-framework | 52 | 2005-05-30 - added basic isochronous support to the dvb-usb-framework |
53 | added support for Conexant Hybrid reference design and Nebula DigiTV USB | 53 | added support for Conexant Hybrid reference design and Nebula DigiTV USB |
54 | 2005-04-17 - all dibusb devices ported to make use of the dvb-usb-framework | 54 | 2005-04-17 - all dibusb devices ported to make use of the dvb-usb-framework |
55 | 2005-04-02 - re-enabled and improved remote control code. | 55 | 2005-04-02 - re-enabled and improved remote control code. |
56 | 2005-03-31 - ported the Yakumo/Hama/Typhoon DVB-T USB2.0 device to dvb-usb. | 56 | 2005-03-31 - ported the Yakumo/Hama/Typhoon DVB-T USB2.0 device to dvb-usb. |
57 | 2005-03-30 - first commit of the dvb-usb-module based on the dibusb-source. First device is a new driver for the | 57 | 2005-03-30 - first commit of the dvb-usb-module based on the dibusb-source. First device is a new driver for the |
58 | TwinhanDTV Alpha / MagicBox II USB2.0-only DVB-T device. | 58 | TwinhanDTV Alpha / MagicBox II USB2.0-only DVB-T device. |
59 | 59 | ||
60 | (change from dvb-dibusb to dvb-usb) | 60 | (change from dvb-dibusb to dvb-usb) |
61 | 2005-03-28 - added support for the AVerMedia AverTV DVB-T USB2.0 device (Thanks to Glen Harris and Jiun-Kuei Jung, AVerMedia) | 61 | 2005-03-28 - added support for the AVerMedia AverTV DVB-T USB2.0 device (Thanks to Glen Harris and Jiun-Kuei Jung, AVerMedia) |
@@ -64,50 +64,50 @@ http://www.linuxtv.org/wiki/index.php/DVB_USB | |||
64 | 2005-02-02 - added support for the Hauppauge Win-TV Nova-T USB2 | 64 | 2005-02-02 - added support for the Hauppauge Win-TV Nova-T USB2 |
65 | 2005-01-31 - distorted streaming is gone for USB1.1 devices | 65 | 2005-01-31 - distorted streaming is gone for USB1.1 devices |
66 | 2005-01-13 - moved the mirrored pid_filter_table back to dvb-dibusb | 66 | 2005-01-13 - moved the mirrored pid_filter_table back to dvb-dibusb |
67 | - first almost working version for HanfTek UMT-010 | 67 | - first almost working version for HanfTek UMT-010 |
68 | - found out, that Yakumo/HAMA/Typhoon are predecessors of the HanfTek UMT-010 | 68 | - found out, that Yakumo/HAMA/Typhoon are predecessors of the HanfTek UMT-010 |
69 | 2005-01-10 - refactoring completed, now everything is very delightful | 69 | 2005-01-10 - refactoring completed, now everything is very delightful |
70 | - tuner quirks for some weird devices (Artec T1 AN2235 device has sometimes a | 70 | - tuner quirks for some weird devices (Artec T1 AN2235 device has sometimes a |
71 | Panasonic Tuner assembled). Tunerprobing implemented. Thanks a lot to Gunnar Wittich. | 71 | Panasonic Tuner assembled). Tunerprobing implemented. Thanks a lot to Gunnar Wittich. |
72 | 2004-12-29 - after several days of struggling around bug of no returning URBs fixed. | 72 | 2004-12-29 - after several days of struggling around bug of no returning URBs fixed. |
73 | 2004-12-26 - refactored the dibusb-driver, splitted into separate files | 73 | 2004-12-26 - refactored the dibusb-driver, splitted into separate files |
74 | - i2c-probing enabled | 74 | - i2c-probing enabled |
75 | 2004-12-06 - possibility for demod i2c-address probing | 75 | 2004-12-06 - possibility for demod i2c-address probing |
76 | - new usb IDs (Compro, Artec) | 76 | - new usb IDs (Compro, Artec) |
77 | 2004-11-23 - merged changes from DiB3000MC_ver2.1 | 77 | 2004-11-23 - merged changes from DiB3000MC_ver2.1 |
78 | - revised the debugging | 78 | - revised the debugging |
79 | - possibility to deliver the complete TS for USB2.0 | 79 | - possibility to deliver the complete TS for USB2.0 |
80 | 2004-11-21 - first working version of the dib3000mc/p frontend driver. | 80 | 2004-11-21 - first working version of the dib3000mc/p frontend driver. |
81 | 2004-11-12 - added additional remote control keys. Thanks to Uwe Hanke. | 81 | 2004-11-12 - added additional remote control keys. Thanks to Uwe Hanke. |
82 | 2004-11-07 - added remote control support. Thanks to David Matthews. | 82 | 2004-11-07 - added remote control support. Thanks to David Matthews. |
83 | 2004-11-05 - added support for a new devices (Grandtec/Avermedia/Artec) | 83 | 2004-11-05 - added support for a new devices (Grandtec/Avermedia/Artec) |
84 | - merged my changes (for dib3000mb/dibusb) to the FE_REFACTORING, because it became HEAD | 84 | - merged my changes (for dib3000mb/dibusb) to the FE_REFACTORING, because it became HEAD |
85 | - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems | 85 | - moved transfer control (pid filter, fifo control) from usb driver to frontend, it seems |
86 | better settled there (added xfer_ops-struct) | 86 | better settled there (added xfer_ops-struct) |
87 | - created a common files for frontends (mc/p/mb) | 87 | - created a common files for frontends (mc/p/mb) |
88 | 2004-09-28 - added support for a new device (Unkown, vendor ID is Hyper-Paltek) | 88 | 2004-09-28 - added support for a new device (Unkown, vendor ID is Hyper-Paltek) |
89 | 2004-09-20 - added support for a new device (Compro DVB-U2000), thanks | 89 | 2004-09-20 - added support for a new device (Compro DVB-U2000), thanks |
90 | to Amaury Demol for reporting | 90 | to Amaury Demol for reporting |
91 | - changed usb TS transfer method (several urbs, stopping transfer | 91 | - changed usb TS transfer method (several urbs, stopping transfer |
92 | before setting a new pid) | 92 | before setting a new pid) |
93 | 2004-09-13 - added support for a new device (Artec T1 USB TVBOX), thanks | 93 | 2004-09-13 - added support for a new device (Artec T1 USB TVBOX), thanks |
94 | to Christian Motschke for reporting | 94 | to Christian Motschke for reporting |
95 | 2004-09-05 - released the dibusb device and dib3000mb-frontend driver | 95 | 2004-09-05 - released the dibusb device and dib3000mb-frontend driver |
96 | 96 | ||
97 | (old news for vp7041.c) | 97 | (old news for vp7041.c) |
98 | 2004-07-15 - found out, by accident, that the device has a TUA6010XS for | 98 | 2004-07-15 - found out, by accident, that the device has a TUA6010XS for |
99 | PLL | 99 | PLL |
100 | 2004-07-12 - figured out, that the driver should also work with the | 100 | 2004-07-12 - figured out, that the driver should also work with the |
101 | CTS Portable (Chinese Television System) | 101 | CTS Portable (Chinese Television System) |
102 | 2004-07-08 - firmware-extraction-2.422-problem solved, driver is now working | 102 | 2004-07-08 - firmware-extraction-2.422-problem solved, driver is now working |
103 | properly with firmware extracted from 2.422 | 103 | properly with firmware extracted from 2.422 |
104 | - #if for 2.6.4 (dvb), compile issue | 104 | - #if for 2.6.4 (dvb), compile issue |
105 | - changed firmware handling, see vp7041.txt sec 1.1 | 105 | - changed firmware handling, see vp7041.txt sec 1.1 |
106 | 2004-07-02 - some tuner modifications, v0.1, cleanups, first public | 106 | 2004-07-02 - some tuner modifications, v0.1, cleanups, first public |
107 | 2004-06-28 - now using the dvb_dmx_swfilter_packets, everything | 107 | 2004-06-28 - now using the dvb_dmx_swfilter_packets, everything |
108 | runs fine now | 108 | runs fine now |
109 | 2004-06-27 - able to watch and switching channels (pre-alpha) | 109 | 2004-06-27 - able to watch and switching channels (pre-alpha) |
110 | - no section filtering yet | 110 | - no section filtering yet |
111 | 2004-06-06 - first TS received, but kernel oops :/ | 111 | 2004-06-06 - first TS received, but kernel oops :/ |
112 | 2004-05-14 - firmware loader is working | 112 | 2004-05-14 - firmware loader is working |
113 | 2004-05-11 - start writing the driver | 113 | 2004-05-11 - start writing the driver |
diff --git a/Documentation/dvb/README.flexcop b/Documentation/dvb/README.flexcop index a50c70f9ca72..5515469de7cf 100644 --- a/Documentation/dvb/README.flexcop +++ b/Documentation/dvb/README.flexcop | |||
@@ -174,7 +174,7 @@ Debugging | |||
174 | Everything which is identical in the following table, can be put into a common | 174 | Everything which is identical in the following table, can be put into a common |
175 | flexcop-module. | 175 | flexcop-module. |
176 | 176 | ||
177 | PCI USB | 177 | PCI USB |
178 | ------------------------------------------------------------------------------- | 178 | ------------------------------------------------------------------------------- |
179 | Different: | 179 | Different: |
180 | Register access: accessing IO memory USB control message | 180 | Register access: accessing IO memory USB control message |
diff --git a/Documentation/dvb/avermedia.txt b/Documentation/dvb/avermedia.txt index 09020ebd202b..2dc260b2b0a4 100644 --- a/Documentation/dvb/avermedia.txt +++ b/Documentation/dvb/avermedia.txt | |||
@@ -1,6 +1,6 @@ | |||
1 | 1 | ||
2 | HOWTO: Get An Avermedia DVB-T working under Linux | 2 | HOWTO: Get An Avermedia DVB-T working under Linux |
3 | ______________________________________________ | 3 | ______________________________________________ |
4 | 4 | ||
5 | Table of Contents | 5 | Table of Contents |
6 | Assumptions and Introduction | 6 | Assumptions and Introduction |
diff --git a/Documentation/dvb/cards.txt b/Documentation/dvb/cards.txt index 19329cf7b097..9e10092440e1 100644 --- a/Documentation/dvb/cards.txt +++ b/Documentation/dvb/cards.txt | |||
@@ -16,7 +16,7 @@ Hardware supported by the linuxtv.org DVB drivers | |||
16 | shielding, and the whole metal box has its own part number. | 16 | shielding, and the whole metal box has its own part number. |
17 | 17 | ||
18 | 18 | ||
19 | o Frontends drivers: | 19 | o Frontends drivers: |
20 | - dvb_dummy_fe: for testing... | 20 | - dvb_dummy_fe: for testing... |
21 | DVB-S: | 21 | DVB-S: |
22 | - ves1x93 : Alps BSRV2 (ves1893 demodulator) and dbox2 (ves1993) | 22 | - ves1x93 : Alps BSRV2 (ves1893 demodulator) and dbox2 (ves1993) |
@@ -24,7 +24,7 @@ o Frontends drivers: | |||
24 | - grundig_29504-491 : Grundig 29504-491 (Philips TDA8083 demodulator), tsa5522 PLL | 24 | - grundig_29504-491 : Grundig 29504-491 (Philips TDA8083 demodulator), tsa5522 PLL |
25 | - mt312 : Zarlink mt312 or Mitel vp310 demodulator, sl1935 or tsa5059 PLL | 25 | - mt312 : Zarlink mt312 or Mitel vp310 demodulator, sl1935 or tsa5059 PLL |
26 | - stv0299 : Alps BSRU6 (tsa5059 PLL), LG TDQB-S00x (tsa5059 PLL), | 26 | - stv0299 : Alps BSRU6 (tsa5059 PLL), LG TDQB-S00x (tsa5059 PLL), |
27 | LG TDQF-S001F (sl1935 PLL), Philips SU1278 (tua6100 PLL), | 27 | LG TDQF-S001F (sl1935 PLL), Philips SU1278 (tua6100 PLL), |
28 | Philips SU1278SH (tsa5059 PLL), Samsung TBMU24112IMB | 28 | Philips SU1278SH (tsa5059 PLL), Samsung TBMU24112IMB |
29 | DVB-C: | 29 | DVB-C: |
30 | - ves1820 : various (ves1820 demodulator, sp5659c or spXXXX PLL) | 30 | - ves1820 : various (ves1820 demodulator, sp5659c or spXXXX PLL) |
@@ -35,8 +35,8 @@ o Frontends drivers: | |||
35 | - grundig_29504-401 : Grundig 29504-401 (LSI L64781 demodulator), tsa5060 PLL | 35 | - grundig_29504-401 : Grundig 29504-401 (LSI L64781 demodulator), tsa5060 PLL |
36 | - tda1004x : Philips tda10045h (td1344 or tdm1316l PLL) | 36 | - tda1004x : Philips tda10045h (td1344 or tdm1316l PLL) |
37 | - nxt6000 : Alps TDME7 (MITEL SP5659 PLL), Alps TDED4 (TI ALP510 PLL), | 37 | - nxt6000 : Alps TDME7 (MITEL SP5659 PLL), Alps TDED4 (TI ALP510 PLL), |
38 | Comtech DVBT-6k07 (SP5730 PLL) | 38 | Comtech DVBT-6k07 (SP5730 PLL) |
39 | (NxtWave Communications NXT6000 demodulator) | 39 | (NxtWave Communications NXT6000 demodulator) |
40 | - sp887x : Microtune 7202D | 40 | - sp887x : Microtune 7202D |
41 | - dib3000mb : DiBcom 3000-MB demodulator | 41 | - dib3000mb : DiBcom 3000-MB demodulator |
42 | DVB-S/C/T: | 42 | DVB-S/C/T: |
diff --git a/Documentation/dvb/contributors.txt b/Documentation/dvb/contributors.txt index 2cbd2d0f6fdf..4c33cced5f65 100644 --- a/Documentation/dvb/contributors.txt +++ b/Documentation/dvb/contributors.txt | |||
@@ -15,7 +15,7 @@ Michael Holzt <kju@debian.org> | |||
15 | 15 | ||
16 | Diego Picciani <d.picciani@novacomp.it> | 16 | Diego Picciani <d.picciani@novacomp.it> |
17 | for CyberLogin for Linux which allows logging onto EON | 17 | for CyberLogin for Linux which allows logging onto EON |
18 | (in case you are wondering where CyberLogin is, EON changed its login | 18 | (in case you are wondering where CyberLogin is, EON changed its login |
19 | procedure and CyberLogin is no longer used.) | 19 | procedure and CyberLogin is no longer used.) |
20 | 20 | ||
21 | Martin Schaller <martin@smurf.franken.de> | 21 | Martin Schaller <martin@smurf.franken.de> |
@@ -57,7 +57,7 @@ Augusto Cardoso <augusto@carhil.net> | |||
57 | Davor Emard <emard@softhome.net> | 57 | Davor Emard <emard@softhome.net> |
58 | for his work on the budget drivers, the demux code, | 58 | for his work on the budget drivers, the demux code, |
59 | the module unloading problems, ... | 59 | the module unloading problems, ... |
60 | 60 | ||
61 | Hans-Frieder Vogt <hfvogt@arcor.de> | 61 | Hans-Frieder Vogt <hfvogt@arcor.de> |
62 | for his work on calculating and checking the crc's for the | 62 | for his work on calculating and checking the crc's for the |
63 | TechnoTrend/Hauppauge DEC driver firmware | 63 | TechnoTrend/Hauppauge DEC driver firmware |
diff --git a/Documentation/dvb/readme.txt b/Documentation/dvb/readme.txt index 754c98c6ad94..f5c50b22de3b 100644 --- a/Documentation/dvb/readme.txt +++ b/Documentation/dvb/readme.txt | |||
@@ -20,7 +20,7 @@ http://linuxtv.org/downloads/ | |||
20 | 20 | ||
21 | What's inside this directory: | 21 | What's inside this directory: |
22 | 22 | ||
23 | "cards.txt" | 23 | "cards.txt" |
24 | contains a list of supported hardware. | 24 | contains a list of supported hardware. |
25 | 25 | ||
26 | "contributors.txt" | 26 | "contributors.txt" |
@@ -37,7 +37,7 @@ that require it. | |||
37 | contains detailed informations about the | 37 | contains detailed informations about the |
38 | TT DEC2000/DEC3000 USB DVB hardware. | 38 | TT DEC2000/DEC3000 USB DVB hardware. |
39 | 39 | ||
40 | "bt8xx.txt" | 40 | "bt8xx.txt" |
41 | contains detailed installation instructions for the | 41 | contains detailed installation instructions for the |
42 | various bt8xx based "budget" DVB cards | 42 | various bt8xx based "budget" DVB cards |
43 | (Nebula, Pinnacle PCTV, Twinhan DST) | 43 | (Nebula, Pinnacle PCTV, Twinhan DST) |
diff --git a/Documentation/filesystems/ext3.txt b/Documentation/filesystems/ext3.txt index 9ab7f446f7ad..9840d5b8d5b9 100644 --- a/Documentation/filesystems/ext3.txt +++ b/Documentation/filesystems/ext3.txt | |||
@@ -57,19 +57,19 @@ oldalloc This disables the Orlov block allocator and enables the | |||
57 | we'd like to get some feedback if it's the contrary for | 57 | we'd like to get some feedback if it's the contrary for |
58 | you. | 58 | you. |
59 | 59 | ||
60 | user_xattr (*) Enables POSIX Extended Attributes. It's enabled by | 60 | user_xattr Enables Extended User Attributes. Additionally, you need |
61 | default, however you need to confifure its support | 61 | to have extended attribute support enabled in the kernel |
62 | (CONFIG_EXT3_FS_XATTR). This is neccesary if you want | 62 | configuration (CONFIG_EXT3_FS_XATTR). See the attr(5) |
63 | to use POSIX Acces Control Lists support. You can visit | 63 | manual page and http://acl.bestbits.at to learn more |
64 | http://acl.bestbits.at to know more about POSIX Extended | 64 | about extended attributes. |
65 | attributes. | 65 | |
66 | 66 | nouser_xattr Disables Extended User Attributes. | |
67 | nouser_xattr Disables POSIX Extended Attributes. | 67 | |
68 | 68 | acl Enables POSIX Access Control Lists support. Additionally, | |
69 | acl (*) Enables POSIX Access Control Lists support. This is | 69 | you need to have ACL support enabled in the kernel |
70 | enabled by default, however you need to configure | 70 | configuration (CONFIG_EXT3_FS_POSIX_ACL). See the acl(5) |
71 | its support (CONFIG_EXT3_FS_POSIX_ACL). If you want | 71 | manual page and http://acl.bestbits.at for more |
72 | to know more about ACLs visit http://acl.bestbits.at | 72 | information. |
73 | 73 | ||
74 | noacl This option disables POSIX Access Control List support. | 74 | noacl This option disables POSIX Access Control List support. |
75 | 75 | ||
diff --git a/MAINTAINERS b/MAINTAINERS index 77bb08606912..6af683025ae0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -536,7 +536,7 @@ P: Mauro Carvalho Chehab | |||
536 | M: mchehab@brturbo.com.br | 536 | M: mchehab@brturbo.com.br |
537 | L: video4linux-list@redhat.com | 537 | L: video4linux-list@redhat.com |
538 | W: http://linuxtv.org | 538 | W: http://linuxtv.org |
539 | T: quilt http://www.linuxtv.org/download/quilt/ | 539 | T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git |
540 | S: Maintained | 540 | S: Maintained |
541 | 541 | ||
542 | BUSLOGIC SCSI DRIVER | 542 | BUSLOGIC SCSI DRIVER |
@@ -834,7 +834,7 @@ P: LinuxTV.org Project | |||
834 | M: linux-dvb-maintainer@linuxtv.org | 834 | M: linux-dvb-maintainer@linuxtv.org |
835 | L: linux-dvb@linuxtv.org (subscription required) | 835 | L: linux-dvb@linuxtv.org (subscription required) |
836 | W: http://linuxtv.org/ | 836 | W: http://linuxtv.org/ |
837 | T: quilt http://www.linuxtv.org/download/quilt/ | 837 | T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git |
838 | S: Supported | 838 | S: Supported |
839 | 839 | ||
840 | EATA-DMA SCSI DRIVER | 840 | EATA-DMA SCSI DRIVER |
@@ -1284,8 +1284,8 @@ T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git | |||
1284 | S: Supported | 1284 | S: Supported |
1285 | 1285 | ||
1286 | INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS | 1286 | INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS |
1287 | P: Vojtech Pavlik | 1287 | P: Dmitry Torokhov |
1288 | M: vojtech@suse.cz | 1288 | M: dtor_core@ameritech.net |
1289 | L: linux-input@atrey.karlin.mff.cuni.cz | 1289 | L: linux-input@atrey.karlin.mff.cuni.cz |
1290 | L: linux-joystick@atrey.karlin.mff.cuni.cz | 1290 | L: linux-joystick@atrey.karlin.mff.cuni.cz |
1291 | T: git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git | 1291 | T: git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git |
@@ -2896,7 +2896,7 @@ P: Mauro Carvalho Chehab | |||
2896 | M: mchehab@brturbo.com.br | 2896 | M: mchehab@brturbo.com.br |
2897 | L: video4linux-list@redhat.com | 2897 | L: video4linux-list@redhat.com |
2898 | W: http://linuxtv.org | 2898 | W: http://linuxtv.org |
2899 | T: quilt http://www.linuxtv.org/download/quilt/ | 2899 | T: git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git |
2900 | S: Maintained | 2900 | S: Maintained |
2901 | 2901 | ||
2902 | W1 DALLAS'S 1-WIRE BUS | 2902 | W1 DALLAS'S 1-WIRE BUS |
@@ -1,8 +1,8 @@ | |||
1 | VERSION = 2 | 1 | VERSION = 2 |
2 | PATCHLEVEL = 6 | 2 | PATCHLEVEL = 6 |
3 | SUBLEVEL = 15 | 3 | SUBLEVEL = 15 |
4 | EXTRAVERSION =-rc5 | 4 | EXTRAVERSION =-rc6 |
5 | NAME=Affluent Albatross | 5 | NAME=Sliding Snow Leopard |
6 | 6 | ||
7 | # *DOCUMENTATION* | 7 | # *DOCUMENTATION* |
8 | # To see a list of typical targets execute "make help" | 8 | # To see a list of typical targets execute "make help" |
@@ -408,7 +408,7 @@ outputmakefile: | |||
408 | # of make so .config is not included in this case either (for *config). | 408 | # of make so .config is not included in this case either (for *config). |
409 | 409 | ||
410 | no-dot-config-targets := clean mrproper distclean \ | 410 | no-dot-config-targets := clean mrproper distclean \ |
411 | cscope TAGS tags help %docs check% kernelrelease | 411 | cscope TAGS tags help %docs check% |
412 | 412 | ||
413 | config-targets := 0 | 413 | config-targets := 0 |
414 | mixed-targets := 0 | 414 | mixed-targets := 0 |
diff --git a/arch/alpha/kernel/machvec_impl.h b/arch/alpha/kernel/machvec_impl.h index 4959b7a3e1e6..11f996f24fde 100644 --- a/arch/alpha/kernel/machvec_impl.h +++ b/arch/alpha/kernel/machvec_impl.h | |||
@@ -41,7 +41,7 @@ | |||
41 | #define CAT1(x,y) x##y | 41 | #define CAT1(x,y) x##y |
42 | #define CAT(x,y) CAT1(x,y) | 42 | #define CAT(x,y) CAT1(x,y) |
43 | 43 | ||
44 | #define DO_DEFAULT_RTC rtc_port: 0x70 | 44 | #define DO_DEFAULT_RTC .rtc_port = 0x70 |
45 | 45 | ||
46 | #define DO_EV4_MMU \ | 46 | #define DO_EV4_MMU \ |
47 | .max_asn = EV4_MAX_ASN, \ | 47 | .max_asn = EV4_MAX_ASN, \ |
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 2ad4aa2a1536..55076a75e5bf 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S | |||
@@ -131,7 +131,7 @@ __syscall_start: | |||
131 | .long sys_wait4 | 131 | .long sys_wait4 |
132 | /* 115 */ .long sys_swapoff | 132 | /* 115 */ .long sys_swapoff |
133 | .long sys_sysinfo | 133 | .long sys_sysinfo |
134 | .long sys_ipc_wrapper | 134 | .long sys_ipc |
135 | .long sys_fsync | 135 | .long sys_fsync |
136 | .long sys_sigreturn_wrapper | 136 | .long sys_sigreturn_wrapper |
137 | /* 120 */ .long sys_clone_wrapper | 137 | /* 120 */ .long sys_clone_wrapper |
@@ -254,7 +254,7 @@ __syscall_start: | |||
254 | .long sys_fremovexattr | 254 | .long sys_fremovexattr |
255 | .long sys_tkill | 255 | .long sys_tkill |
256 | .long sys_sendfile64 | 256 | .long sys_sendfile64 |
257 | /* 240 */ .long sys_futex_wrapper | 257 | /* 240 */ .long sys_futex |
258 | .long sys_sched_setaffinity | 258 | .long sys_sched_setaffinity |
259 | .long sys_sched_getaffinity | 259 | .long sys_sched_getaffinity |
260 | .long sys_io_setup | 260 | .long sys_io_setup |
@@ -284,7 +284,7 @@ __syscall_start: | |||
284 | .long sys_fstatfs64 | 284 | .long sys_fstatfs64 |
285 | .long sys_tgkill | 285 | .long sys_tgkill |
286 | .long sys_utimes | 286 | .long sys_utimes |
287 | /* 270 */ .long sys_arm_fadvise64_64_wrapper | 287 | /* 270 */ .long sys_arm_fadvise64_64 |
288 | .long sys_pciconfig_iobase | 288 | .long sys_pciconfig_iobase |
289 | .long sys_pciconfig_read | 289 | .long sys_pciconfig_read |
290 | .long sys_pciconfig_write | 290 | .long sys_pciconfig_write |
@@ -333,7 +333,7 @@ __syscall_start: | |||
333 | .long sys_inotify_init | 333 | .long sys_inotify_init |
334 | .long sys_inotify_add_watch | 334 | .long sys_inotify_add_watch |
335 | .long sys_inotify_rm_watch | 335 | .long sys_inotify_rm_watch |
336 | .long sys_mbind_wrapper | 336 | .long sys_mbind |
337 | /* 320 */ .long sys_get_mempolicy | 337 | /* 320 */ .long sys_get_mempolicy |
338 | .long sys_set_mempolicy | 338 | .long sys_set_mempolicy |
339 | __syscall_end: | 339 | __syscall_end: |
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index d9fb819bf7cc..2a8d27e18fa7 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
@@ -614,6 +614,47 @@ __kuser_helper_start: | |||
614 | /* | 614 | /* |
615 | * Reference prototype: | 615 | * Reference prototype: |
616 | * | 616 | * |
617 | * void __kernel_memory_barrier(void) | ||
618 | * | ||
619 | * Input: | ||
620 | * | ||
621 | * lr = return address | ||
622 | * | ||
623 | * Output: | ||
624 | * | ||
625 | * none | ||
626 | * | ||
627 | * Clobbered: | ||
628 | * | ||
629 | * the Z flag might be lost | ||
630 | * | ||
631 | * Definition and user space usage example: | ||
632 | * | ||
633 | * typedef void (__kernel_dmb_t)(void); | ||
634 | * #define __kernel_dmb (*(__kernel_dmb_t *)0xffff0fa0) | ||
635 | * | ||
636 | * Apply any needed memory barrier to preserve consistency with data modified | ||
637 | * manually and __kuser_cmpxchg usage. | ||
638 | * | ||
639 | * This could be used as follows: | ||
640 | * | ||
641 | * #define __kernel_dmb() \ | ||
642 | * asm volatile ( "mov r0, #0xffff0fff; mov lr, pc; sub pc, r0, #95" \ | ||
643 | * : : : "lr","cc" ) | ||
644 | */ | ||
645 | |||
646 | __kuser_memory_barrier: @ 0xffff0fa0 | ||
647 | |||
648 | #if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_SMP) | ||
649 | mcr p15, 0, r0, c7, c10, 5 @ dmb | ||
650 | #endif | ||
651 | mov pc, lr | ||
652 | |||
653 | .align 5 | ||
654 | |||
655 | /* | ||
656 | * Reference prototype: | ||
657 | * | ||
617 | * int __kernel_cmpxchg(int oldval, int newval, int *ptr) | 658 | * int __kernel_cmpxchg(int oldval, int newval, int *ptr) |
618 | * | 659 | * |
619 | * Input: | 660 | * Input: |
@@ -642,6 +683,8 @@ __kuser_helper_start: | |||
642 | * The C flag is also set if *ptr was changed to allow for assembly | 683 | * The C flag is also set if *ptr was changed to allow for assembly |
643 | * optimization in the calling code. | 684 | * optimization in the calling code. |
644 | * | 685 | * |
686 | * Note: this routine already includes memory barriers as needed. | ||
687 | * | ||
645 | * For example, a user space atomic_add implementation could look like this: | 688 | * For example, a user space atomic_add implementation could look like this: |
646 | * | 689 | * |
647 | * #define atomic_add(ptr, val) \ | 690 | * #define atomic_add(ptr, val) \ |
@@ -698,10 +741,16 @@ __kuser_cmpxchg: @ 0xffff0fc0 | |||
698 | 741 | ||
699 | #else | 742 | #else |
700 | 743 | ||
744 | #ifdef CONFIG_SMP | ||
745 | mcr p15, 0, r0, c7, c10, 5 @ dmb | ||
746 | #endif | ||
701 | ldrex r3, [r2] | 747 | ldrex r3, [r2] |
702 | subs r3, r3, r0 | 748 | subs r3, r3, r0 |
703 | strexeq r3, r1, [r2] | 749 | strexeq r3, r1, [r2] |
704 | rsbs r0, r3, #0 | 750 | rsbs r0, r3, #0 |
751 | #ifdef CONFIG_SMP | ||
752 | mcr p15, 0, r0, c7, c10, 5 @ dmb | ||
753 | #endif | ||
705 | mov pc, lr | 754 | mov pc, lr |
706 | 755 | ||
707 | #endif | 756 | #endif |
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S index f7f183075237..e2b42997ad33 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S | |||
@@ -145,7 +145,7 @@ ENTRY(vector_swi) | |||
145 | #endif | 145 | #endif |
146 | enable_irq | 146 | enable_irq |
147 | 147 | ||
148 | str r4, [sp, #-S_OFF]! @ push fifth arg | 148 | stmdb sp!, {r4, r5} @ push fifth and sixth args |
149 | 149 | ||
150 | get_thread_info tsk | 150 | get_thread_info tsk |
151 | ldr ip, [tsk, #TI_FLAGS] @ check for syscall tracing | 151 | ldr ip, [tsk, #TI_FLAGS] @ check for syscall tracing |
@@ -204,7 +204,7 @@ ENTRY(sys_call_table) | |||
204 | * Special system call wrappers | 204 | * Special system call wrappers |
205 | */ | 205 | */ |
206 | @ r0 = syscall number | 206 | @ r0 = syscall number |
207 | @ r5 = syscall table | 207 | @ r8 = syscall table |
208 | .type sys_syscall, #function | 208 | .type sys_syscall, #function |
209 | sys_syscall: | 209 | sys_syscall: |
210 | eor scno, r0, #__NR_SYSCALL_BASE | 210 | eor scno, r0, #__NR_SYSCALL_BASE |
@@ -255,22 +255,6 @@ sys_sigaltstack_wrapper: | |||
255 | ldr r2, [sp, #S_OFF + S_SP] | 255 | ldr r2, [sp, #S_OFF + S_SP] |
256 | b do_sigaltstack | 256 | b do_sigaltstack |
257 | 257 | ||
258 | sys_futex_wrapper: | ||
259 | str r5, [sp, #4] @ push sixth arg | ||
260 | b sys_futex | ||
261 | |||
262 | sys_arm_fadvise64_64_wrapper: | ||
263 | str r5, [sp, #4] @ push r5 to stack | ||
264 | b sys_arm_fadvise64_64 | ||
265 | |||
266 | sys_mbind_wrapper: | ||
267 | str r5, [sp, #4] | ||
268 | b sys_mbind | ||
269 | |||
270 | sys_ipc_wrapper: | ||
271 | str r5, [sp, #4] @ push sixth arg | ||
272 | b sys_ipc | ||
273 | |||
274 | /* | 258 | /* |
275 | * Note: off_4k (r5) is always units of 4K. If we can't do the requested | 259 | * Note: off_4k (r5) is always units of 4K. If we can't do the requested |
276 | * offset, we return EINVAL. | 260 | * offset, we return EINVAL. |
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 6055e1427ba3..055bf5d28894 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c | |||
@@ -101,6 +101,8 @@ apply_relocate(Elf32_Shdr *sechdrs, const char *strtab, unsigned int symindex, | |||
101 | break; | 101 | break; |
102 | 102 | ||
103 | case R_ARM_PC24: | 103 | case R_ARM_PC24: |
104 | case R_ARM_CALL: | ||
105 | case R_ARM_JUMP24: | ||
104 | offset = (*(u32 *)loc & 0x00ffffff) << 2; | 106 | offset = (*(u32 *)loc & 0x00ffffff) << 2; |
105 | if (offset & 0x02000000) | 107 | if (offset & 0x02000000) |
106 | offset -= 0x04000000; | 108 | offset -= 0x04000000; |
diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 9a340e790da5..2b84f78d7b0f 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c | |||
@@ -242,6 +242,15 @@ get_branch_address(struct task_struct *child, unsigned long pc, unsigned long in | |||
242 | */ | 242 | */ |
243 | long aluop1, aluop2, ccbit; | 243 | long aluop1, aluop2, ccbit; |
244 | 244 | ||
245 | if ((insn & 0x0fffffd0) == 0x012fff10) { | ||
246 | /* | ||
247 | * bx or blx | ||
248 | */ | ||
249 | alt = get_user_reg(child, insn & 15); | ||
250 | break; | ||
251 | } | ||
252 | |||
253 | |||
245 | if ((insn & 0xf000) != 0xf000) | 254 | if ((insn & 0xf000) != 0xf000) |
246 | break; | 255 | break; |
247 | 256 | ||
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c index f74b9af112dc..852ea72d8c80 100644 --- a/arch/arm/mach-pxa/pm.c +++ b/arch/arm/mach-pxa/pm.c | |||
@@ -155,19 +155,20 @@ int pxa_pm_enter(suspend_state_t state) | |||
155 | PSPR = 0; | 155 | PSPR = 0; |
156 | 156 | ||
157 | /* restore registers */ | 157 | /* restore registers */ |
158 | RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2); | ||
159 | RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2); | ||
158 | RESTORE(GAFR0_L); RESTORE(GAFR0_U); | 160 | RESTORE(GAFR0_L); RESTORE(GAFR0_U); |
159 | RESTORE(GAFR1_L); RESTORE(GAFR1_U); | 161 | RESTORE(GAFR1_L); RESTORE(GAFR1_U); |
160 | RESTORE(GAFR2_L); RESTORE(GAFR2_U); | 162 | RESTORE(GAFR2_L); RESTORE(GAFR2_U); |
161 | RESTORE_GPLEVEL(0); RESTORE_GPLEVEL(1); RESTORE_GPLEVEL(2); | ||
162 | RESTORE(GPDR0); RESTORE(GPDR1); RESTORE(GPDR2); | ||
163 | RESTORE(GRER0); RESTORE(GRER1); RESTORE(GRER2); | 163 | RESTORE(GRER0); RESTORE(GRER1); RESTORE(GRER2); |
164 | RESTORE(GFER0); RESTORE(GFER1); RESTORE(GFER2); | 164 | RESTORE(GFER0); RESTORE(GFER1); RESTORE(GFER2); |
165 | RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2); | 165 | RESTORE(PGSR0); RESTORE(PGSR1); RESTORE(PGSR2); |
166 | 166 | ||
167 | #ifdef CONFIG_PXA27x | 167 | #ifdef CONFIG_PXA27x |
168 | RESTORE(MDREFR); | 168 | RESTORE(MDREFR); |
169 | RESTORE(GAFR3_L); RESTORE(GAFR3_U); RESTORE_GPLEVEL(3); | 169 | RESTORE_GPLEVEL(3); RESTORE(GPDR3); |
170 | RESTORE(GPDR3); RESTORE(GRER3); RESTORE(GFER3); RESTORE(PGSR3); | 170 | RESTORE(GAFR3_L); RESTORE(GAFR3_U); |
171 | RESTORE(GRER3); RESTORE(GFER3); RESTORE(PGSR3); | ||
171 | RESTORE(PWER); RESTORE(PCFR); RESTORE(PRER); | 172 | RESTORE(PWER); RESTORE(PCFR); RESTORE(PRER); |
172 | RESTORE(PFER); RESTORE(PKWR); | 173 | RESTORE(PFER); RESTORE(PKWR); |
173 | #endif | 174 | #endif |
diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c index 32b0c24ab9a6..19edcd526ba4 100644 --- a/arch/i386/kernel/kprobes.c +++ b/arch/i386/kernel/kprobes.c | |||
@@ -191,7 +191,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) | |||
191 | */ | 191 | */ |
192 | save_previous_kprobe(kcb); | 192 | save_previous_kprobe(kcb); |
193 | set_current_kprobe(p, regs, kcb); | 193 | set_current_kprobe(p, regs, kcb); |
194 | p->nmissed++; | 194 | kprobes_inc_nmissed_count(p); |
195 | prepare_singlestep(p, regs); | 195 | prepare_singlestep(p, regs); |
196 | kcb->kprobe_status = KPROBE_REENTER; | 196 | kcb->kprobe_status = KPROBE_REENTER; |
197 | return 1; | 197 | return 1; |
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c index d16520da4550..9ed449af8e9f 100644 --- a/arch/i386/kernel/smpboot.c +++ b/arch/i386/kernel/smpboot.c | |||
@@ -1338,8 +1338,7 @@ int __cpu_disable(void) | |||
1338 | if (cpu == 0) | 1338 | if (cpu == 0) |
1339 | return -EBUSY; | 1339 | return -EBUSY; |
1340 | 1340 | ||
1341 | /* We enable the timer again on the exit path of the death loop */ | 1341 | clear_local_APIC(); |
1342 | disable_APIC_timer(); | ||
1343 | /* Allow any queued timer interrupts to get serviced */ | 1342 | /* Allow any queued timer interrupts to get serviced */ |
1344 | local_irq_enable(); | 1343 | local_irq_enable(); |
1345 | mdelay(1); | 1344 | mdelay(1); |
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index c34d1bfc5161..f0dffa03fbba 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
@@ -650,13 +650,6 @@ fastcall void do_nmi(struct pt_regs * regs, long error_code) | |||
650 | 650 | ||
651 | cpu = smp_processor_id(); | 651 | cpu = smp_processor_id(); |
652 | 652 | ||
653 | #ifdef CONFIG_HOTPLUG_CPU | ||
654 | if (!cpu_online(cpu)) { | ||
655 | nmi_exit(); | ||
656 | return; | ||
657 | } | ||
658 | #endif | ||
659 | |||
660 | ++nmi_count(cpu); | 653 | ++nmi_count(cpu); |
661 | 654 | ||
662 | if (!rcu_dereference(nmi_callback)(regs, cpu)) | 655 | if (!rcu_dereference(nmi_callback)(regs, cpu)) |
diff --git a/arch/i386/mm/ioremap.c b/arch/i386/mm/ioremap.c index 5d09de8d1c6b..247fde76aaed 100644 --- a/arch/i386/mm/ioremap.c +++ b/arch/i386/mm/ioremap.c | |||
@@ -223,9 +223,15 @@ void __iomem *ioremap_nocache (unsigned long phys_addr, unsigned long size) | |||
223 | } | 223 | } |
224 | EXPORT_SYMBOL(ioremap_nocache); | 224 | EXPORT_SYMBOL(ioremap_nocache); |
225 | 225 | ||
226 | /** | ||
227 | * iounmap - Free a IO remapping | ||
228 | * @addr: virtual address from ioremap_* | ||
229 | * | ||
230 | * Caller must ensure there is only one unmapping for the same pointer. | ||
231 | */ | ||
226 | void iounmap(volatile void __iomem *addr) | 232 | void iounmap(volatile void __iomem *addr) |
227 | { | 233 | { |
228 | struct vm_struct *p; | 234 | struct vm_struct *p, *o; |
229 | 235 | ||
230 | if ((void __force *)addr <= high_memory) | 236 | if ((void __force *)addr <= high_memory) |
231 | return; | 237 | return; |
@@ -239,22 +245,37 @@ void iounmap(volatile void __iomem *addr) | |||
239 | addr < phys_to_virt(ISA_END_ADDRESS)) | 245 | addr < phys_to_virt(ISA_END_ADDRESS)) |
240 | return; | 246 | return; |
241 | 247 | ||
242 | write_lock(&vmlist_lock); | 248 | addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr); |
243 | p = __remove_vm_area((void *)(PAGE_MASK & (unsigned long __force)addr)); | 249 | |
244 | if (!p) { | 250 | /* Use the vm area unlocked, assuming the caller |
245 | printk(KERN_WARNING "iounmap: bad address %p\n", addr); | 251 | ensures there isn't another iounmap for the same address |
252 | in parallel. Reuse of the virtual address is prevented by | ||
253 | leaving it in the global lists until we're done with it. | ||
254 | cpa takes care of the direct mappings. */ | ||
255 | read_lock(&vmlist_lock); | ||
256 | for (p = vmlist; p; p = p->next) { | ||
257 | if (p->addr == addr) | ||
258 | break; | ||
259 | } | ||
260 | read_unlock(&vmlist_lock); | ||
261 | |||
262 | if (!p) { | ||
263 | printk("iounmap: bad address %p\n", addr); | ||
246 | dump_stack(); | 264 | dump_stack(); |
247 | goto out_unlock; | 265 | return; |
248 | } | 266 | } |
249 | 267 | ||
268 | /* Reset the direct mapping. Can block */ | ||
250 | if ((p->flags >> 20) && p->phys_addr < virt_to_phys(high_memory) - 1) { | 269 | if ((p->flags >> 20) && p->phys_addr < virt_to_phys(high_memory) - 1) { |
251 | change_page_attr(virt_to_page(__va(p->phys_addr)), | 270 | change_page_attr(virt_to_page(__va(p->phys_addr)), |
252 | p->size >> PAGE_SHIFT, | 271 | p->size >> PAGE_SHIFT, |
253 | PAGE_KERNEL); | 272 | PAGE_KERNEL); |
254 | global_flush_tlb(); | 273 | global_flush_tlb(); |
255 | } | 274 | } |
256 | out_unlock: | 275 | |
257 | write_unlock(&vmlist_lock); | 276 | /* Finally remove it */ |
277 | o = remove_vm_area((void *)addr); | ||
278 | BUG_ON(p != o || o == NULL); | ||
258 | kfree(p); | 279 | kfree(p); |
259 | } | 280 | } |
260 | EXPORT_SYMBOL(iounmap); | 281 | EXPORT_SYMBOL(iounmap); |
diff --git a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile index ead6122dd06d..5461d4d5ea1e 100644 --- a/arch/i386/pci/Makefile +++ b/arch/i386/pci/Makefile | |||
@@ -1,7 +1,7 @@ | |||
1 | obj-y := i386.o | 1 | obj-y := i386.o |
2 | 2 | ||
3 | obj-$(CONFIG_PCI_BIOS) += pcbios.o | 3 | obj-$(CONFIG_PCI_BIOS) += pcbios.o |
4 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o | 4 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o direct.o |
5 | obj-$(CONFIG_PCI_DIRECT) += direct.o | 5 | obj-$(CONFIG_PCI_DIRECT) += direct.o |
6 | 6 | ||
7 | pci-y := fixup.o | 7 | pci-y := fixup.o |
diff --git a/arch/i386/pci/direct.c b/arch/i386/pci/direct.c index 94331d6be7a3..e3ac502bf2fb 100644 --- a/arch/i386/pci/direct.c +++ b/arch/i386/pci/direct.c | |||
@@ -13,7 +13,7 @@ | |||
13 | #define PCI_CONF1_ADDRESS(bus, devfn, reg) \ | 13 | #define PCI_CONF1_ADDRESS(bus, devfn, reg) \ |
14 | (0x80000000 | (bus << 16) | (devfn << 8) | (reg & ~3)) | 14 | (0x80000000 | (bus << 16) | (devfn << 8) | (reg & ~3)) |
15 | 15 | ||
16 | static int pci_conf1_read(unsigned int seg, unsigned int bus, | 16 | int pci_conf1_read(unsigned int seg, unsigned int bus, |
17 | unsigned int devfn, int reg, int len, u32 *value) | 17 | unsigned int devfn, int reg, int len, u32 *value) |
18 | { | 18 | { |
19 | unsigned long flags; | 19 | unsigned long flags; |
@@ -42,7 +42,7 @@ static int pci_conf1_read(unsigned int seg, unsigned int bus, | |||
42 | return 0; | 42 | return 0; |
43 | } | 43 | } |
44 | 44 | ||
45 | static int pci_conf1_write(unsigned int seg, unsigned int bus, | 45 | int pci_conf1_write(unsigned int seg, unsigned int bus, |
46 | unsigned int devfn, int reg, int len, u32 value) | 46 | unsigned int devfn, int reg, int len, u32 value) |
47 | { | 47 | { |
48 | unsigned long flags; | 48 | unsigned long flags; |
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c index dfbf80cff834..4bb4d4b0f73a 100644 --- a/arch/i386/pci/mmconfig.c +++ b/arch/i386/pci/mmconfig.c | |||
@@ -19,21 +19,25 @@ | |||
19 | /* The base address of the last MMCONFIG device accessed */ | 19 | /* The base address of the last MMCONFIG device accessed */ |
20 | static u32 mmcfg_last_accessed_device; | 20 | static u32 mmcfg_last_accessed_device; |
21 | 21 | ||
22 | static DECLARE_BITMAP(fallback_slots, 32); | ||
23 | |||
22 | /* | 24 | /* |
23 | * Functions for accessing PCI configuration space with MMCONFIG accesses | 25 | * Functions for accessing PCI configuration space with MMCONFIG accesses |
24 | */ | 26 | */ |
25 | static u32 get_base_addr(unsigned int seg, int bus) | 27 | static u32 get_base_addr(unsigned int seg, int bus, unsigned devfn) |
26 | { | 28 | { |
27 | int cfg_num = -1; | 29 | int cfg_num = -1; |
28 | struct acpi_table_mcfg_config *cfg; | 30 | struct acpi_table_mcfg_config *cfg; |
29 | 31 | ||
32 | if (seg == 0 && bus == 0 && | ||
33 | test_bit(PCI_SLOT(devfn), fallback_slots)) | ||
34 | return 0; | ||
35 | |||
30 | while (1) { | 36 | while (1) { |
31 | ++cfg_num; | 37 | ++cfg_num; |
32 | if (cfg_num >= pci_mmcfg_config_num) { | 38 | if (cfg_num >= pci_mmcfg_config_num) { |
33 | /* something bad is going on, no cfg table is found. */ | 39 | /* Not found - fallback to type 1 */ |
34 | /* so we fall back to the old way we used to do this */ | 40 | return 0; |
35 | /* and just rely on the first entry to be correct. */ | ||
36 | return pci_mmcfg_config[0].base_address; | ||
37 | } | 41 | } |
38 | cfg = &pci_mmcfg_config[cfg_num]; | 42 | cfg = &pci_mmcfg_config[cfg_num]; |
39 | if (cfg->pci_segment_group_number != seg) | 43 | if (cfg->pci_segment_group_number != seg) |
@@ -44,9 +48,9 @@ static u32 get_base_addr(unsigned int seg, int bus) | |||
44 | } | 48 | } |
45 | } | 49 | } |
46 | 50 | ||
47 | static inline void pci_exp_set_dev_base(unsigned int seg, int bus, int devfn) | 51 | static inline void pci_exp_set_dev_base(unsigned int base, int bus, int devfn) |
48 | { | 52 | { |
49 | u32 dev_base = get_base_addr(seg, bus) | (bus << 20) | (devfn << 12); | 53 | u32 dev_base = base | (bus << 20) | (devfn << 12); |
50 | if (dev_base != mmcfg_last_accessed_device) { | 54 | if (dev_base != mmcfg_last_accessed_device) { |
51 | mmcfg_last_accessed_device = dev_base; | 55 | mmcfg_last_accessed_device = dev_base; |
52 | set_fixmap_nocache(FIX_PCIE_MCFG, dev_base); | 56 | set_fixmap_nocache(FIX_PCIE_MCFG, dev_base); |
@@ -57,13 +61,18 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus, | |||
57 | unsigned int devfn, int reg, int len, u32 *value) | 61 | unsigned int devfn, int reg, int len, u32 *value) |
58 | { | 62 | { |
59 | unsigned long flags; | 63 | unsigned long flags; |
64 | u32 base; | ||
60 | 65 | ||
61 | if (!value || (bus > 255) || (devfn > 255) || (reg > 4095)) | 66 | if (!value || (bus > 255) || (devfn > 255) || (reg > 4095)) |
62 | return -EINVAL; | 67 | return -EINVAL; |
63 | 68 | ||
69 | base = get_base_addr(seg, bus, devfn); | ||
70 | if (!base) | ||
71 | return pci_conf1_read(seg,bus,devfn,reg,len,value); | ||
72 | |||
64 | spin_lock_irqsave(&pci_config_lock, flags); | 73 | spin_lock_irqsave(&pci_config_lock, flags); |
65 | 74 | ||
66 | pci_exp_set_dev_base(seg, bus, devfn); | 75 | pci_exp_set_dev_base(base, bus, devfn); |
67 | 76 | ||
68 | switch (len) { | 77 | switch (len) { |
69 | case 1: | 78 | case 1: |
@@ -86,13 +95,18 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus, | |||
86 | unsigned int devfn, int reg, int len, u32 value) | 95 | unsigned int devfn, int reg, int len, u32 value) |
87 | { | 96 | { |
88 | unsigned long flags; | 97 | unsigned long flags; |
98 | u32 base; | ||
89 | 99 | ||
90 | if ((bus > 255) || (devfn > 255) || (reg > 4095)) | 100 | if ((bus > 255) || (devfn > 255) || (reg > 4095)) |
91 | return -EINVAL; | 101 | return -EINVAL; |
92 | 102 | ||
103 | base = get_base_addr(seg, bus, devfn); | ||
104 | if (!base) | ||
105 | return pci_conf1_write(seg,bus,devfn,reg,len,value); | ||
106 | |||
93 | spin_lock_irqsave(&pci_config_lock, flags); | 107 | spin_lock_irqsave(&pci_config_lock, flags); |
94 | 108 | ||
95 | pci_exp_set_dev_base(seg, bus, devfn); | 109 | pci_exp_set_dev_base(base, bus, devfn); |
96 | 110 | ||
97 | switch (len) { | 111 | switch (len) { |
98 | case 1: | 112 | case 1: |
@@ -116,6 +130,37 @@ static struct pci_raw_ops pci_mmcfg = { | |||
116 | .write = pci_mmcfg_write, | 130 | .write = pci_mmcfg_write, |
117 | }; | 131 | }; |
118 | 132 | ||
133 | /* K8 systems have some devices (typically in the builtin northbridge) | ||
134 | that are only accessible using type1 | ||
135 | Normally this can be expressed in the MCFG by not listing them | ||
136 | and assigning suitable _SEGs, but this isn't implemented in some BIOS. | ||
137 | Instead try to discover all devices on bus 0 that are unreachable using MM | ||
138 | and fallback for them. | ||
139 | We only do this for bus 0/seg 0 */ | ||
140 | static __init void unreachable_devices(void) | ||
141 | { | ||
142 | int i; | ||
143 | unsigned long flags; | ||
144 | |||
145 | for (i = 0; i < 32; i++) { | ||
146 | u32 val1; | ||
147 | u32 addr; | ||
148 | |||
149 | pci_conf1_read(0, 0, PCI_DEVFN(i, 0), 0, 4, &val1); | ||
150 | if (val1 == 0xffffffff) | ||
151 | continue; | ||
152 | |||
153 | /* Locking probably not needed, but safer */ | ||
154 | spin_lock_irqsave(&pci_config_lock, flags); | ||
155 | addr = get_base_addr(0, 0, PCI_DEVFN(i, 0)); | ||
156 | if (addr != 0) | ||
157 | pci_exp_set_dev_base(addr, 0, PCI_DEVFN(i, 0)); | ||
158 | if (addr == 0 || readl((u32 __iomem *)mmcfg_virt_addr) != val1) | ||
159 | set_bit(i, fallback_slots); | ||
160 | spin_unlock_irqrestore(&pci_config_lock, flags); | ||
161 | } | ||
162 | } | ||
163 | |||
119 | static int __init pci_mmcfg_init(void) | 164 | static int __init pci_mmcfg_init(void) |
120 | { | 165 | { |
121 | if ((pci_probe & PCI_PROBE_MMCONF) == 0) | 166 | if ((pci_probe & PCI_PROBE_MMCONF) == 0) |
@@ -131,6 +176,8 @@ static int __init pci_mmcfg_init(void) | |||
131 | raw_pci_ops = &pci_mmcfg; | 176 | raw_pci_ops = &pci_mmcfg; |
132 | pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; | 177 | pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; |
133 | 178 | ||
179 | unreachable_devices(); | ||
180 | |||
134 | out: | 181 | out: |
135 | return 0; | 182 | return 0; |
136 | } | 183 | } |
diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h index 127d53ad16be..f550781ec310 100644 --- a/arch/i386/pci/pci.h +++ b/arch/i386/pci/pci.h | |||
@@ -74,3 +74,10 @@ extern spinlock_t pci_config_lock; | |||
74 | 74 | ||
75 | extern int (*pcibios_enable_irq)(struct pci_dev *dev); | 75 | extern int (*pcibios_enable_irq)(struct pci_dev *dev); |
76 | extern void (*pcibios_disable_irq)(struct pci_dev *dev); | 76 | extern void (*pcibios_disable_irq)(struct pci_dev *dev); |
77 | |||
78 | extern int pci_conf1_write(unsigned int seg, unsigned int bus, | ||
79 | unsigned int devfn, int reg, int len, u32 value); | ||
80 | extern int pci_conf1_read(unsigned int seg, unsigned int bus, | ||
81 | unsigned int devfn, int reg, int len, u32 *value); | ||
82 | |||
83 | |||
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index b76ce1fe2e7f..199eeaf0f4e3 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig | |||
@@ -58,7 +58,7 @@ config IA64_UNCACHED_ALLOCATOR | |||
58 | bool | 58 | bool |
59 | select GENERIC_ALLOCATOR | 59 | select GENERIC_ALLOCATOR |
60 | 60 | ||
61 | config ZONE_DMA_IS_DMA32 | 61 | config DMA_IS_DMA32 |
62 | bool | 62 | bool |
63 | default y | 63 | default y |
64 | 64 | ||
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig index 87cfd31a4a39..ff8bb3770c9d 100644 --- a/arch/ia64/configs/sn2_defconfig +++ b/arch/ia64/configs/sn2_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.13-rc6 | 3 | # Linux kernel version: 2.6.15-rc4 |
4 | # Tue Aug 16 14:40:41 2005 | 4 | # Fri Dec 2 10:33:48 2005 |
5 | # | 5 | # |
6 | 6 | ||
7 | # | 7 | # |
@@ -16,6 +16,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 | |||
16 | # General setup | 16 | # General setup |
17 | # | 17 | # |
18 | CONFIG_LOCALVERSION="" | 18 | CONFIG_LOCALVERSION="" |
19 | # CONFIG_LOCALVERSION_AUTO is not set | ||
19 | CONFIG_SWAP=y | 20 | CONFIG_SWAP=y |
20 | CONFIG_SYSVIPC=y | 21 | CONFIG_SYSVIPC=y |
21 | CONFIG_POSIX_MQUEUE=y | 22 | CONFIG_POSIX_MQUEUE=y |
@@ -26,6 +27,7 @@ CONFIG_HOTPLUG=y | |||
26 | CONFIG_KOBJECT_UEVENT=y | 27 | CONFIG_KOBJECT_UEVENT=y |
27 | # CONFIG_IKCONFIG is not set | 28 | # CONFIG_IKCONFIG is not set |
28 | CONFIG_CPUSETS=y | 29 | CONFIG_CPUSETS=y |
30 | CONFIG_INITRAMFS_SOURCE="" | ||
29 | # CONFIG_EMBEDDED is not set | 31 | # CONFIG_EMBEDDED is not set |
30 | CONFIG_KALLSYMS=y | 32 | CONFIG_KALLSYMS=y |
31 | CONFIG_KALLSYMS_ALL=y | 33 | CONFIG_KALLSYMS_ALL=y |
@@ -56,11 +58,29 @@ CONFIG_KMOD=y | |||
56 | CONFIG_STOP_MACHINE=y | 58 | CONFIG_STOP_MACHINE=y |
57 | 59 | ||
58 | # | 60 | # |
61 | # Block layer | ||
62 | # | ||
63 | |||
64 | # | ||
65 | # IO Schedulers | ||
66 | # | ||
67 | CONFIG_IOSCHED_NOOP=y | ||
68 | CONFIG_IOSCHED_AS=y | ||
69 | CONFIG_IOSCHED_DEADLINE=y | ||
70 | CONFIG_IOSCHED_CFQ=y | ||
71 | CONFIG_DEFAULT_AS=y | ||
72 | # CONFIG_DEFAULT_DEADLINE is not set | ||
73 | # CONFIG_DEFAULT_CFQ is not set | ||
74 | # CONFIG_DEFAULT_NOOP is not set | ||
75 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
76 | |||
77 | # | ||
59 | # Processor type and features | 78 | # Processor type and features |
60 | # | 79 | # |
61 | CONFIG_IA64=y | 80 | CONFIG_IA64=y |
62 | CONFIG_64BIT=y | 81 | CONFIG_64BIT=y |
63 | CONFIG_MMU=y | 82 | CONFIG_MMU=y |
83 | CONFIG_SWIOTLB=y | ||
64 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 84 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
65 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 85 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
66 | CONFIG_TIME_INTERPOLATION=y | 86 | CONFIG_TIME_INTERPOLATION=y |
@@ -68,6 +88,7 @@ CONFIG_EFI=y | |||
68 | CONFIG_GENERIC_IOMAP=y | 88 | CONFIG_GENERIC_IOMAP=y |
69 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 89 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
70 | CONFIG_IA64_UNCACHED_ALLOCATOR=y | 90 | CONFIG_IA64_UNCACHED_ALLOCATOR=y |
91 | CONFIG_ZONE_DMA_IS_DMA32=y | ||
71 | # CONFIG_IA64_GENERIC is not set | 92 | # CONFIG_IA64_GENERIC is not set |
72 | # CONFIG_IA64_DIG is not set | 93 | # CONFIG_IA64_DIG is not set |
73 | # CONFIG_IA64_HP_ZX1 is not set | 94 | # CONFIG_IA64_HP_ZX1 is not set |
@@ -87,16 +108,12 @@ CONFIG_HZ_250=y | |||
87 | # CONFIG_HZ_1000 is not set | 108 | # CONFIG_HZ_1000 is not set |
88 | CONFIG_HZ=250 | 109 | CONFIG_HZ=250 |
89 | CONFIG_IA64_L1_CACHE_SHIFT=7 | 110 | CONFIG_IA64_L1_CACHE_SHIFT=7 |
90 | CONFIG_NUMA=y | ||
91 | CONFIG_VIRTUAL_MEM_MAP=y | ||
92 | CONFIG_HOLES_IN_ZONE=y | ||
93 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
94 | # CONFIG_IA64_CYCLONE is not set | 111 | # CONFIG_IA64_CYCLONE is not set |
95 | CONFIG_IOSAPIC=y | 112 | CONFIG_IOSAPIC=y |
96 | CONFIG_IA64_SGI_SN_XP=m | 113 | CONFIG_IA64_SGI_SN_XP=m |
97 | CONFIG_FORCE_MAX_ZONEORDER=18 | 114 | CONFIG_FORCE_MAX_ZONEORDER=17 |
98 | CONFIG_SMP=y | 115 | CONFIG_SMP=y |
99 | CONFIG_NR_CPUS=512 | 116 | CONFIG_NR_CPUS=1024 |
100 | # CONFIG_HOTPLUG_CPU is not set | 117 | # CONFIG_HOTPLUG_CPU is not set |
101 | CONFIG_SCHED_SMT=y | 118 | CONFIG_SCHED_SMT=y |
102 | CONFIG_PREEMPT=y | 119 | CONFIG_PREEMPT=y |
@@ -107,7 +124,17 @@ CONFIG_DISCONTIGMEM_MANUAL=y | |||
107 | CONFIG_DISCONTIGMEM=y | 124 | CONFIG_DISCONTIGMEM=y |
108 | CONFIG_FLAT_NODE_MEM_MAP=y | 125 | CONFIG_FLAT_NODE_MEM_MAP=y |
109 | CONFIG_NEED_MULTIPLE_NODES=y | 126 | CONFIG_NEED_MULTIPLE_NODES=y |
110 | CONFIG_HAVE_DEC_LOCK=y | 127 | # CONFIG_SPARSEMEM_STATIC is not set |
128 | CONFIG_SPLIT_PTLOCK_CPUS=4 | ||
129 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
130 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
131 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
132 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
133 | CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y | ||
134 | CONFIG_NUMA=y | ||
135 | CONFIG_VIRTUAL_MEM_MAP=y | ||
136 | CONFIG_HOLES_IN_ZONE=y | ||
137 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | ||
111 | CONFIG_IA32_SUPPORT=y | 138 | CONFIG_IA32_SUPPORT=y |
112 | CONFIG_COMPAT=y | 139 | CONFIG_COMPAT=y |
113 | CONFIG_IA64_MCA_RECOVERY=y | 140 | CONFIG_IA64_MCA_RECOVERY=y |
@@ -126,28 +153,35 @@ CONFIG_BINFMT_ELF=y | |||
126 | # Power management and ACPI | 153 | # Power management and ACPI |
127 | # | 154 | # |
128 | CONFIG_PM=y | 155 | CONFIG_PM=y |
129 | CONFIG_ACPI=y | 156 | # CONFIG_PM_LEGACY is not set |
157 | # CONFIG_PM_DEBUG is not set | ||
130 | 158 | ||
131 | # | 159 | # |
132 | # ACPI (Advanced Configuration and Power Interface) Support | 160 | # ACPI (Advanced Configuration and Power Interface) Support |
133 | # | 161 | # |
162 | CONFIG_ACPI=y | ||
134 | # CONFIG_ACPI_BUTTON is not set | 163 | # CONFIG_ACPI_BUTTON is not set |
135 | # CONFIG_ACPI_FAN is not set | 164 | # CONFIG_ACPI_FAN is not set |
136 | # CONFIG_ACPI_PROCESSOR is not set | 165 | # CONFIG_ACPI_PROCESSOR is not set |
137 | CONFIG_ACPI_NUMA=y | 166 | CONFIG_ACPI_NUMA=y |
167 | CONFIG_ACPI_BLACKLIST_YEAR=0 | ||
138 | # CONFIG_ACPI_DEBUG is not set | 168 | # CONFIG_ACPI_DEBUG is not set |
139 | CONFIG_ACPI_POWER=y | 169 | CONFIG_ACPI_POWER=y |
140 | CONFIG_ACPI_SYSTEM=y | 170 | CONFIG_ACPI_SYSTEM=y |
141 | # CONFIG_ACPI_CONTAINER is not set | 171 | # CONFIG_ACPI_CONTAINER is not set |
142 | 172 | ||
143 | # | 173 | # |
174 | # CPU Frequency scaling | ||
175 | # | ||
176 | # CONFIG_CPU_FREQ is not set | ||
177 | |||
178 | # | ||
144 | # Bus options (PCI, PCMCIA) | 179 | # Bus options (PCI, PCMCIA) |
145 | # | 180 | # |
146 | CONFIG_PCI=y | 181 | CONFIG_PCI=y |
147 | CONFIG_PCI_DOMAINS=y | 182 | CONFIG_PCI_DOMAINS=y |
148 | # CONFIG_PCI_MSI is not set | 183 | # CONFIG_PCI_MSI is not set |
149 | CONFIG_PCI_LEGACY_PROC=y | 184 | CONFIG_PCI_LEGACY_PROC=y |
150 | CONFIG_PCI_NAMES=y | ||
151 | # CONFIG_PCI_DEBUG is not set | 185 | # CONFIG_PCI_DEBUG is not set |
152 | 186 | ||
153 | # | 187 | # |
@@ -191,8 +225,8 @@ CONFIG_SYN_COOKIES=y | |||
191 | # CONFIG_INET_ESP is not set | 225 | # CONFIG_INET_ESP is not set |
192 | # CONFIG_INET_IPCOMP is not set | 226 | # CONFIG_INET_IPCOMP is not set |
193 | # CONFIG_INET_TUNNEL is not set | 227 | # CONFIG_INET_TUNNEL is not set |
194 | CONFIG_IP_TCPDIAG=y | 228 | CONFIG_INET_DIAG=m |
195 | # CONFIG_IP_TCPDIAG_IPV6 is not set | 229 | CONFIG_INET_TCP_DIAG=m |
196 | # CONFIG_TCP_CONG_ADVANCED is not set | 230 | # CONFIG_TCP_CONG_ADVANCED is not set |
197 | CONFIG_TCP_CONG_BIC=y | 231 | CONFIG_TCP_CONG_BIC=y |
198 | CONFIG_IPV6=m | 232 | CONFIG_IPV6=m |
@@ -205,6 +239,11 @@ CONFIG_IPV6=m | |||
205 | # CONFIG_NETFILTER is not set | 239 | # CONFIG_NETFILTER is not set |
206 | 240 | ||
207 | # | 241 | # |
242 | # DCCP Configuration (EXPERIMENTAL) | ||
243 | # | ||
244 | # CONFIG_IP_DCCP is not set | ||
245 | |||
246 | # | ||
208 | # SCTP Configuration (EXPERIMENTAL) | 247 | # SCTP Configuration (EXPERIMENTAL) |
209 | # | 248 | # |
210 | # CONFIG_IP_SCTP is not set | 249 | # CONFIG_IP_SCTP is not set |
@@ -220,8 +259,11 @@ CONFIG_IPV6=m | |||
220 | # CONFIG_NET_DIVERT is not set | 259 | # CONFIG_NET_DIVERT is not set |
221 | # CONFIG_ECONET is not set | 260 | # CONFIG_ECONET is not set |
222 | # CONFIG_WAN_ROUTER is not set | 261 | # CONFIG_WAN_ROUTER is not set |
262 | |||
263 | # | ||
264 | # QoS and/or fair queueing | ||
265 | # | ||
223 | # CONFIG_NET_SCHED is not set | 266 | # CONFIG_NET_SCHED is not set |
224 | # CONFIG_NET_CLS_ROUTE is not set | ||
225 | 267 | ||
226 | # | 268 | # |
227 | # Network testing | 269 | # Network testing |
@@ -230,6 +272,7 @@ CONFIG_IPV6=m | |||
230 | # CONFIG_HAMRADIO is not set | 272 | # CONFIG_HAMRADIO is not set |
231 | # CONFIG_IRDA is not set | 273 | # CONFIG_IRDA is not set |
232 | # CONFIG_BT is not set | 274 | # CONFIG_BT is not set |
275 | # CONFIG_IEEE80211 is not set | ||
233 | 276 | ||
234 | # | 277 | # |
235 | # Device Drivers | 278 | # Device Drivers |
@@ -244,6 +287,11 @@ CONFIG_FW_LOADER=y | |||
244 | # CONFIG_DEBUG_DRIVER is not set | 287 | # CONFIG_DEBUG_DRIVER is not set |
245 | 288 | ||
246 | # | 289 | # |
290 | # Connector - unified userspace <-> kernelspace linker | ||
291 | # | ||
292 | # CONFIG_CONNECTOR is not set | ||
293 | |||
294 | # | ||
247 | # Memory Technology Devices (MTD) | 295 | # Memory Technology Devices (MTD) |
248 | # | 296 | # |
249 | # CONFIG_MTD is not set | 297 | # CONFIG_MTD is not set |
@@ -275,16 +323,7 @@ CONFIG_BLK_DEV_RAM=y | |||
275 | CONFIG_BLK_DEV_RAM_COUNT=16 | 323 | CONFIG_BLK_DEV_RAM_COUNT=16 |
276 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 324 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
277 | CONFIG_BLK_DEV_INITRD=y | 325 | CONFIG_BLK_DEV_INITRD=y |
278 | CONFIG_INITRAMFS_SOURCE="" | ||
279 | # CONFIG_CDROM_PKTCDVD is not set | 326 | # CONFIG_CDROM_PKTCDVD is not set |
280 | |||
281 | # | ||
282 | # IO Schedulers | ||
283 | # | ||
284 | CONFIG_IOSCHED_NOOP=y | ||
285 | CONFIG_IOSCHED_AS=y | ||
286 | CONFIG_IOSCHED_DEADLINE=y | ||
287 | CONFIG_IOSCHED_CFQ=y | ||
288 | CONFIG_ATA_OVER_ETH=m | 327 | CONFIG_ATA_OVER_ETH=m |
289 | 328 | ||
290 | # | 329 | # |
@@ -349,6 +388,7 @@ CONFIG_IDEDMA_AUTO=y | |||
349 | # | 388 | # |
350 | # SCSI device support | 389 | # SCSI device support |
351 | # | 390 | # |
391 | # CONFIG_RAID_ATTRS is not set | ||
352 | CONFIG_SCSI=y | 392 | CONFIG_SCSI=y |
353 | CONFIG_SCSI_PROC_FS=y | 393 | CONFIG_SCSI_PROC_FS=y |
354 | 394 | ||
@@ -375,11 +415,13 @@ CONFIG_SCSI_CONSTANTS=y | |||
375 | # | 415 | # |
376 | CONFIG_SCSI_SPI_ATTRS=y | 416 | CONFIG_SCSI_SPI_ATTRS=y |
377 | CONFIG_SCSI_FC_ATTRS=y | 417 | CONFIG_SCSI_FC_ATTRS=y |
378 | # CONFIG_SCSI_ISCSI_ATTRS is not set | 418 | CONFIG_SCSI_ISCSI_ATTRS=m |
419 | CONFIG_SCSI_SAS_ATTRS=y | ||
379 | 420 | ||
380 | # | 421 | # |
381 | # SCSI low-level drivers | 422 | # SCSI low-level drivers |
382 | # | 423 | # |
424 | CONFIG_ISCSI_TCP=m | ||
383 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 425 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
384 | # CONFIG_SCSI_3W_9XXX is not set | 426 | # CONFIG_SCSI_3W_9XXX is not set |
385 | # CONFIG_SCSI_ACARD is not set | 427 | # CONFIG_SCSI_ACARD is not set |
@@ -389,15 +431,19 @@ CONFIG_SCSI_FC_ATTRS=y | |||
389 | # CONFIG_SCSI_AIC79XX is not set | 431 | # CONFIG_SCSI_AIC79XX is not set |
390 | # CONFIG_MEGARAID_NEWGEN is not set | 432 | # CONFIG_MEGARAID_NEWGEN is not set |
391 | # CONFIG_MEGARAID_LEGACY is not set | 433 | # CONFIG_MEGARAID_LEGACY is not set |
434 | # CONFIG_MEGARAID_SAS is not set | ||
392 | CONFIG_SCSI_SATA=y | 435 | CONFIG_SCSI_SATA=y |
393 | # CONFIG_SCSI_SATA_AHCI is not set | 436 | # CONFIG_SCSI_SATA_AHCI is not set |
394 | # CONFIG_SCSI_SATA_SVW is not set | 437 | # CONFIG_SCSI_SATA_SVW is not set |
395 | # CONFIG_SCSI_ATA_PIIX is not set | 438 | # CONFIG_SCSI_ATA_PIIX is not set |
439 | # CONFIG_SCSI_SATA_MV is not set | ||
396 | # CONFIG_SCSI_SATA_NV is not set | 440 | # CONFIG_SCSI_SATA_NV is not set |
397 | # CONFIG_SCSI_SATA_PROMISE is not set | 441 | # CONFIG_SCSI_PDC_ADMA is not set |
398 | # CONFIG_SCSI_SATA_QSTOR is not set | 442 | # CONFIG_SCSI_SATA_QSTOR is not set |
443 | # CONFIG_SCSI_SATA_PROMISE is not set | ||
399 | # CONFIG_SCSI_SATA_SX4 is not set | 444 | # CONFIG_SCSI_SATA_SX4 is not set |
400 | # CONFIG_SCSI_SATA_SIL is not set | 445 | # CONFIG_SCSI_SATA_SIL is not set |
446 | # CONFIG_SCSI_SATA_SIL24 is not set | ||
401 | # CONFIG_SCSI_SATA_SIS is not set | 447 | # CONFIG_SCSI_SATA_SIS is not set |
402 | # CONFIG_SCSI_SATA_ULI is not set | 448 | # CONFIG_SCSI_SATA_ULI is not set |
403 | # CONFIG_SCSI_SATA_VIA is not set | 449 | # CONFIG_SCSI_SATA_VIA is not set |
@@ -411,7 +457,6 @@ CONFIG_SCSI_SATA_VITESSE=y | |||
411 | # CONFIG_SCSI_IPR is not set | 457 | # CONFIG_SCSI_IPR is not set |
412 | # CONFIG_SCSI_QLOGIC_FC is not set | 458 | # CONFIG_SCSI_QLOGIC_FC is not set |
413 | CONFIG_SCSI_QLOGIC_1280=y | 459 | CONFIG_SCSI_QLOGIC_1280=y |
414 | # CONFIG_SCSI_QLOGIC_1280_1040 is not set | ||
415 | CONFIG_SCSI_QLA2XXX=y | 460 | CONFIG_SCSI_QLA2XXX=y |
416 | # CONFIG_SCSI_QLA21XX is not set | 461 | # CONFIG_SCSI_QLA21XX is not set |
417 | CONFIG_SCSI_QLA22XX=y | 462 | CONFIG_SCSI_QLA22XX=y |
@@ -451,6 +496,7 @@ CONFIG_DM_MULTIPATH_EMC=m | |||
451 | CONFIG_FUSION=y | 496 | CONFIG_FUSION=y |
452 | CONFIG_FUSION_SPI=y | 497 | CONFIG_FUSION_SPI=y |
453 | CONFIG_FUSION_FC=y | 498 | CONFIG_FUSION_FC=y |
499 | CONFIG_FUSION_SAS=y | ||
454 | CONFIG_FUSION_MAX_SGE=128 | 500 | CONFIG_FUSION_MAX_SGE=128 |
455 | CONFIG_FUSION_CTL=m | 501 | CONFIG_FUSION_CTL=m |
456 | 502 | ||
@@ -479,6 +525,10 @@ CONFIG_NETDEVICES=y | |||
479 | # CONFIG_ARCNET is not set | 525 | # CONFIG_ARCNET is not set |
480 | 526 | ||
481 | # | 527 | # |
528 | # PHY device support | ||
529 | # | ||
530 | |||
531 | # | ||
482 | # Ethernet (10 or 100Mbit) | 532 | # Ethernet (10 or 100Mbit) |
483 | # | 533 | # |
484 | # CONFIG_NET_ETHERNET is not set | 534 | # CONFIG_NET_ETHERNET is not set |
@@ -493,6 +543,7 @@ CONFIG_NETDEVICES=y | |||
493 | # CONFIG_HAMACHI is not set | 543 | # CONFIG_HAMACHI is not set |
494 | # CONFIG_YELLOWFIN is not set | 544 | # CONFIG_YELLOWFIN is not set |
495 | # CONFIG_R8169 is not set | 545 | # CONFIG_R8169 is not set |
546 | # CONFIG_SIS190 is not set | ||
496 | # CONFIG_SKGE is not set | 547 | # CONFIG_SKGE is not set |
497 | # CONFIG_SK98LIN is not set | 548 | # CONFIG_SK98LIN is not set |
498 | CONFIG_TIGON3=y | 549 | CONFIG_TIGON3=y |
@@ -501,10 +552,10 @@ CONFIG_TIGON3=y | |||
501 | # | 552 | # |
502 | # Ethernet (10000 Mbit) | 553 | # Ethernet (10000 Mbit) |
503 | # | 554 | # |
555 | CONFIG_CHELSIO_T1=m | ||
504 | # CONFIG_IXGB is not set | 556 | # CONFIG_IXGB is not set |
505 | CONFIG_S2IO=m | 557 | CONFIG_S2IO=m |
506 | # CONFIG_S2IO_NAPI is not set | 558 | # CONFIG_S2IO_NAPI is not set |
507 | # CONFIG_2BUFF_MODE is not set | ||
508 | 559 | ||
509 | # | 560 | # |
510 | # Token Ring devices | 561 | # Token Ring devices |
@@ -583,6 +634,7 @@ CONFIG_HW_CONSOLE=y | |||
583 | CONFIG_SERIAL_NONSTANDARD=y | 634 | CONFIG_SERIAL_NONSTANDARD=y |
584 | # CONFIG_ROCKETPORT is not set | 635 | # CONFIG_ROCKETPORT is not set |
585 | # CONFIG_CYCLADES is not set | 636 | # CONFIG_CYCLADES is not set |
637 | # CONFIG_DIGIEPCA is not set | ||
586 | # CONFIG_MOXA_SMARTIO is not set | 638 | # CONFIG_MOXA_SMARTIO is not set |
587 | # CONFIG_ISI is not set | 639 | # CONFIG_ISI is not set |
588 | # CONFIG_SYNCLINKMP is not set | 640 | # CONFIG_SYNCLINKMP is not set |
@@ -629,7 +681,8 @@ CONFIG_EFI_RTC=y | |||
629 | # | 681 | # |
630 | # Ftape, the floppy tape device driver | 682 | # Ftape, the floppy tape device driver |
631 | # | 683 | # |
632 | # CONFIG_AGP is not set | 684 | CONFIG_AGP=y |
685 | CONFIG_AGP_SGI_TIOCA=y | ||
633 | # CONFIG_DRM is not set | 686 | # CONFIG_DRM is not set |
634 | CONFIG_RAW_DRIVER=m | 687 | CONFIG_RAW_DRIVER=m |
635 | # CONFIG_HPET is not set | 688 | # CONFIG_HPET is not set |
@@ -641,12 +694,12 @@ CONFIG_MMTIMER=y | |||
641 | # TPM devices | 694 | # TPM devices |
642 | # | 695 | # |
643 | # CONFIG_TCG_TPM is not set | 696 | # CONFIG_TCG_TPM is not set |
697 | # CONFIG_TELCLOCK is not set | ||
644 | 698 | ||
645 | # | 699 | # |
646 | # I2C support | 700 | # I2C support |
647 | # | 701 | # |
648 | # CONFIG_I2C is not set | 702 | # CONFIG_I2C is not set |
649 | # CONFIG_I2C_SENSOR is not set | ||
650 | 703 | ||
651 | # | 704 | # |
652 | # Dallas's 1-wire bus | 705 | # Dallas's 1-wire bus |
@@ -657,12 +710,17 @@ CONFIG_MMTIMER=y | |||
657 | # Hardware Monitoring support | 710 | # Hardware Monitoring support |
658 | # | 711 | # |
659 | # CONFIG_HWMON is not set | 712 | # CONFIG_HWMON is not set |
713 | # CONFIG_HWMON_VID is not set | ||
660 | 714 | ||
661 | # | 715 | # |
662 | # Misc devices | 716 | # Misc devices |
663 | # | 717 | # |
664 | 718 | ||
665 | # | 719 | # |
720 | # Multimedia Capabilities Port drivers | ||
721 | # | ||
722 | |||
723 | # | ||
666 | # Multimedia devices | 724 | # Multimedia devices |
667 | # | 725 | # |
668 | # CONFIG_VIDEO_DEV is not set | 726 | # CONFIG_VIDEO_DEV is not set |
@@ -721,12 +779,15 @@ CONFIG_USB_UHCI_HCD=m | |||
721 | # | 779 | # |
722 | # USB Device Class drivers | 780 | # USB Device Class drivers |
723 | # | 781 | # |
724 | # CONFIG_USB_BLUETOOTH_TTY is not set | ||
725 | # CONFIG_USB_ACM is not set | 782 | # CONFIG_USB_ACM is not set |
726 | # CONFIG_USB_PRINTER is not set | 783 | # CONFIG_USB_PRINTER is not set |
727 | 784 | ||
728 | # | 785 | # |
729 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | 786 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
787 | # | ||
788 | |||
789 | # | ||
790 | # may also be needed; see USB_STORAGE Help for more information | ||
730 | # | 791 | # |
731 | # CONFIG_USB_STORAGE is not set | 792 | # CONFIG_USB_STORAGE is not set |
732 | 793 | ||
@@ -751,9 +812,11 @@ CONFIG_USB_HIDINPUT=y | |||
751 | # CONFIG_USB_MTOUCH is not set | 812 | # CONFIG_USB_MTOUCH is not set |
752 | # CONFIG_USB_ITMTOUCH is not set | 813 | # CONFIG_USB_ITMTOUCH is not set |
753 | # CONFIG_USB_EGALAX is not set | 814 | # CONFIG_USB_EGALAX is not set |
815 | # CONFIG_USB_YEALINK is not set | ||
754 | # CONFIG_USB_XPAD is not set | 816 | # CONFIG_USB_XPAD is not set |
755 | # CONFIG_USB_ATI_REMOTE is not set | 817 | # CONFIG_USB_ATI_REMOTE is not set |
756 | # CONFIG_USB_KEYSPAN_REMOTE is not set | 818 | # CONFIG_USB_KEYSPAN_REMOTE is not set |
819 | # CONFIG_USB_APPLETOUCH is not set | ||
757 | 820 | ||
758 | # | 821 | # |
759 | # USB Imaging devices | 822 | # USB Imaging devices |
@@ -824,11 +887,13 @@ CONFIG_USB_MON=y | |||
824 | # InfiniBand support | 887 | # InfiniBand support |
825 | # | 888 | # |
826 | CONFIG_INFINIBAND=m | 889 | CONFIG_INFINIBAND=m |
827 | CONFIG_INFINIBAND_USER_VERBS=m | 890 | # CONFIG_INFINIBAND_USER_MAD is not set |
891 | CONFIG_INFINIBAND_USER_ACCESS=m | ||
828 | CONFIG_INFINIBAND_MTHCA=m | 892 | CONFIG_INFINIBAND_MTHCA=m |
829 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set | 893 | # CONFIG_INFINIBAND_MTHCA_DEBUG is not set |
830 | CONFIG_INFINIBAND_IPOIB=m | 894 | CONFIG_INFINIBAND_IPOIB=m |
831 | # CONFIG_INFINIBAND_IPOIB_DEBUG is not set | 895 | # CONFIG_INFINIBAND_IPOIB_DEBUG is not set |
896 | CONFIG_INFINIBAND_SRP=m | ||
832 | 897 | ||
833 | # | 898 | # |
834 | # SN Devices | 899 | # SN Devices |
@@ -858,16 +923,12 @@ CONFIG_REISERFS_FS_POSIX_ACL=y | |||
858 | CONFIG_REISERFS_FS_SECURITY=y | 923 | CONFIG_REISERFS_FS_SECURITY=y |
859 | # CONFIG_JFS_FS is not set | 924 | # CONFIG_JFS_FS is not set |
860 | CONFIG_FS_POSIX_ACL=y | 925 | CONFIG_FS_POSIX_ACL=y |
861 | |||
862 | # | ||
863 | # XFS support | ||
864 | # | ||
865 | CONFIG_XFS_FS=y | 926 | CONFIG_XFS_FS=y |
866 | CONFIG_XFS_EXPORT=y | 927 | CONFIG_XFS_EXPORT=y |
867 | CONFIG_XFS_RT=y | ||
868 | CONFIG_XFS_QUOTA=y | 928 | CONFIG_XFS_QUOTA=y |
869 | # CONFIG_XFS_SECURITY is not set | 929 | # CONFIG_XFS_SECURITY is not set |
870 | CONFIG_XFS_POSIX_ACL=y | 930 | CONFIG_XFS_POSIX_ACL=y |
931 | CONFIG_XFS_RT=y | ||
871 | # CONFIG_MINIX_FS is not set | 932 | # CONFIG_MINIX_FS is not set |
872 | # CONFIG_ROMFS_FS is not set | 933 | # CONFIG_ROMFS_FS is not set |
873 | CONFIG_INOTIFY=y | 934 | CONFIG_INOTIFY=y |
@@ -878,6 +939,7 @@ CONFIG_QUOTACTL=y | |||
878 | CONFIG_DNOTIFY=y | 939 | CONFIG_DNOTIFY=y |
879 | CONFIG_AUTOFS_FS=m | 940 | CONFIG_AUTOFS_FS=m |
880 | CONFIG_AUTOFS4_FS=m | 941 | CONFIG_AUTOFS4_FS=m |
942 | CONFIG_FUSE_FS=m | ||
881 | 943 | ||
882 | # | 944 | # |
883 | # CD-ROM/DVD Filesystems | 945 | # CD-ROM/DVD Filesystems |
@@ -904,13 +966,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" | |||
904 | CONFIG_PROC_FS=y | 966 | CONFIG_PROC_FS=y |
905 | CONFIG_PROC_KCORE=y | 967 | CONFIG_PROC_KCORE=y |
906 | CONFIG_SYSFS=y | 968 | CONFIG_SYSFS=y |
907 | # CONFIG_DEVPTS_FS_XATTR is not set | ||
908 | CONFIG_TMPFS=y | 969 | CONFIG_TMPFS=y |
909 | CONFIG_TMPFS_XATTR=y | ||
910 | CONFIG_TMPFS_SECURITY=y | ||
911 | CONFIG_HUGETLBFS=y | 970 | CONFIG_HUGETLBFS=y |
912 | CONFIG_HUGETLB_PAGE=y | 971 | CONFIG_HUGETLB_PAGE=y |
913 | CONFIG_RAMFS=y | 972 | CONFIG_RAMFS=y |
973 | CONFIG_RELAYFS_FS=m | ||
914 | 974 | ||
915 | # | 975 | # |
916 | # Miscellaneous filesystems | 976 | # Miscellaneous filesystems |
@@ -959,6 +1019,7 @@ CONFIG_CIFS=m | |||
959 | # CONFIG_NCP_FS is not set | 1019 | # CONFIG_NCP_FS is not set |
960 | # CONFIG_CODA_FS is not set | 1020 | # CONFIG_CODA_FS is not set |
961 | # CONFIG_AFS_FS is not set | 1021 | # CONFIG_AFS_FS is not set |
1022 | # CONFIG_9P_FS is not set | ||
962 | 1023 | ||
963 | # | 1024 | # |
964 | # Partition Types | 1025 | # Partition Types |
@@ -1028,18 +1089,21 @@ CONFIG_NLS_UTF8=y | |||
1028 | # Library routines | 1089 | # Library routines |
1029 | # | 1090 | # |
1030 | # CONFIG_CRC_CCITT is not set | 1091 | # CONFIG_CRC_CCITT is not set |
1092 | CONFIG_CRC16=m | ||
1031 | CONFIG_CRC32=y | 1093 | CONFIG_CRC32=y |
1032 | # CONFIG_LIBCRC32C is not set | 1094 | CONFIG_LIBCRC32C=m |
1033 | CONFIG_ZLIB_INFLATE=m | 1095 | CONFIG_ZLIB_INFLATE=m |
1034 | CONFIG_ZLIB_DEFLATE=m | 1096 | CONFIG_ZLIB_DEFLATE=m |
1035 | CONFIG_GENERIC_ALLOCATOR=y | 1097 | CONFIG_GENERIC_ALLOCATOR=y |
1036 | CONFIG_GENERIC_HARDIRQS=y | 1098 | CONFIG_GENERIC_HARDIRQS=y |
1037 | CONFIG_GENERIC_IRQ_PROBE=y | 1099 | CONFIG_GENERIC_IRQ_PROBE=y |
1100 | CONFIG_GENERIC_PENDING_IRQ=y | ||
1038 | 1101 | ||
1039 | # | 1102 | # |
1040 | # Profiling support | 1103 | # Instrumentation Support |
1041 | # | 1104 | # |
1042 | # CONFIG_PROFILING is not set | 1105 | # CONFIG_PROFILING is not set |
1106 | # CONFIG_KPROBES is not set | ||
1043 | 1107 | ||
1044 | # | 1108 | # |
1045 | # Kernel hacking | 1109 | # Kernel hacking |
@@ -1048,6 +1112,7 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
1048 | CONFIG_DEBUG_KERNEL=y | 1112 | CONFIG_DEBUG_KERNEL=y |
1049 | CONFIG_MAGIC_SYSRQ=y | 1113 | CONFIG_MAGIC_SYSRQ=y |
1050 | CONFIG_LOG_BUF_SHIFT=20 | 1114 | CONFIG_LOG_BUF_SHIFT=20 |
1115 | CONFIG_DETECT_SOFTLOCKUP=y | ||
1051 | # CONFIG_SCHEDSTATS is not set | 1116 | # CONFIG_SCHEDSTATS is not set |
1052 | # CONFIG_DEBUG_SLAB is not set | 1117 | # CONFIG_DEBUG_SLAB is not set |
1053 | CONFIG_DEBUG_PREEMPT=y | 1118 | CONFIG_DEBUG_PREEMPT=y |
@@ -1056,7 +1121,8 @@ CONFIG_DEBUG_PREEMPT=y | |||
1056 | # CONFIG_DEBUG_KOBJECT is not set | 1121 | # CONFIG_DEBUG_KOBJECT is not set |
1057 | CONFIG_DEBUG_INFO=y | 1122 | CONFIG_DEBUG_INFO=y |
1058 | # CONFIG_DEBUG_FS is not set | 1123 | # CONFIG_DEBUG_FS is not set |
1059 | # CONFIG_KPROBES is not set | 1124 | # CONFIG_DEBUG_VM is not set |
1125 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1060 | CONFIG_IA64_GRANULE_16MB=y | 1126 | CONFIG_IA64_GRANULE_16MB=y |
1061 | # CONFIG_IA64_GRANULE_64MB is not set | 1127 | # CONFIG_IA64_GRANULE_64MB is not set |
1062 | # CONFIG_IA64_PRINT_HAZARDS is not set | 1128 | # CONFIG_IA64_PRINT_HAZARDS is not set |
@@ -1097,7 +1163,7 @@ CONFIG_CRYPTO_DES=m | |||
1097 | # CONFIG_CRYPTO_ANUBIS is not set | 1163 | # CONFIG_CRYPTO_ANUBIS is not set |
1098 | CONFIG_CRYPTO_DEFLATE=m | 1164 | CONFIG_CRYPTO_DEFLATE=m |
1099 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 1165 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
1100 | # CONFIG_CRYPTO_CRC32C is not set | 1166 | CONFIG_CRYPTO_CRC32C=m |
1101 | # CONFIG_CRYPTO_TEST is not set | 1167 | # CONFIG_CRYPTO_TEST is not set |
1102 | 1168 | ||
1103 | # | 1169 | # |
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig index 9bc8bcafc905..b1e8f09e9fd5 100644 --- a/arch/ia64/configs/tiger_defconfig +++ b/arch/ia64/configs/tiger_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.14-rc1 | 3 | # Linux kernel version: 2.6.15-rc4 |
4 | # Wed Sep 14 15:17:57 2005 | 4 | # Fri Dec 2 16:06:32 2005 |
5 | # | 5 | # |
6 | 6 | ||
7 | # | 7 | # |
@@ -59,17 +59,36 @@ CONFIG_KMOD=y | |||
59 | CONFIG_STOP_MACHINE=y | 59 | CONFIG_STOP_MACHINE=y |
60 | 60 | ||
61 | # | 61 | # |
62 | # Block layer | ||
63 | # | ||
64 | |||
65 | # | ||
66 | # IO Schedulers | ||
67 | # | ||
68 | CONFIG_IOSCHED_NOOP=y | ||
69 | CONFIG_IOSCHED_AS=y | ||
70 | CONFIG_IOSCHED_DEADLINE=y | ||
71 | CONFIG_IOSCHED_CFQ=y | ||
72 | CONFIG_DEFAULT_AS=y | ||
73 | # CONFIG_DEFAULT_DEADLINE is not set | ||
74 | # CONFIG_DEFAULT_CFQ is not set | ||
75 | # CONFIG_DEFAULT_NOOP is not set | ||
76 | CONFIG_DEFAULT_IOSCHED="anticipatory" | ||
77 | |||
78 | # | ||
62 | # Processor type and features | 79 | # Processor type and features |
63 | # | 80 | # |
64 | CONFIG_IA64=y | 81 | CONFIG_IA64=y |
65 | CONFIG_64BIT=y | 82 | CONFIG_64BIT=y |
66 | CONFIG_MMU=y | 83 | CONFIG_MMU=y |
84 | CONFIG_SWIOTLB=y | ||
67 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 85 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
68 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 86 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
69 | CONFIG_TIME_INTERPOLATION=y | 87 | CONFIG_TIME_INTERPOLATION=y |
70 | CONFIG_EFI=y | 88 | CONFIG_EFI=y |
71 | CONFIG_GENERIC_IOMAP=y | 89 | CONFIG_GENERIC_IOMAP=y |
72 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 90 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y |
91 | CONFIG_ZONE_DMA_IS_DMA32=y | ||
73 | # CONFIG_IA64_GENERIC is not set | 92 | # CONFIG_IA64_GENERIC is not set |
74 | CONFIG_IA64_DIG=y | 93 | CONFIG_IA64_DIG=y |
75 | # CONFIG_IA64_HP_ZX1 is not set | 94 | # CONFIG_IA64_HP_ZX1 is not set |
@@ -82,18 +101,16 @@ CONFIG_MCKINLEY=y | |||
82 | # CONFIG_IA64_PAGE_SIZE_8KB is not set | 101 | # CONFIG_IA64_PAGE_SIZE_8KB is not set |
83 | CONFIG_IA64_PAGE_SIZE_16KB=y | 102 | CONFIG_IA64_PAGE_SIZE_16KB=y |
84 | # CONFIG_IA64_PAGE_SIZE_64KB is not set | 103 | # CONFIG_IA64_PAGE_SIZE_64KB is not set |
104 | CONFIG_PGTABLE_3=y | ||
105 | # CONFIG_PGTABLE_4 is not set | ||
85 | # CONFIG_HZ_100 is not set | 106 | # CONFIG_HZ_100 is not set |
86 | CONFIG_HZ_250=y | 107 | CONFIG_HZ_250=y |
87 | # CONFIG_HZ_1000 is not set | 108 | # CONFIG_HZ_1000 is not set |
88 | CONFIG_HZ=250 | 109 | CONFIG_HZ=250 |
89 | CONFIG_IA64_L1_CACHE_SHIFT=7 | 110 | CONFIG_IA64_L1_CACHE_SHIFT=7 |
90 | # CONFIG_NUMA is not set | ||
91 | CONFIG_VIRTUAL_MEM_MAP=y | ||
92 | CONFIG_HOLES_IN_ZONE=y | ||
93 | CONFIG_IA64_CYCLONE=y | 111 | CONFIG_IA64_CYCLONE=y |
94 | CONFIG_IOSAPIC=y | 112 | CONFIG_IOSAPIC=y |
95 | # CONFIG_IA64_SGI_SN_XP is not set | 113 | CONFIG_FORCE_MAX_ZONEORDER=17 |
96 | CONFIG_FORCE_MAX_ZONEORDER=18 | ||
97 | CONFIG_SMP=y | 114 | CONFIG_SMP=y |
98 | CONFIG_NR_CPUS=4 | 115 | CONFIG_NR_CPUS=4 |
99 | CONFIG_HOTPLUG_CPU=y | 116 | CONFIG_HOTPLUG_CPU=y |
@@ -106,7 +123,13 @@ CONFIG_FLATMEM_MANUAL=y | |||
106 | CONFIG_FLATMEM=y | 123 | CONFIG_FLATMEM=y |
107 | CONFIG_FLAT_NODE_MEM_MAP=y | 124 | CONFIG_FLAT_NODE_MEM_MAP=y |
108 | # CONFIG_SPARSEMEM_STATIC is not set | 125 | # CONFIG_SPARSEMEM_STATIC is not set |
109 | CONFIG_HAVE_DEC_LOCK=y | 126 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
127 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | ||
128 | CONFIG_ARCH_DISCONTIGMEM_ENABLE=y | ||
129 | CONFIG_ARCH_FLATMEM_ENABLE=y | ||
130 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | ||
131 | CONFIG_VIRTUAL_MEM_MAP=y | ||
132 | CONFIG_HOLES_IN_ZONE=y | ||
110 | CONFIG_IA32_SUPPORT=y | 133 | CONFIG_IA32_SUPPORT=y |
111 | CONFIG_COMPAT=y | 134 | CONFIG_COMPAT=y |
112 | CONFIG_IA64_MCA_RECOVERY=y | 135 | CONFIG_IA64_MCA_RECOVERY=y |
@@ -118,7 +141,6 @@ CONFIG_IA64_PALINFO=y | |||
118 | # | 141 | # |
119 | CONFIG_EFI_VARS=y | 142 | CONFIG_EFI_VARS=y |
120 | CONFIG_EFI_PCDP=y | 143 | CONFIG_EFI_PCDP=y |
121 | # CONFIG_DELL_RBU is not set | ||
122 | CONFIG_BINFMT_ELF=y | 144 | CONFIG_BINFMT_ELF=y |
123 | CONFIG_BINFMT_MISC=m | 145 | CONFIG_BINFMT_MISC=m |
124 | 146 | ||
@@ -126,6 +148,7 @@ CONFIG_BINFMT_MISC=m | |||
126 | # Power management and ACPI | 148 | # Power management and ACPI |
127 | # | 149 | # |
128 | CONFIG_PM=y | 150 | CONFIG_PM=y |
151 | CONFIG_PM_LEGACY=y | ||
129 | # CONFIG_PM_DEBUG is not set | 152 | # CONFIG_PM_DEBUG is not set |
130 | 153 | ||
131 | # | 154 | # |
@@ -226,14 +249,16 @@ CONFIG_TCP_CONG_BIC=y | |||
226 | # CONFIG_NET_DIVERT is not set | 249 | # CONFIG_NET_DIVERT is not set |
227 | # CONFIG_ECONET is not set | 250 | # CONFIG_ECONET is not set |
228 | # CONFIG_WAN_ROUTER is not set | 251 | # CONFIG_WAN_ROUTER is not set |
252 | |||
253 | # | ||
254 | # QoS and/or fair queueing | ||
255 | # | ||
229 | # CONFIG_NET_SCHED is not set | 256 | # CONFIG_NET_SCHED is not set |
230 | # CONFIG_NET_CLS_ROUTE is not set | ||
231 | 257 | ||
232 | # | 258 | # |
233 | # Network testing | 259 | # Network testing |
234 | # | 260 | # |
235 | # CONFIG_NET_PKTGEN is not set | 261 | # CONFIG_NET_PKTGEN is not set |
236 | # CONFIG_NETFILTER_NETLINK is not set | ||
237 | # CONFIG_HAMRADIO is not set | 262 | # CONFIG_HAMRADIO is not set |
238 | # CONFIG_IRDA is not set | 263 | # CONFIG_IRDA is not set |
239 | # CONFIG_BT is not set | 264 | # CONFIG_BT is not set |
@@ -295,14 +320,6 @@ CONFIG_BLK_DEV_RAM_COUNT=16 | |||
295 | CONFIG_BLK_DEV_RAM_SIZE=4096 | 320 | CONFIG_BLK_DEV_RAM_SIZE=4096 |
296 | CONFIG_BLK_DEV_INITRD=y | 321 | CONFIG_BLK_DEV_INITRD=y |
297 | # CONFIG_CDROM_PKTCDVD is not set | 322 | # CONFIG_CDROM_PKTCDVD is not set |
298 | |||
299 | # | ||
300 | # IO Schedulers | ||
301 | # | ||
302 | CONFIG_IOSCHED_NOOP=y | ||
303 | CONFIG_IOSCHED_AS=y | ||
304 | CONFIG_IOSCHED_DEADLINE=y | ||
305 | CONFIG_IOSCHED_CFQ=y | ||
306 | # CONFIG_ATA_OVER_ETH is not set | 323 | # CONFIG_ATA_OVER_ETH is not set |
307 | 324 | ||
308 | # | 325 | # |
@@ -400,6 +417,7 @@ CONFIG_SCSI_FC_ATTRS=y | |||
400 | # | 417 | # |
401 | # SCSI low-level drivers | 418 | # SCSI low-level drivers |
402 | # | 419 | # |
420 | # CONFIG_ISCSI_TCP is not set | ||
403 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set | 421 | # CONFIG_BLK_DEV_3W_XXXX_RAID is not set |
404 | # CONFIG_SCSI_3W_9XXX is not set | 422 | # CONFIG_SCSI_3W_9XXX is not set |
405 | # CONFIG_SCSI_ACARD is not set | 423 | # CONFIG_SCSI_ACARD is not set |
@@ -409,6 +427,7 @@ CONFIG_SCSI_FC_ATTRS=y | |||
409 | # CONFIG_SCSI_AIC79XX is not set | 427 | # CONFIG_SCSI_AIC79XX is not set |
410 | # CONFIG_MEGARAID_NEWGEN is not set | 428 | # CONFIG_MEGARAID_NEWGEN is not set |
411 | # CONFIG_MEGARAID_LEGACY is not set | 429 | # CONFIG_MEGARAID_LEGACY is not set |
430 | # CONFIG_MEGARAID_SAS is not set | ||
412 | # CONFIG_SCSI_SATA is not set | 431 | # CONFIG_SCSI_SATA is not set |
413 | # CONFIG_SCSI_DMX3191D is not set | 432 | # CONFIG_SCSI_DMX3191D is not set |
414 | # CONFIG_SCSI_FUTURE_DOMAIN is not set | 433 | # CONFIG_SCSI_FUTURE_DOMAIN is not set |
@@ -424,7 +443,6 @@ CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 | |||
424 | CONFIG_SCSI_QLOGIC_FC=y | 443 | CONFIG_SCSI_QLOGIC_FC=y |
425 | # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set | 444 | # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set |
426 | CONFIG_SCSI_QLOGIC_1280=y | 445 | CONFIG_SCSI_QLOGIC_1280=y |
427 | # CONFIG_SCSI_QLOGIC_1280_1040 is not set | ||
428 | CONFIG_SCSI_QLA2XXX=y | 446 | CONFIG_SCSI_QLA2XXX=y |
429 | CONFIG_SCSI_QLA21XX=m | 447 | CONFIG_SCSI_QLA21XX=m |
430 | CONFIG_SCSI_QLA22XX=m | 448 | CONFIG_SCSI_QLA22XX=m |
@@ -463,6 +481,7 @@ CONFIG_DM_ZERO=m | |||
463 | CONFIG_FUSION=y | 481 | CONFIG_FUSION=y |
464 | CONFIG_FUSION_SPI=y | 482 | CONFIG_FUSION_SPI=y |
465 | CONFIG_FUSION_FC=y | 483 | CONFIG_FUSION_FC=y |
484 | # CONFIG_FUSION_SAS is not set | ||
466 | CONFIG_FUSION_MAX_SGE=128 | 485 | CONFIG_FUSION_MAX_SGE=128 |
467 | CONFIG_FUSION_CTL=y | 486 | CONFIG_FUSION_CTL=y |
468 | 487 | ||
@@ -503,6 +522,7 @@ CONFIG_NET_ETHERNET=y | |||
503 | CONFIG_MII=m | 522 | CONFIG_MII=m |
504 | # CONFIG_HAPPYMEAL is not set | 523 | # CONFIG_HAPPYMEAL is not set |
505 | # CONFIG_SUNGEM is not set | 524 | # CONFIG_SUNGEM is not set |
525 | # CONFIG_CASSINI is not set | ||
506 | # CONFIG_NET_VENDOR_3COM is not set | 526 | # CONFIG_NET_VENDOR_3COM is not set |
507 | 527 | ||
508 | # | 528 | # |
@@ -727,6 +747,7 @@ CONFIG_MAX_RAW_DEVS=256 | |||
727 | # TPM devices | 747 | # TPM devices |
728 | # | 748 | # |
729 | # CONFIG_TCG_TPM is not set | 749 | # CONFIG_TCG_TPM is not set |
750 | # CONFIG_TELCLOCK is not set | ||
730 | 751 | ||
731 | # | 752 | # |
732 | # I2C support | 753 | # I2C support |
@@ -812,12 +833,15 @@ CONFIG_USB_UHCI_HCD=y | |||
812 | # | 833 | # |
813 | # USB Device Class drivers | 834 | # USB Device Class drivers |
814 | # | 835 | # |
815 | # CONFIG_USB_BLUETOOTH_TTY is not set | ||
816 | # CONFIG_USB_ACM is not set | 836 | # CONFIG_USB_ACM is not set |
817 | # CONFIG_USB_PRINTER is not set | 837 | # CONFIG_USB_PRINTER is not set |
818 | 838 | ||
819 | # | 839 | # |
820 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information | 840 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' |
841 | # | ||
842 | |||
843 | # | ||
844 | # may also be needed; see USB_STORAGE Help for more information | ||
821 | # | 845 | # |
822 | CONFIG_USB_STORAGE=m | 846 | CONFIG_USB_STORAGE=m |
823 | # CONFIG_USB_STORAGE_DEBUG is not set | 847 | # CONFIG_USB_STORAGE_DEBUG is not set |
@@ -1123,9 +1147,10 @@ CONFIG_GENERIC_IRQ_PROBE=y | |||
1123 | CONFIG_GENERIC_PENDING_IRQ=y | 1147 | CONFIG_GENERIC_PENDING_IRQ=y |
1124 | 1148 | ||
1125 | # | 1149 | # |
1126 | # Profiling support | 1150 | # Instrumentation Support |
1127 | # | 1151 | # |
1128 | # CONFIG_PROFILING is not set | 1152 | # CONFIG_PROFILING is not set |
1153 | # CONFIG_KPROBES is not set | ||
1129 | 1154 | ||
1130 | # | 1155 | # |
1131 | # Kernel hacking | 1156 | # Kernel hacking |
@@ -1142,7 +1167,8 @@ CONFIG_DETECT_SOFTLOCKUP=y | |||
1142 | # CONFIG_DEBUG_KOBJECT is not set | 1167 | # CONFIG_DEBUG_KOBJECT is not set |
1143 | # CONFIG_DEBUG_INFO is not set | 1168 | # CONFIG_DEBUG_INFO is not set |
1144 | # CONFIG_DEBUG_FS is not set | 1169 | # CONFIG_DEBUG_FS is not set |
1145 | # CONFIG_KPROBES is not set | 1170 | # CONFIG_DEBUG_VM is not set |
1171 | # CONFIG_RCU_TORTURE_TEST is not set | ||
1146 | CONFIG_IA64_GRANULE_16MB=y | 1172 | CONFIG_IA64_GRANULE_16MB=y |
1147 | # CONFIG_IA64_GRANULE_64MB is not set | 1173 | # CONFIG_IA64_GRANULE_64MB is not set |
1148 | # CONFIG_IA64_PRINT_HAZARDS is not set | 1174 | # CONFIG_IA64_PRINT_HAZARDS is not set |
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index a7280d9f6c16..4e7a6a1ec6c7 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c | |||
@@ -261,8 +261,6 @@ elf32_set_personality (void) | |||
261 | { | 261 | { |
262 | set_personality(PER_LINUX32); | 262 | set_personality(PER_LINUX32); |
263 | current->thread.map_base = IA32_PAGE_OFFSET/3; | 263 | current->thread.map_base = IA32_PAGE_OFFSET/3; |
264 | current->thread.task_size = IA32_PAGE_OFFSET; /* use what Linux/x86 uses... */ | ||
265 | set_fs(USER_DS); /* set addr limit for new TASK_SIZE */ | ||
266 | } | 264 | } |
267 | 265 | ||
268 | static unsigned long | 266 | static unsigned long |
diff --git a/arch/ia64/ia32/ia32priv.h b/arch/ia64/ia32/ia32priv.h index e3e9290e3ff2..68ceb4e690c7 100644 --- a/arch/ia64/ia32/ia32priv.h +++ b/arch/ia64/ia32/ia32priv.h | |||
@@ -305,7 +305,6 @@ struct old_linux32_dirent { | |||
305 | #define ELF_DATA ELFDATA2LSB | 305 | #define ELF_DATA ELFDATA2LSB |
306 | #define ELF_ARCH EM_386 | 306 | #define ELF_ARCH EM_386 |
307 | 307 | ||
308 | #define IA32_PAGE_OFFSET 0xc0000000 | ||
309 | #define IA32_STACK_TOP IA32_PAGE_OFFSET | 308 | #define IA32_STACK_TOP IA32_PAGE_OFFSET |
310 | #define IA32_GATE_OFFSET IA32_PAGE_OFFSET | 309 | #define IA32_GATE_OFFSET IA32_PAGE_OFFSET |
311 | #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE | 310 | #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE |
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index 2895d6e6062f..89a70400c4f6 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/arch/ia64/kernel/kprobes.c | |||
@@ -630,7 +630,7 @@ static int __kprobes pre_kprobes_handler(struct die_args *args) | |||
630 | */ | 630 | */ |
631 | save_previous_kprobe(kcb); | 631 | save_previous_kprobe(kcb); |
632 | set_current_kprobe(p, kcb); | 632 | set_current_kprobe(p, kcb); |
633 | p->nmissed++; | 633 | kprobes_inc_nmissed_count(p); |
634 | prepare_ss(p, regs); | 634 | prepare_ss(p, regs); |
635 | kcb->kprobe_status = KPROBE_REENTER; | 635 | kcb->kprobe_status = KPROBE_REENTER; |
636 | return 1; | 636 | return 1; |
diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c index 2e33665d9c18..e9904c74d2ba 100644 --- a/arch/ia64/kernel/process.c +++ b/arch/ia64/kernel/process.c | |||
@@ -721,8 +721,13 @@ flush_thread (void) | |||
721 | /* drop floating-point and debug-register state if it exists: */ | 721 | /* drop floating-point and debug-register state if it exists: */ |
722 | current->thread.flags &= ~(IA64_THREAD_FPH_VALID | IA64_THREAD_DBG_VALID); | 722 | current->thread.flags &= ~(IA64_THREAD_FPH_VALID | IA64_THREAD_DBG_VALID); |
723 | ia64_drop_fpu(current); | 723 | ia64_drop_fpu(current); |
724 | if (IS_IA32_PROCESS(ia64_task_regs(current))) | 724 | #ifdef CONFIG_IA32_SUPPORT |
725 | if (IS_IA32_PROCESS(ia64_task_regs(current))) { | ||
725 | ia32_drop_partial_page_list(current); | 726 | ia32_drop_partial_page_list(current); |
727 | current->thread.task_size = IA32_PAGE_OFFSET; | ||
728 | set_fs(USER_DS); | ||
729 | } | ||
730 | #endif | ||
726 | } | 731 | } |
727 | 732 | ||
728 | /* | 733 | /* |
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c index ca68e6e44a72..1461dc660b43 100644 --- a/arch/ia64/kernel/salinfo.c +++ b/arch/ia64/kernel/salinfo.c | |||
@@ -293,7 +293,7 @@ retry: | |||
293 | if (file->f_flags & O_NONBLOCK) | 293 | if (file->f_flags & O_NONBLOCK) |
294 | return -EAGAIN; | 294 | return -EAGAIN; |
295 | if (down_interruptible(&data->sem)) | 295 | if (down_interruptible(&data->sem)) |
296 | return -ERESTARTSYS; | 296 | return -EINTR; |
297 | } | 297 | } |
298 | 298 | ||
299 | n = data->cpu_check; | 299 | n = data->cpu_check; |
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c index 5b7e736f3b49..028a2b95936c 100644 --- a/arch/ia64/kernel/time.c +++ b/arch/ia64/kernel/time.c | |||
@@ -249,3 +249,32 @@ time_init (void) | |||
249 | */ | 249 | */ |
250 | set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec); | 250 | set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec); |
251 | } | 251 | } |
252 | |||
253 | #define SMALLUSECS 100 | ||
254 | |||
255 | void | ||
256 | udelay (unsigned long usecs) | ||
257 | { | ||
258 | unsigned long start; | ||
259 | unsigned long cycles; | ||
260 | unsigned long smallusecs; | ||
261 | |||
262 | /* | ||
263 | * Execute the non-preemptible delay loop (because the ITC might | ||
264 | * not be synchronized between CPUS) in relatively short time | ||
265 | * chunks, allowing preemption between the chunks. | ||
266 | */ | ||
267 | while (usecs > 0) { | ||
268 | smallusecs = (usecs > SMALLUSECS) ? SMALLUSECS : usecs; | ||
269 | preempt_disable(); | ||
270 | cycles = smallusecs*local_cpu_data->cyc_per_usec; | ||
271 | start = ia64_get_itc(); | ||
272 | |||
273 | while (ia64_get_itc() - start < cycles) | ||
274 | cpu_relax(); | ||
275 | |||
276 | preempt_enable(); | ||
277 | usecs -= smallusecs; | ||
278 | } | ||
279 | } | ||
280 | EXPORT_SYMBOL(udelay); | ||
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c index c6d40446c2c4..b631cf86ed44 100644 --- a/arch/ia64/kernel/uncached.c +++ b/arch/ia64/kernel/uncached.c | |||
@@ -53,7 +53,7 @@ static void uncached_ipi_visibility(void *data) | |||
53 | if ((status != PAL_VISIBILITY_OK) && | 53 | if ((status != PAL_VISIBILITY_OK) && |
54 | (status != PAL_VISIBILITY_OK_REMOTE_NEEDED)) | 54 | (status != PAL_VISIBILITY_OK_REMOTE_NEEDED)) |
55 | printk(KERN_DEBUG "pal_prefetch_visibility() returns %i on " | 55 | printk(KERN_DEBUG "pal_prefetch_visibility() returns %i on " |
56 | "CPU %i\n", status, get_cpu()); | 56 | "CPU %i\n", status, raw_smp_processor_id()); |
57 | } | 57 | } |
58 | 58 | ||
59 | 59 | ||
@@ -63,7 +63,7 @@ static void uncached_ipi_mc_drain(void *data) | |||
63 | status = ia64_pal_mc_drain(); | 63 | status = ia64_pal_mc_drain(); |
64 | if (status) | 64 | if (status) |
65 | printk(KERN_WARNING "ia64_pal_mc_drain() failed with %i on " | 65 | printk(KERN_WARNING "ia64_pal_mc_drain() failed with %i on " |
66 | "CPU %i\n", status, get_cpu()); | 66 | "CPU %i\n", status, raw_smp_processor_id()); |
67 | } | 67 | } |
68 | 68 | ||
69 | 69 | ||
@@ -105,7 +105,7 @@ uncached_get_new_chunk(struct gen_pool *poolp) | |||
105 | status = ia64_pal_prefetch_visibility(PAL_VISIBILITY_PHYSICAL); | 105 | status = ia64_pal_prefetch_visibility(PAL_VISIBILITY_PHYSICAL); |
106 | 106 | ||
107 | dprintk(KERN_INFO "pal_prefetch_visibility() returns %i on cpu %i\n", | 107 | dprintk(KERN_INFO "pal_prefetch_visibility() returns %i on cpu %i\n", |
108 | status, get_cpu()); | 108 | status, raw_smp_processor_id()); |
109 | 109 | ||
110 | if (!status) { | 110 | if (!status) { |
111 | status = smp_call_function(uncached_ipi_visibility, NULL, 0, 1); | 111 | status = smp_call_function(uncached_ipi_visibility, NULL, 0, 1); |
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S index 30d8564e9603..73af6267d2ef 100644 --- a/arch/ia64/kernel/vmlinux.lds.S +++ b/arch/ia64/kernel/vmlinux.lds.S | |||
@@ -177,6 +177,9 @@ SECTIONS | |||
177 | } | 177 | } |
178 | . = ALIGN(PAGE_SIZE); /* make sure the gate page doesn't expose kernel data */ | 178 | . = ALIGN(PAGE_SIZE); /* make sure the gate page doesn't expose kernel data */ |
179 | 179 | ||
180 | .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) | ||
181 | { *(.data.read_mostly) } | ||
182 | |||
180 | .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) | 183 | .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) |
181 | { *(.data.cacheline_aligned) } | 184 | { *(.data.cacheline_aligned) } |
182 | 185 | ||
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index 0f776b032d31..c87d6d1d5813 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c | |||
@@ -50,8 +50,10 @@ static nodemask_t memory_less_mask __initdata; | |||
50 | * To prevent cache aliasing effects, align per-node structures so that they | 50 | * To prevent cache aliasing effects, align per-node structures so that they |
51 | * start at addresses that are strided by node number. | 51 | * start at addresses that are strided by node number. |
52 | */ | 52 | */ |
53 | #define MAX_NODE_ALIGN_OFFSET (32 * 1024 * 1024) | ||
53 | #define NODEDATA_ALIGN(addr, node) \ | 54 | #define NODEDATA_ALIGN(addr, node) \ |
54 | ((((addr) + 1024*1024-1) & ~(1024*1024-1)) + (node)*PERCPU_PAGE_SIZE) | 55 | ((((addr) + 1024*1024-1) & ~(1024*1024-1)) + \ |
56 | (((node)*PERCPU_PAGE_SIZE) & (MAX_NODE_ALIGN_OFFSET - 1))) | ||
55 | 57 | ||
56 | /** | 58 | /** |
57 | * build_node_maps - callback to setup bootmem structs for each node | 59 | * build_node_maps - callback to setup bootmem structs for each node |
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c index 05e4ea889981..318087e35b66 100644 --- a/arch/ia64/sn/kernel/io_init.c +++ b/arch/ia64/sn/kernel/io_init.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 1992 - 1997, 2000-2004 Silicon Graphics, Inc. All rights reserved. | 6 | * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved. |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include <linux/bootmem.h> | 9 | #include <linux/bootmem.h> |
@@ -147,6 +147,24 @@ sal_get_pcidev_info(u64 segment, u64 bus_number, u64 devfn, u64 pci_dev, | |||
147 | } | 147 | } |
148 | 148 | ||
149 | /* | 149 | /* |
150 | * sn_pcidev_info_get() - Retrieve the pcidev_info struct for the specified | ||
151 | * device. | ||
152 | */ | ||
153 | inline struct pcidev_info * | ||
154 | sn_pcidev_info_get(struct pci_dev *dev) | ||
155 | { | ||
156 | struct pcidev_info *pcidev; | ||
157 | |||
158 | list_for_each_entry(pcidev, | ||
159 | &(SN_PCI_CONTROLLER(dev)->pcidev_info), pdi_list) { | ||
160 | if (pcidev->pdi_linux_pcidev == dev) { | ||
161 | return pcidev; | ||
162 | } | ||
163 | } | ||
164 | return NULL; | ||
165 | } | ||
166 | |||
167 | /* | ||
150 | * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for | 168 | * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for |
151 | * each node in the system. | 169 | * each node in the system. |
152 | */ | 170 | */ |
@@ -229,6 +247,50 @@ static void sn_fixup_ionodes(void) | |||
229 | 247 | ||
230 | } | 248 | } |
231 | 249 | ||
250 | /* | ||
251 | * sn_pci_window_fixup() - Create a pci_window for each device resource. | ||
252 | * Until ACPI support is added, we need this code | ||
253 | * to setup pci_windows for use by | ||
254 | * pcibios_bus_to_resource(), | ||
255 | * pcibios_resource_to_bus(), etc. | ||
256 | */ | ||
257 | static void | ||
258 | sn_pci_window_fixup(struct pci_dev *dev, unsigned int count, | ||
259 | int64_t * pci_addrs) | ||
260 | { | ||
261 | struct pci_controller *controller = PCI_CONTROLLER(dev->bus); | ||
262 | unsigned int i; | ||
263 | unsigned int idx; | ||
264 | unsigned int new_count; | ||
265 | struct pci_window *new_window; | ||
266 | |||
267 | if (count == 0) | ||
268 | return; | ||
269 | idx = controller->windows; | ||
270 | new_count = controller->windows + count; | ||
271 | new_window = kcalloc(new_count, sizeof(struct pci_window), GFP_KERNEL); | ||
272 | if (new_window == NULL) | ||
273 | BUG(); | ||
274 | if (controller->window) { | ||
275 | memcpy(new_window, controller->window, | ||
276 | sizeof(struct pci_window) * controller->windows); | ||
277 | kfree(controller->window); | ||
278 | } | ||
279 | |||
280 | /* Setup a pci_window for each device resource. */ | ||
281 | for (i = 0; i <= PCI_ROM_RESOURCE; i++) { | ||
282 | if (pci_addrs[i] == -1) | ||
283 | continue; | ||
284 | |||
285 | new_window[idx].offset = dev->resource[i].start - pci_addrs[i]; | ||
286 | new_window[idx].resource = dev->resource[i]; | ||
287 | idx++; | ||
288 | } | ||
289 | |||
290 | controller->windows = new_count; | ||
291 | controller->window = new_window; | ||
292 | } | ||
293 | |||
232 | void sn_pci_unfixup_slot(struct pci_dev *dev) | 294 | void sn_pci_unfixup_slot(struct pci_dev *dev) |
233 | { | 295 | { |
234 | struct pci_dev *host_pci_dev = SN_PCIDEV_INFO(dev)->host_pci_dev; | 296 | struct pci_dev *host_pci_dev = SN_PCIDEV_INFO(dev)->host_pci_dev; |
@@ -246,21 +308,23 @@ void sn_pci_unfixup_slot(struct pci_dev *dev) | |||
246 | */ | 308 | */ |
247 | void sn_pci_fixup_slot(struct pci_dev *dev) | 309 | void sn_pci_fixup_slot(struct pci_dev *dev) |
248 | { | 310 | { |
311 | unsigned int count = 0; | ||
249 | int idx; | 312 | int idx; |
250 | int segment = pci_domain_nr(dev->bus); | 313 | int segment = pci_domain_nr(dev->bus); |
251 | int status = 0; | 314 | int status = 0; |
252 | struct pcibus_bussoft *bs; | 315 | struct pcibus_bussoft *bs; |
253 | struct pci_bus *host_pci_bus; | 316 | struct pci_bus *host_pci_bus; |
254 | struct pci_dev *host_pci_dev; | 317 | struct pci_dev *host_pci_dev; |
318 | struct pcidev_info *pcidev_info; | ||
319 | int64_t pci_addrs[PCI_ROM_RESOURCE + 1]; | ||
255 | struct sn_irq_info *sn_irq_info; | 320 | struct sn_irq_info *sn_irq_info; |
256 | unsigned long size; | 321 | unsigned long size; |
257 | unsigned int bus_no, devfn; | 322 | unsigned int bus_no, devfn; |
258 | 323 | ||
259 | pci_dev_get(dev); /* for the sysdata pointer */ | 324 | pci_dev_get(dev); /* for the sysdata pointer */ |
260 | dev->sysdata = kmalloc(sizeof(struct pcidev_info), GFP_KERNEL); | 325 | pcidev_info = kzalloc(sizeof(struct pcidev_info), GFP_KERNEL); |
261 | if (SN_PCIDEV_INFO(dev) <= 0) | 326 | if (pcidev_info <= 0) |
262 | BUG(); /* Cannot afford to run out of memory */ | 327 | BUG(); /* Cannot afford to run out of memory */ |
263 | memset(SN_PCIDEV_INFO(dev), 0, sizeof(struct pcidev_info)); | ||
264 | 328 | ||
265 | sn_irq_info = kmalloc(sizeof(struct sn_irq_info), GFP_KERNEL); | 329 | sn_irq_info = kmalloc(sizeof(struct sn_irq_info), GFP_KERNEL); |
266 | if (sn_irq_info <= 0) | 330 | if (sn_irq_info <= 0) |
@@ -270,22 +334,34 @@ void sn_pci_fixup_slot(struct pci_dev *dev) | |||
270 | /* Call to retrieve pci device information needed by kernel. */ | 334 | /* Call to retrieve pci device information needed by kernel. */ |
271 | status = sal_get_pcidev_info((u64) segment, (u64) dev->bus->number, | 335 | status = sal_get_pcidev_info((u64) segment, (u64) dev->bus->number, |
272 | dev->devfn, | 336 | dev->devfn, |
273 | (u64) __pa(SN_PCIDEV_INFO(dev)), | 337 | (u64) __pa(pcidev_info), |
274 | (u64) __pa(sn_irq_info)); | 338 | (u64) __pa(sn_irq_info)); |
275 | if (status) | 339 | if (status) |
276 | BUG(); /* Cannot get platform pci device information */ | 340 | BUG(); /* Cannot get platform pci device information */ |
277 | 341 | ||
342 | /* Add pcidev_info to list in sn_pci_controller struct */ | ||
343 | list_add_tail(&pcidev_info->pdi_list, | ||
344 | &(SN_PCI_CONTROLLER(dev->bus)->pcidev_info)); | ||
345 | |||
278 | /* Copy over PIO Mapped Addresses */ | 346 | /* Copy over PIO Mapped Addresses */ |
279 | for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) { | 347 | for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) { |
280 | unsigned long start, end, addr; | 348 | unsigned long start, end, addr; |
281 | 349 | ||
282 | if (!SN_PCIDEV_INFO(dev)->pdi_pio_mapped_addr[idx]) | 350 | if (!pcidev_info->pdi_pio_mapped_addr[idx]) { |
351 | pci_addrs[idx] = -1; | ||
283 | continue; | 352 | continue; |
353 | } | ||
284 | 354 | ||
285 | start = dev->resource[idx].start; | 355 | start = dev->resource[idx].start; |
286 | end = dev->resource[idx].end; | 356 | end = dev->resource[idx].end; |
287 | size = end - start; | 357 | size = end - start; |
288 | addr = SN_PCIDEV_INFO(dev)->pdi_pio_mapped_addr[idx]; | 358 | if (size == 0) { |
359 | pci_addrs[idx] = -1; | ||
360 | continue; | ||
361 | } | ||
362 | pci_addrs[idx] = start; | ||
363 | count++; | ||
364 | addr = pcidev_info->pdi_pio_mapped_addr[idx]; | ||
289 | addr = ((addr << 4) >> 4) | __IA64_UNCACHED_OFFSET; | 365 | addr = ((addr << 4) >> 4) | __IA64_UNCACHED_OFFSET; |
290 | dev->resource[idx].start = addr; | 366 | dev->resource[idx].start = addr; |
291 | dev->resource[idx].end = addr + size; | 367 | dev->resource[idx].end = addr + size; |
@@ -294,23 +370,27 @@ void sn_pci_fixup_slot(struct pci_dev *dev) | |||
294 | else | 370 | else |
295 | dev->resource[idx].parent = &iomem_resource; | 371 | dev->resource[idx].parent = &iomem_resource; |
296 | } | 372 | } |
373 | /* Create a pci_window in the pci_controller struct for | ||
374 | * each device resource. | ||
375 | */ | ||
376 | if (count > 0) | ||
377 | sn_pci_window_fixup(dev, count, pci_addrs); | ||
297 | 378 | ||
298 | /* | 379 | /* |
299 | * Using the PROMs values for the PCI host bus, get the Linux | 380 | * Using the PROMs values for the PCI host bus, get the Linux |
300 | * PCI host_pci_dev struct and set up host bus linkages | 381 | * PCI host_pci_dev struct and set up host bus linkages |
301 | */ | 382 | */ |
302 | 383 | ||
303 | bus_no = (SN_PCIDEV_INFO(dev)->pdi_slot_host_handle >> 32) & 0xff; | 384 | bus_no = (pcidev_info->pdi_slot_host_handle >> 32) & 0xff; |
304 | devfn = SN_PCIDEV_INFO(dev)->pdi_slot_host_handle & 0xffffffff; | 385 | devfn = pcidev_info->pdi_slot_host_handle & 0xffffffff; |
305 | host_pci_bus = pci_find_bus(segment, bus_no); | 386 | host_pci_bus = pci_find_bus(segment, bus_no); |
306 | host_pci_dev = pci_get_slot(host_pci_bus, devfn); | 387 | host_pci_dev = pci_get_slot(host_pci_bus, devfn); |
307 | 388 | ||
308 | SN_PCIDEV_INFO(dev)->host_pci_dev = host_pci_dev; | 389 | pcidev_info->host_pci_dev = host_pci_dev; |
309 | SN_PCIDEV_INFO(dev)->pdi_host_pcidev_info = | 390 | pcidev_info->pdi_linux_pcidev = dev; |
310 | SN_PCIDEV_INFO(host_pci_dev); | 391 | pcidev_info->pdi_host_pcidev_info = SN_PCIDEV_INFO(host_pci_dev); |
311 | SN_PCIDEV_INFO(dev)->pdi_linux_pcidev = dev; | ||
312 | bs = SN_PCIBUS_BUSSOFT(dev->bus); | 392 | bs = SN_PCIBUS_BUSSOFT(dev->bus); |
313 | SN_PCIDEV_INFO(dev)->pdi_pcibus_info = bs; | 393 | pcidev_info->pdi_pcibus_info = bs; |
314 | 394 | ||
315 | if (bs && bs->bs_asic_type < PCIIO_ASIC_MAX_TYPES) { | 395 | if (bs && bs->bs_asic_type < PCIIO_ASIC_MAX_TYPES) { |
316 | SN_PCIDEV_BUSPROVIDER(dev) = sn_pci_provider[bs->bs_asic_type]; | 396 | SN_PCIDEV_BUSPROVIDER(dev) = sn_pci_provider[bs->bs_asic_type]; |
@@ -320,11 +400,11 @@ void sn_pci_fixup_slot(struct pci_dev *dev) | |||
320 | 400 | ||
321 | /* Only set up IRQ stuff if this device has a host bus context */ | 401 | /* Only set up IRQ stuff if this device has a host bus context */ |
322 | if (bs && sn_irq_info->irq_irq) { | 402 | if (bs && sn_irq_info->irq_irq) { |
323 | SN_PCIDEV_INFO(dev)->pdi_sn_irq_info = sn_irq_info; | 403 | pcidev_info->pdi_sn_irq_info = sn_irq_info; |
324 | dev->irq = SN_PCIDEV_INFO(dev)->pdi_sn_irq_info->irq_irq; | 404 | dev->irq = pcidev_info->pdi_sn_irq_info->irq_irq; |
325 | sn_irq_fixup(dev, sn_irq_info); | 405 | sn_irq_fixup(dev, sn_irq_info); |
326 | } else { | 406 | } else { |
327 | SN_PCIDEV_INFO(dev)->pdi_sn_irq_info = NULL; | 407 | pcidev_info->pdi_sn_irq_info = NULL; |
328 | kfree(sn_irq_info); | 408 | kfree(sn_irq_info); |
329 | } | 409 | } |
330 | } | 410 | } |
@@ -338,6 +418,7 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) | |||
338 | int status = 0; | 418 | int status = 0; |
339 | int nasid, cnode; | 419 | int nasid, cnode; |
340 | struct pci_controller *controller; | 420 | struct pci_controller *controller; |
421 | struct sn_pci_controller *sn_controller; | ||
341 | struct pcibus_bussoft *prom_bussoft_ptr; | 422 | struct pcibus_bussoft *prom_bussoft_ptr; |
342 | struct hubdev_info *hubdev_info; | 423 | struct hubdev_info *hubdev_info; |
343 | void *provider_soft = NULL; | 424 | void *provider_soft = NULL; |
@@ -349,10 +430,15 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) | |||
349 | return; /*bus # does not exist */ | 430 | return; /*bus # does not exist */ |
350 | prom_bussoft_ptr = __va(prom_bussoft_ptr); | 431 | prom_bussoft_ptr = __va(prom_bussoft_ptr); |
351 | 432 | ||
352 | controller = kzalloc(sizeof(struct pci_controller), GFP_KERNEL); | 433 | /* Allocate a sn_pci_controller, which has a pci_controller struct |
434 | * as the first member. | ||
435 | */ | ||
436 | sn_controller = kzalloc(sizeof(struct sn_pci_controller), GFP_KERNEL); | ||
437 | if (!sn_controller) | ||
438 | BUG(); | ||
439 | INIT_LIST_HEAD(&sn_controller->pcidev_info); | ||
440 | controller = &sn_controller->pci_controller; | ||
353 | controller->segment = segment; | 441 | controller->segment = segment; |
354 | if (!controller) | ||
355 | BUG(); | ||
356 | 442 | ||
357 | if (bus == NULL) { | 443 | if (bus == NULL) { |
358 | bus = pci_scan_bus(busnum, &pci_root_ops, controller); | 444 | bus = pci_scan_bus(busnum, &pci_root_ops, controller); |
@@ -390,6 +476,29 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) | |||
390 | } | 476 | } |
391 | 477 | ||
392 | /* | 478 | /* |
479 | * Setup pci_windows for legacy IO and MEM space. | ||
480 | * (Temporary until ACPI support is in place.) | ||
481 | */ | ||
482 | controller->window = kcalloc(2, sizeof(struct pci_window), GFP_KERNEL); | ||
483 | if (controller->window == NULL) | ||
484 | BUG(); | ||
485 | controller->window[0].offset = prom_bussoft_ptr->bs_legacy_io; | ||
486 | controller->window[0].resource.name = "legacy_io"; | ||
487 | controller->window[0].resource.flags = IORESOURCE_IO; | ||
488 | controller->window[0].resource.start = prom_bussoft_ptr->bs_legacy_io; | ||
489 | controller->window[0].resource.end = | ||
490 | controller->window[0].resource.start + 0xffff; | ||
491 | controller->window[0].resource.parent = &ioport_resource; | ||
492 | controller->window[1].offset = prom_bussoft_ptr->bs_legacy_mem; | ||
493 | controller->window[1].resource.name = "legacy_mem"; | ||
494 | controller->window[1].resource.flags = IORESOURCE_MEM; | ||
495 | controller->window[1].resource.start = prom_bussoft_ptr->bs_legacy_mem; | ||
496 | controller->window[1].resource.end = | ||
497 | controller->window[1].resource.start + (1024 * 1024) - 1; | ||
498 | controller->window[1].resource.parent = &iomem_resource; | ||
499 | controller->windows = 2; | ||
500 | |||
501 | /* | ||
393 | * Generic bus fixup goes here. Don't reference prom_bussoft_ptr | 502 | * Generic bus fixup goes here. Don't reference prom_bussoft_ptr |
394 | * after this point. | 503 | * after this point. |
395 | */ | 504 | */ |
@@ -421,7 +530,7 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus) | |||
421 | 530 | ||
422 | error_return: | 531 | error_return: |
423 | 532 | ||
424 | kfree(controller); | 533 | kfree(sn_controller); |
425 | return; | 534 | return; |
426 | } | 535 | } |
427 | 536 | ||
@@ -434,7 +543,7 @@ void sn_bus_store_sysdata(struct pci_dev *dev) | |||
434 | dev_dbg(dev, "%s: out of memory!\n", __FUNCTION__); | 543 | dev_dbg(dev, "%s: out of memory!\n", __FUNCTION__); |
435 | return; | 544 | return; |
436 | } | 545 | } |
437 | element->sysdata = dev->sysdata; | 546 | element->sysdata = SN_PCIDEV_INFO(dev); |
438 | list_add(&element->entry, &sn_sysdata_list); | 547 | list_add(&element->entry, &sn_sysdata_list); |
439 | } | 548 | } |
440 | 549 | ||
diff --git a/arch/ia64/sn/kernel/sn2/ptc_deadlock.S b/arch/ia64/sn/kernel/sn2/ptc_deadlock.S index 3fa95065a446..bebbcc4f8dd4 100644 --- a/arch/ia64/sn/kernel/sn2/ptc_deadlock.S +++ b/arch/ia64/sn/kernel/sn2/ptc_deadlock.S | |||
@@ -39,9 +39,13 @@ sn2_ptc_deadlock_recovery_core: | |||
39 | mov r8=r0 | 39 | mov r8=r0 |
40 | 40 | ||
41 | 1: | 41 | 1: |
42 | cmp.ne p8,p9=r0,ptc1 // Test for shub type (ptc1 non-null on shub1) | ||
43 | // p8 = 1 if shub1, p9 = 1 if shub2 | ||
44 | |||
42 | add scr2=ALIAS_OFFSET,piowc // Address of WRITE_STATUS alias register | 45 | add scr2=ALIAS_OFFSET,piowc // Address of WRITE_STATUS alias register |
43 | ;; | 46 | mov scr1=7;; // Clear DEADLOCK, WRITE_ERROR, MULTI_WRITE_ERROR |
44 | ld8.acq scr1=[scr2];; | 47 | (p8) st8.rel [scr2]=scr1;; |
48 | (p9) ld8.acq scr1=[scr2];; | ||
45 | 49 | ||
46 | 5: ld8.acq scr1=[piowc];; // Wait for PIOs to complete. | 50 | 5: ld8.acq scr1=[piowc];; // Wait for PIOs to complete. |
47 | hint @pause | 51 | hint @pause |
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c index 5d54f5f4e926..471bbaa65d1b 100644 --- a/arch/ia64/sn/kernel/sn2/sn2_smp.c +++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c | |||
@@ -202,7 +202,7 @@ sn2_global_tlb_purge(struct mm_struct *mm, unsigned long start, | |||
202 | unsigned long end, unsigned long nbits) | 202 | unsigned long end, unsigned long nbits) |
203 | { | 203 | { |
204 | int i, opt, shub1, cnode, mynasid, cpu, lcpu = 0, nasid, flushed = 0; | 204 | int i, opt, shub1, cnode, mynasid, cpu, lcpu = 0, nasid, flushed = 0; |
205 | int mymm = (mm == current->active_mm); | 205 | int mymm = (mm == current->active_mm && current->mm); |
206 | volatile unsigned long *ptc0, *ptc1; | 206 | volatile unsigned long *ptc0, *ptc1; |
207 | unsigned long itc, itc2, flags, data0 = 0, data1 = 0, rr_value; | 207 | unsigned long itc, itc2, flags, data0 = 0, data1 = 0, rr_value; |
208 | short nasids[MAX_NUMNODES], nix; | 208 | short nasids[MAX_NUMNODES], nix; |
diff --git a/arch/ia64/sn/pci/pcibr/pcibr_reg.c b/arch/ia64/sn/pci/pcibr/pcibr_reg.c index 5d534091262c..79fdb91d7259 100644 --- a/arch/ia64/sn/pci/pcibr/pcibr_reg.c +++ b/arch/ia64/sn/pci/pcibr/pcibr_reg.c | |||
@@ -25,7 +25,7 @@ union br_ptr { | |||
25 | */ | 25 | */ |
26 | void pcireg_control_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits) | 26 | void pcireg_control_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits) |
27 | { | 27 | { |
28 | union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base; | 28 | union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; |
29 | 29 | ||
30 | if (pcibus_info) { | 30 | if (pcibus_info) { |
31 | switch (pcibus_info->pbi_bridge_type) { | 31 | switch (pcibus_info->pbi_bridge_type) { |
@@ -38,14 +38,14 @@ void pcireg_control_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits) | |||
38 | default: | 38 | default: |
39 | panic | 39 | panic |
40 | ("pcireg_control_bit_clr: unknown bridgetype bridge 0x%p", | 40 | ("pcireg_control_bit_clr: unknown bridgetype bridge 0x%p", |
41 | (void *)ptr); | 41 | ptr); |
42 | } | 42 | } |
43 | } | 43 | } |
44 | } | 44 | } |
45 | 45 | ||
46 | void pcireg_control_bit_set(struct pcibus_info *pcibus_info, uint64_t bits) | 46 | void pcireg_control_bit_set(struct pcibus_info *pcibus_info, uint64_t bits) |
47 | { | 47 | { |
48 | union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base; | 48 | union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; |
49 | 49 | ||
50 | if (pcibus_info) { | 50 | if (pcibus_info) { |
51 | switch (pcibus_info->pbi_bridge_type) { | 51 | switch (pcibus_info->pbi_bridge_type) { |
@@ -58,7 +58,7 @@ void pcireg_control_bit_set(struct pcibus_info *pcibus_info, uint64_t bits) | |||
58 | default: | 58 | default: |
59 | panic | 59 | panic |
60 | ("pcireg_control_bit_set: unknown bridgetype bridge 0x%p", | 60 | ("pcireg_control_bit_set: unknown bridgetype bridge 0x%p", |
61 | (void *)ptr); | 61 | ptr); |
62 | } | 62 | } |
63 | } | 63 | } |
64 | } | 64 | } |
@@ -68,7 +68,7 @@ void pcireg_control_bit_set(struct pcibus_info *pcibus_info, uint64_t bits) | |||
68 | */ | 68 | */ |
69 | uint64_t pcireg_tflush_get(struct pcibus_info *pcibus_info) | 69 | uint64_t pcireg_tflush_get(struct pcibus_info *pcibus_info) |
70 | { | 70 | { |
71 | union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base; | 71 | union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; |
72 | uint64_t ret = 0; | 72 | uint64_t ret = 0; |
73 | 73 | ||
74 | if (pcibus_info) { | 74 | if (pcibus_info) { |
@@ -82,7 +82,7 @@ uint64_t pcireg_tflush_get(struct pcibus_info *pcibus_info) | |||
82 | default: | 82 | default: |
83 | panic | 83 | panic |
84 | ("pcireg_tflush_get: unknown bridgetype bridge 0x%p", | 84 | ("pcireg_tflush_get: unknown bridgetype bridge 0x%p", |
85 | (void *)ptr); | 85 | ptr); |
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||
@@ -98,7 +98,7 @@ uint64_t pcireg_tflush_get(struct pcibus_info *pcibus_info) | |||
98 | */ | 98 | */ |
99 | uint64_t pcireg_intr_status_get(struct pcibus_info * pcibus_info) | 99 | uint64_t pcireg_intr_status_get(struct pcibus_info * pcibus_info) |
100 | { | 100 | { |
101 | union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base; | 101 | union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; |
102 | uint64_t ret = 0; | 102 | uint64_t ret = 0; |
103 | 103 | ||
104 | if (pcibus_info) { | 104 | if (pcibus_info) { |
@@ -112,7 +112,7 @@ uint64_t pcireg_intr_status_get(struct pcibus_info * pcibus_info) | |||
112 | default: | 112 | default: |
113 | panic | 113 | panic |
114 | ("pcireg_intr_status_get: unknown bridgetype bridge 0x%p", | 114 | ("pcireg_intr_status_get: unknown bridgetype bridge 0x%p", |
115 | (void *)ptr); | 115 | ptr); |
116 | } | 116 | } |
117 | } | 117 | } |
118 | return ret; | 118 | return ret; |
@@ -123,7 +123,7 @@ uint64_t pcireg_intr_status_get(struct pcibus_info * pcibus_info) | |||
123 | */ | 123 | */ |
124 | void pcireg_intr_enable_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits) | 124 | void pcireg_intr_enable_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits) |
125 | { | 125 | { |
126 | union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base; | 126 | union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; |
127 | 127 | ||
128 | if (pcibus_info) { | 128 | if (pcibus_info) { |
129 | switch (pcibus_info->pbi_bridge_type) { | 129 | switch (pcibus_info->pbi_bridge_type) { |
@@ -136,14 +136,14 @@ void pcireg_intr_enable_bit_clr(struct pcibus_info *pcibus_info, uint64_t bits) | |||
136 | default: | 136 | default: |
137 | panic | 137 | panic |
138 | ("pcireg_intr_enable_bit_clr: unknown bridgetype bridge 0x%p", | 138 | ("pcireg_intr_enable_bit_clr: unknown bridgetype bridge 0x%p", |
139 | (void *)ptr); | 139 | ptr); |
140 | } | 140 | } |
141 | } | 141 | } |
142 | } | 142 | } |
143 | 143 | ||
144 | void pcireg_intr_enable_bit_set(struct pcibus_info *pcibus_info, uint64_t bits) | 144 | void pcireg_intr_enable_bit_set(struct pcibus_info *pcibus_info, uint64_t bits) |
145 | { | 145 | { |
146 | union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base; | 146 | union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; |
147 | 147 | ||
148 | if (pcibus_info) { | 148 | if (pcibus_info) { |
149 | switch (pcibus_info->pbi_bridge_type) { | 149 | switch (pcibus_info->pbi_bridge_type) { |
@@ -156,7 +156,7 @@ void pcireg_intr_enable_bit_set(struct pcibus_info *pcibus_info, uint64_t bits) | |||
156 | default: | 156 | default: |
157 | panic | 157 | panic |
158 | ("pcireg_intr_enable_bit_set: unknown bridgetype bridge 0x%p", | 158 | ("pcireg_intr_enable_bit_set: unknown bridgetype bridge 0x%p", |
159 | (void *)ptr); | 159 | ptr); |
160 | } | 160 | } |
161 | } | 161 | } |
162 | } | 162 | } |
@@ -167,7 +167,7 @@ void pcireg_intr_enable_bit_set(struct pcibus_info *pcibus_info, uint64_t bits) | |||
167 | void pcireg_intr_addr_addr_set(struct pcibus_info *pcibus_info, int int_n, | 167 | void pcireg_intr_addr_addr_set(struct pcibus_info *pcibus_info, int int_n, |
168 | uint64_t addr) | 168 | uint64_t addr) |
169 | { | 169 | { |
170 | union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base; | 170 | union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; |
171 | 171 | ||
172 | if (pcibus_info) { | 172 | if (pcibus_info) { |
173 | switch (pcibus_info->pbi_bridge_type) { | 173 | switch (pcibus_info->pbi_bridge_type) { |
@@ -186,7 +186,7 @@ void pcireg_intr_addr_addr_set(struct pcibus_info *pcibus_info, int int_n, | |||
186 | default: | 186 | default: |
187 | panic | 187 | panic |
188 | ("pcireg_intr_addr_addr_get: unknown bridgetype bridge 0x%p", | 188 | ("pcireg_intr_addr_addr_get: unknown bridgetype bridge 0x%p", |
189 | (void *)ptr); | 189 | ptr); |
190 | } | 190 | } |
191 | } | 191 | } |
192 | } | 192 | } |
@@ -196,7 +196,7 @@ void pcireg_intr_addr_addr_set(struct pcibus_info *pcibus_info, int int_n, | |||
196 | */ | 196 | */ |
197 | void pcireg_force_intr_set(struct pcibus_info *pcibus_info, int int_n) | 197 | void pcireg_force_intr_set(struct pcibus_info *pcibus_info, int int_n) |
198 | { | 198 | { |
199 | union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base; | 199 | union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; |
200 | 200 | ||
201 | if (pcibus_info) { | 201 | if (pcibus_info) { |
202 | switch (pcibus_info->pbi_bridge_type) { | 202 | switch (pcibus_info->pbi_bridge_type) { |
@@ -209,7 +209,7 @@ void pcireg_force_intr_set(struct pcibus_info *pcibus_info, int int_n) | |||
209 | default: | 209 | default: |
210 | panic | 210 | panic |
211 | ("pcireg_force_intr_set: unknown bridgetype bridge 0x%p", | 211 | ("pcireg_force_intr_set: unknown bridgetype bridge 0x%p", |
212 | (void *)ptr); | 212 | ptr); |
213 | } | 213 | } |
214 | } | 214 | } |
215 | } | 215 | } |
@@ -219,7 +219,7 @@ void pcireg_force_intr_set(struct pcibus_info *pcibus_info, int int_n) | |||
219 | */ | 219 | */ |
220 | uint64_t pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device) | 220 | uint64_t pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device) |
221 | { | 221 | { |
222 | union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base; | 222 | union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; |
223 | uint64_t ret = 0; | 223 | uint64_t ret = 0; |
224 | 224 | ||
225 | if (pcibus_info) { | 225 | if (pcibus_info) { |
@@ -233,7 +233,7 @@ uint64_t pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device) | |||
233 | __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]); | 233 | __sn_readq_relaxed(&ptr->pic.p_wr_req_buf[device]); |
234 | break; | 234 | break; |
235 | default: | 235 | default: |
236 | panic("pcireg_wrb_flush_get: unknown bridgetype bridge 0x%p", (void *)ptr); | 236 | panic("pcireg_wrb_flush_get: unknown bridgetype bridge 0x%p", ptr); |
237 | } | 237 | } |
238 | 238 | ||
239 | } | 239 | } |
@@ -244,7 +244,7 @@ uint64_t pcireg_wrb_flush_get(struct pcibus_info *pcibus_info, int device) | |||
244 | void pcireg_int_ate_set(struct pcibus_info *pcibus_info, int ate_index, | 244 | void pcireg_int_ate_set(struct pcibus_info *pcibus_info, int ate_index, |
245 | uint64_t val) | 245 | uint64_t val) |
246 | { | 246 | { |
247 | union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base; | 247 | union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; |
248 | 248 | ||
249 | if (pcibus_info) { | 249 | if (pcibus_info) { |
250 | switch (pcibus_info->pbi_bridge_type) { | 250 | switch (pcibus_info->pbi_bridge_type) { |
@@ -257,15 +257,15 @@ void pcireg_int_ate_set(struct pcibus_info *pcibus_info, int ate_index, | |||
257 | default: | 257 | default: |
258 | panic | 258 | panic |
259 | ("pcireg_int_ate_set: unknown bridgetype bridge 0x%p", | 259 | ("pcireg_int_ate_set: unknown bridgetype bridge 0x%p", |
260 | (void *)ptr); | 260 | ptr); |
261 | } | 261 | } |
262 | } | 262 | } |
263 | } | 263 | } |
264 | 264 | ||
265 | uint64_t *pcireg_int_ate_addr(struct pcibus_info *pcibus_info, int ate_index) | 265 | uint64_t __iomem *pcireg_int_ate_addr(struct pcibus_info *pcibus_info, int ate_index) |
266 | { | 266 | { |
267 | union br_ptr *ptr = (union br_ptr *)pcibus_info->pbi_buscommon.bs_base; | 267 | union br_ptr __iomem *ptr = (union br_ptr __iomem *)pcibus_info->pbi_buscommon.bs_base; |
268 | uint64_t *ret = (uint64_t *) 0; | 268 | uint64_t __iomem *ret = NULL; |
269 | 269 | ||
270 | if (pcibus_info) { | 270 | if (pcibus_info) { |
271 | switch (pcibus_info->pbi_bridge_type) { | 271 | switch (pcibus_info->pbi_bridge_type) { |
@@ -278,7 +278,7 @@ uint64_t *pcireg_int_ate_addr(struct pcibus_info *pcibus_info, int ate_index) | |||
278 | default: | 278 | default: |
279 | panic | 279 | panic |
280 | ("pcireg_int_ate_addr: unknown bridgetype bridge 0x%p", | 280 | ("pcireg_int_ate_addr: unknown bridgetype bridge 0x%p", |
281 | (void *)ptr); | 281 | ptr); |
282 | } | 282 | } |
283 | } | 283 | } |
284 | return ret; | 284 | return ret; |
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index 46b646a6d345..27aa1842dacc 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c | |||
@@ -38,10 +38,10 @@ tioca_gart_init(struct tioca_kernel *tioca_kern) | |||
38 | uint64_t offset; | 38 | uint64_t offset; |
39 | struct page *tmp; | 39 | struct page *tmp; |
40 | struct tioca_common *tioca_common; | 40 | struct tioca_common *tioca_common; |
41 | struct tioca *ca_base; | 41 | struct tioca __iomem *ca_base; |
42 | 42 | ||
43 | tioca_common = tioca_kern->ca_common; | 43 | tioca_common = tioca_kern->ca_common; |
44 | ca_base = (struct tioca *)tioca_common->ca_common.bs_base; | 44 | ca_base = (struct tioca __iomem *)tioca_common->ca_common.bs_base; |
45 | 45 | ||
46 | if (list_empty(tioca_kern->ca_devices)) | 46 | if (list_empty(tioca_kern->ca_devices)) |
47 | return 0; | 47 | return 0; |
@@ -215,7 +215,7 @@ tioca_fastwrite_enable(struct tioca_kernel *tioca_kern) | |||
215 | { | 215 | { |
216 | int cap_ptr; | 216 | int cap_ptr; |
217 | uint32_t reg; | 217 | uint32_t reg; |
218 | struct tioca *tioca_base; | 218 | struct tioca __iomem *tioca_base; |
219 | struct pci_dev *pdev; | 219 | struct pci_dev *pdev; |
220 | struct tioca_common *common; | 220 | struct tioca_common *common; |
221 | 221 | ||
@@ -257,7 +257,7 @@ tioca_fastwrite_enable(struct tioca_kernel *tioca_kern) | |||
257 | * Set ca's fw to match | 257 | * Set ca's fw to match |
258 | */ | 258 | */ |
259 | 259 | ||
260 | tioca_base = (struct tioca *)common->ca_common.bs_base; | 260 | tioca_base = (struct tioca __iomem*)common->ca_common.bs_base; |
261 | __sn_setq_relaxed(&tioca_base->ca_control1, CA_AGP_FW_ENABLE); | 261 | __sn_setq_relaxed(&tioca_base->ca_control1, CA_AGP_FW_ENABLE); |
262 | } | 262 | } |
263 | 263 | ||
@@ -322,7 +322,7 @@ static uint64_t | |||
322 | tioca_dma_d48(struct pci_dev *pdev, uint64_t paddr) | 322 | tioca_dma_d48(struct pci_dev *pdev, uint64_t paddr) |
323 | { | 323 | { |
324 | struct tioca_common *tioca_common; | 324 | struct tioca_common *tioca_common; |
325 | struct tioca *ca_base; | 325 | struct tioca __iomem *ca_base; |
326 | uint64_t ct_addr; | 326 | uint64_t ct_addr; |
327 | dma_addr_t bus_addr; | 327 | dma_addr_t bus_addr; |
328 | uint32_t node_upper; | 328 | uint32_t node_upper; |
@@ -330,7 +330,7 @@ tioca_dma_d48(struct pci_dev *pdev, uint64_t paddr) | |||
330 | struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(pdev); | 330 | struct pcidev_info *pcidev_info = SN_PCIDEV_INFO(pdev); |
331 | 331 | ||
332 | tioca_common = (struct tioca_common *)pcidev_info->pdi_pcibus_info; | 332 | tioca_common = (struct tioca_common *)pcidev_info->pdi_pcibus_info; |
333 | ca_base = (struct tioca *)tioca_common->ca_common.bs_base; | 333 | ca_base = (struct tioca __iomem *)tioca_common->ca_common.bs_base; |
334 | 334 | ||
335 | ct_addr = PHYS_TO_TIODMA(paddr); | 335 | ct_addr = PHYS_TO_TIODMA(paddr); |
336 | if (!ct_addr) | 336 | if (!ct_addr) |
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 3a49036e0ae8..4ee91c9a556f 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
@@ -67,8 +67,8 @@ unsigned long setup_zero_pages(void) | |||
67 | 67 | ||
68 | page = virt_to_page(empty_zero_page); | 68 | page = virt_to_page(empty_zero_page); |
69 | while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) { | 69 | while (page < virt_to_page(empty_zero_page + (PAGE_SIZE << order))) { |
70 | set_bit(PG_reserved, &page->flags); | 70 | SetPageReserved(page); |
71 | reset_page_mapcount(page); | 71 | set_page_count(page, 1); |
72 | page++; | 72 | page++; |
73 | } | 73 | } |
74 | 74 | ||
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index bb2efdd566a9..db93dbc0e21a 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
@@ -227,7 +227,7 @@ config SMP | |||
227 | If you don't know what to do here, say N. | 227 | If you don't know what to do here, say N. |
228 | 228 | ||
229 | config NR_CPUS | 229 | config NR_CPUS |
230 | int "Maximum number of CPUs (2-32)" | 230 | int "Maximum number of CPUs (2-128)" |
231 | range 2 128 | 231 | range 2 128 |
232 | depends on SMP | 232 | depends on SMP |
233 | default "32" if PPC64 | 233 | default "32" if PPC64 |
diff --git a/arch/powerpc/configs/cell_defconfig b/arch/powerpc/configs/cell_defconfig index 4b433411b9e3..b657f7e44762 100644 --- a/arch/powerpc/configs/cell_defconfig +++ b/arch/powerpc/configs/cell_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc5 |
4 | # Tue Nov 15 14:36:20 2005 | 4 | # Tue Dec 20 15:59:26 2005 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -53,6 +53,7 @@ CONFIG_KOBJECT_UEVENT=y | |||
53 | # CONFIG_IKCONFIG is not set | 53 | # CONFIG_IKCONFIG is not set |
54 | # CONFIG_CPUSETS is not set | 54 | # CONFIG_CPUSETS is not set |
55 | CONFIG_INITRAMFS_SOURCE="" | 55 | CONFIG_INITRAMFS_SOURCE="" |
56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
56 | # CONFIG_EMBEDDED is not set | 57 | # CONFIG_EMBEDDED is not set |
57 | CONFIG_KALLSYMS=y | 58 | CONFIG_KALLSYMS=y |
58 | # CONFIG_KALLSYMS_ALL is not set | 59 | # CONFIG_KALLSYMS_ALL is not set |
@@ -151,7 +152,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
151 | CONFIG_FLATMEM=y | 152 | CONFIG_FLATMEM=y |
152 | CONFIG_FLAT_NODE_MEM_MAP=y | 153 | CONFIG_FLAT_NODE_MEM_MAP=y |
153 | # CONFIG_SPARSEMEM_STATIC is not set | 154 | # CONFIG_SPARSEMEM_STATIC is not set |
154 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 155 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
155 | # CONFIG_PPC_64K_PAGES is not set | 156 | # CONFIG_PPC_64K_PAGES is not set |
156 | CONFIG_SCHED_SMT=y | 157 | CONFIG_SCHED_SMT=y |
157 | CONFIG_PROC_DEVICETREE=y | 158 | CONFIG_PROC_DEVICETREE=y |
diff --git a/arch/powerpc/configs/g5_defconfig b/arch/powerpc/configs/g5_defconfig index e7c23e3902b8..3c22ccb18519 100644 --- a/arch/powerpc/configs/g5_defconfig +++ b/arch/powerpc/configs/g5_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc5 |
4 | # Tue Nov 15 14:39:20 2005 | 4 | # Tue Dec 20 15:59:30 2005 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -53,6 +53,7 @@ CONFIG_IKCONFIG=y | |||
53 | CONFIG_IKCONFIG_PROC=y | 53 | CONFIG_IKCONFIG_PROC=y |
54 | # CONFIG_CPUSETS is not set | 54 | # CONFIG_CPUSETS is not set |
55 | CONFIG_INITRAMFS_SOURCE="" | 55 | CONFIG_INITRAMFS_SOURCE="" |
56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
56 | # CONFIG_EMBEDDED is not set | 57 | # CONFIG_EMBEDDED is not set |
57 | CONFIG_KALLSYMS=y | 58 | CONFIG_KALLSYMS=y |
58 | # CONFIG_KALLSYMS_ALL is not set | 59 | # CONFIG_KALLSYMS_ALL is not set |
@@ -162,7 +163,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
162 | CONFIG_FLATMEM=y | 163 | CONFIG_FLATMEM=y |
163 | CONFIG_FLAT_NODE_MEM_MAP=y | 164 | CONFIG_FLAT_NODE_MEM_MAP=y |
164 | # CONFIG_SPARSEMEM_STATIC is not set | 165 | # CONFIG_SPARSEMEM_STATIC is not set |
165 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 166 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
166 | # CONFIG_PPC_64K_PAGES is not set | 167 | # CONFIG_PPC_64K_PAGES is not set |
167 | # CONFIG_SCHED_SMT is not set | 168 | # CONFIG_SCHED_SMT is not set |
168 | CONFIG_PROC_DEVICETREE=y | 169 | CONFIG_PROC_DEVICETREE=y |
@@ -1203,6 +1204,7 @@ CONFIG_USB_MON=y | |||
1203 | CONFIG_USB_SERIAL=m | 1204 | CONFIG_USB_SERIAL=m |
1204 | CONFIG_USB_SERIAL_GENERIC=y | 1205 | CONFIG_USB_SERIAL_GENERIC=y |
1205 | # CONFIG_USB_SERIAL_AIRPRIME is not set | 1206 | # CONFIG_USB_SERIAL_AIRPRIME is not set |
1207 | # CONFIG_USB_SERIAL_ANYDATA is not set | ||
1206 | CONFIG_USB_SERIAL_BELKIN=m | 1208 | CONFIG_USB_SERIAL_BELKIN=m |
1207 | CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m | 1209 | CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m |
1208 | # CONFIG_USB_SERIAL_CP2101 is not set | 1210 | # CONFIG_USB_SERIAL_CP2101 is not set |
@@ -1233,7 +1235,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
1233 | CONFIG_USB_SERIAL_KLSI=m | 1235 | CONFIG_USB_SERIAL_KLSI=m |
1234 | CONFIG_USB_SERIAL_KOBIL_SCT=m | 1236 | CONFIG_USB_SERIAL_KOBIL_SCT=m |
1235 | CONFIG_USB_SERIAL_MCT_U232=m | 1237 | CONFIG_USB_SERIAL_MCT_U232=m |
1236 | # CONFIG_USB_SERIAL_NOKIA_DKU2 is not set | ||
1237 | CONFIG_USB_SERIAL_PL2303=m | 1238 | CONFIG_USB_SERIAL_PL2303=m |
1238 | # CONFIG_USB_SERIAL_HP4X is not set | 1239 | # CONFIG_USB_SERIAL_HP4X is not set |
1239 | CONFIG_USB_SERIAL_SAFE=m | 1240 | CONFIG_USB_SERIAL_SAFE=m |
diff --git a/arch/powerpc/configs/iseries_defconfig b/arch/powerpc/configs/iseries_defconfig index 5d0866707a75..751a622fb7a7 100644 --- a/arch/powerpc/configs/iseries_defconfig +++ b/arch/powerpc/configs/iseries_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc5 |
4 | # Tue Nov 15 14:38:09 2005 | 4 | # Tue Dec 20 15:59:32 2005 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -55,6 +55,7 @@ CONFIG_IKCONFIG=y | |||
55 | CONFIG_IKCONFIG_PROC=y | 55 | CONFIG_IKCONFIG_PROC=y |
56 | # CONFIG_CPUSETS is not set | 56 | # CONFIG_CPUSETS is not set |
57 | CONFIG_INITRAMFS_SOURCE="" | 57 | CONFIG_INITRAMFS_SOURCE="" |
58 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
58 | # CONFIG_EMBEDDED is not set | 59 | # CONFIG_EMBEDDED is not set |
59 | CONFIG_KALLSYMS=y | 60 | CONFIG_KALLSYMS=y |
60 | # CONFIG_KALLSYMS_ALL is not set | 61 | # CONFIG_KALLSYMS_ALL is not set |
@@ -144,7 +145,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
144 | CONFIG_FLATMEM=y | 145 | CONFIG_FLATMEM=y |
145 | CONFIG_FLAT_NODE_MEM_MAP=y | 146 | CONFIG_FLAT_NODE_MEM_MAP=y |
146 | # CONFIG_SPARSEMEM_STATIC is not set | 147 | # CONFIG_SPARSEMEM_STATIC is not set |
147 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 148 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
148 | # CONFIG_PPC_64K_PAGES is not set | 149 | # CONFIG_PPC_64K_PAGES is not set |
149 | # CONFIG_SCHED_SMT is not set | 150 | # CONFIG_SCHED_SMT is not set |
150 | CONFIG_PROC_DEVICETREE=y | 151 | CONFIG_PROC_DEVICETREE=y |
diff --git a/arch/powerpc/configs/maple_defconfig b/arch/powerpc/configs/maple_defconfig index 92e42613ef06..07b6d3d23360 100644 --- a/arch/powerpc/configs/maple_defconfig +++ b/arch/powerpc/configs/maple_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc5 |
4 | # Tue Nov 15 14:38:58 2005 | 4 | # Tue Dec 20 15:59:36 2005 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -53,6 +53,7 @@ CONFIG_IKCONFIG=y | |||
53 | CONFIG_IKCONFIG_PROC=y | 53 | CONFIG_IKCONFIG_PROC=y |
54 | # CONFIG_CPUSETS is not set | 54 | # CONFIG_CPUSETS is not set |
55 | CONFIG_INITRAMFS_SOURCE="" | 55 | CONFIG_INITRAMFS_SOURCE="" |
56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
56 | # CONFIG_EMBEDDED is not set | 57 | # CONFIG_EMBEDDED is not set |
57 | CONFIG_KALLSYMS=y | 58 | CONFIG_KALLSYMS=y |
58 | CONFIG_KALLSYMS_ALL=y | 59 | CONFIG_KALLSYMS_ALL=y |
@@ -149,7 +150,7 @@ CONFIG_FLATMEM_MANUAL=y | |||
149 | CONFIG_FLATMEM=y | 150 | CONFIG_FLATMEM=y |
150 | CONFIG_FLAT_NODE_MEM_MAP=y | 151 | CONFIG_FLAT_NODE_MEM_MAP=y |
151 | # CONFIG_SPARSEMEM_STATIC is not set | 152 | # CONFIG_SPARSEMEM_STATIC is not set |
152 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 153 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
153 | # CONFIG_PPC_64K_PAGES is not set | 154 | # CONFIG_PPC_64K_PAGES is not set |
154 | # CONFIG_SCHED_SMT is not set | 155 | # CONFIG_SCHED_SMT is not set |
155 | CONFIG_PROC_DEVICETREE=y | 156 | CONFIG_PROC_DEVICETREE=y |
@@ -242,7 +243,6 @@ CONFIG_TCP_CONG_BIC=y | |||
242 | # QoS and/or fair queueing | 243 | # QoS and/or fair queueing |
243 | # | 244 | # |
244 | # CONFIG_NET_SCHED is not set | 245 | # CONFIG_NET_SCHED is not set |
245 | # CONFIG_NET_CLS_ROUTE is not set | ||
246 | 246 | ||
247 | # | 247 | # |
248 | # Network testing | 248 | # Network testing |
@@ -794,6 +794,7 @@ CONFIG_USB_SERIAL=y | |||
794 | # CONFIG_USB_SERIAL_CONSOLE is not set | 794 | # CONFIG_USB_SERIAL_CONSOLE is not set |
795 | CONFIG_USB_SERIAL_GENERIC=y | 795 | CONFIG_USB_SERIAL_GENERIC=y |
796 | # CONFIG_USB_SERIAL_AIRPRIME is not set | 796 | # CONFIG_USB_SERIAL_AIRPRIME is not set |
797 | # CONFIG_USB_SERIAL_ANYDATA is not set | ||
797 | # CONFIG_USB_SERIAL_BELKIN is not set | 798 | # CONFIG_USB_SERIAL_BELKIN is not set |
798 | # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set | 799 | # CONFIG_USB_SERIAL_DIGI_ACCELEPORT is not set |
799 | # CONFIG_USB_SERIAL_CP2101 is not set | 800 | # CONFIG_USB_SERIAL_CP2101 is not set |
@@ -824,7 +825,6 @@ CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y | |||
824 | # CONFIG_USB_SERIAL_KLSI is not set | 825 | # CONFIG_USB_SERIAL_KLSI is not set |
825 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set | 826 | # CONFIG_USB_SERIAL_KOBIL_SCT is not set |
826 | # CONFIG_USB_SERIAL_MCT_U232 is not set | 827 | # CONFIG_USB_SERIAL_MCT_U232 is not set |
827 | # CONFIG_USB_SERIAL_NOKIA_DKU2 is not set | ||
828 | # CONFIG_USB_SERIAL_PL2303 is not set | 828 | # CONFIG_USB_SERIAL_PL2303 is not set |
829 | # CONFIG_USB_SERIAL_HP4X is not set | 829 | # CONFIG_USB_SERIAL_HP4X is not set |
830 | # CONFIG_USB_SERIAL_SAFE is not set | 830 | # CONFIG_USB_SERIAL_SAFE is not set |
diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/ppc64_defconfig index b5ba3bbd96fb..509399eab6f5 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc5 |
4 | # Fri Nov 18 16:23:24 2005 | 4 | # Tue Dec 20 15:59:38 2005 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -54,6 +54,7 @@ CONFIG_IKCONFIG=y | |||
54 | CONFIG_IKCONFIG_PROC=y | 54 | CONFIG_IKCONFIG_PROC=y |
55 | CONFIG_CPUSETS=y | 55 | CONFIG_CPUSETS=y |
56 | CONFIG_INITRAMFS_SOURCE="" | 56 | CONFIG_INITRAMFS_SOURCE="" |
57 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
57 | # CONFIG_EMBEDDED is not set | 58 | # CONFIG_EMBEDDED is not set |
58 | CONFIG_KALLSYMS=y | 59 | CONFIG_KALLSYMS=y |
59 | CONFIG_KALLSYMS_ALL=y | 60 | CONFIG_KALLSYMS_ALL=y |
@@ -176,7 +177,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y | |||
176 | # CONFIG_SPARSEMEM_STATIC is not set | 177 | # CONFIG_SPARSEMEM_STATIC is not set |
177 | CONFIG_SPARSEMEM_EXTREME=y | 178 | CONFIG_SPARSEMEM_EXTREME=y |
178 | # CONFIG_MEMORY_HOTPLUG is not set | 179 | # CONFIG_MEMORY_HOTPLUG is not set |
179 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 180 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
180 | # CONFIG_PPC_64K_PAGES is not set | 181 | # CONFIG_PPC_64K_PAGES is not set |
181 | # CONFIG_SCHED_SMT is not set | 182 | # CONFIG_SCHED_SMT is not set |
182 | CONFIG_PROC_DEVICETREE=y | 183 | CONFIG_PROC_DEVICETREE=y |
diff --git a/arch/powerpc/configs/pseries_defconfig b/arch/powerpc/configs/pseries_defconfig index b589b196eb3f..a50ce0fa9243 100644 --- a/arch/powerpc/configs/pseries_defconfig +++ b/arch/powerpc/configs/pseries_defconfig | |||
@@ -1,7 +1,7 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.15-rc1 | 3 | # Linux kernel version: 2.6.15-rc5 |
4 | # Tue Nov 15 14:36:55 2005 | 4 | # Tue Dec 20 15:59:40 2005 |
5 | # | 5 | # |
6 | CONFIG_PPC64=y | 6 | CONFIG_PPC64=y |
7 | CONFIG_64BIT=y | 7 | CONFIG_64BIT=y |
@@ -55,6 +55,7 @@ CONFIG_IKCONFIG=y | |||
55 | CONFIG_IKCONFIG_PROC=y | 55 | CONFIG_IKCONFIG_PROC=y |
56 | CONFIG_CPUSETS=y | 56 | CONFIG_CPUSETS=y |
57 | CONFIG_INITRAMFS_SOURCE="" | 57 | CONFIG_INITRAMFS_SOURCE="" |
58 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | ||
58 | # CONFIG_EMBEDDED is not set | 59 | # CONFIG_EMBEDDED is not set |
59 | CONFIG_KALLSYMS=y | 60 | CONFIG_KALLSYMS=y |
60 | CONFIG_KALLSYMS_ALL=y | 61 | CONFIG_KALLSYMS_ALL=y |
@@ -163,7 +164,7 @@ CONFIG_HAVE_MEMORY_PRESENT=y | |||
163 | # CONFIG_SPARSEMEM_STATIC is not set | 164 | # CONFIG_SPARSEMEM_STATIC is not set |
164 | CONFIG_SPARSEMEM_EXTREME=y | 165 | CONFIG_SPARSEMEM_EXTREME=y |
165 | # CONFIG_MEMORY_HOTPLUG is not set | 166 | # CONFIG_MEMORY_HOTPLUG is not set |
166 | CONFIG_SPLIT_PTLOCK_CPUS=4096 | 167 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
167 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 168 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y |
168 | # CONFIG_PPC_64K_PAGES is not set | 169 | # CONFIG_PPC_64K_PAGES is not set |
169 | CONFIG_SCHED_SMT=y | 170 | CONFIG_SCHED_SMT=y |
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 2d22bf03484e..bce33a38399f 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
@@ -183,8 +183,8 @@ syscall_exit_trace_cont: | |||
183 | ld r13,GPR13(r1) /* returning to usermode */ | 183 | ld r13,GPR13(r1) /* returning to usermode */ |
184 | 1: ld r2,GPR2(r1) | 184 | 1: ld r2,GPR2(r1) |
185 | li r12,MSR_RI | 185 | li r12,MSR_RI |
186 | andc r10,r10,r12 | 186 | andc r11,r10,r12 |
187 | mtmsrd r10,1 /* clear MSR.RI */ | 187 | mtmsrd r11,1 /* clear MSR.RI */ |
188 | ld r1,GPR1(r1) | 188 | ld r1,GPR1(r1) |
189 | mtlr r4 | 189 | mtlr r4 |
190 | mtcr r5 | 190 | mtcr r5 |
diff --git a/arch/powerpc/kernel/kprobes.c b/arch/powerpc/kernel/kprobes.c index 511af54e6230..5368f9c2e6bf 100644 --- a/arch/powerpc/kernel/kprobes.c +++ b/arch/powerpc/kernel/kprobes.c | |||
@@ -177,7 +177,7 @@ static inline int kprobe_handler(struct pt_regs *regs) | |||
177 | save_previous_kprobe(kcb); | 177 | save_previous_kprobe(kcb); |
178 | set_current_kprobe(p, regs, kcb); | 178 | set_current_kprobe(p, regs, kcb); |
179 | kcb->kprobe_saved_msr = regs->msr; | 179 | kcb->kprobe_saved_msr = regs->msr; |
180 | p->nmissed++; | 180 | kprobes_inc_nmissed_count(p); |
181 | prepare_singlestep(p, regs); | 181 | prepare_singlestep(p, regs); |
182 | kcb->kprobe_status = KPROBE_REENTER; | 182 | kcb->kprobe_status = KPROBE_REENTER; |
183 | return 1; | 183 | return 1; |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 608fee7c7e20..e3fb78397dc6 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
@@ -102,7 +102,15 @@ int boot_cpuid_phys = 0; | |||
102 | dev_t boot_dev; | 102 | dev_t boot_dev; |
103 | u64 ppc64_pft_size; | 103 | u64 ppc64_pft_size; |
104 | 104 | ||
105 | struct ppc64_caches ppc64_caches; | 105 | /* Pick defaults since we might want to patch instructions |
106 | * before we've read this from the device tree. | ||
107 | */ | ||
108 | struct ppc64_caches ppc64_caches = { | ||
109 | .dline_size = 0x80, | ||
110 | .log_dline_size = 7, | ||
111 | .iline_size = 0x80, | ||
112 | .log_iline_size = 7 | ||
113 | }; | ||
106 | EXPORT_SYMBOL_GPL(ppc64_caches); | 114 | EXPORT_SYMBOL_GPL(ppc64_caches); |
107 | 115 | ||
108 | /* | 116 | /* |
diff --git a/arch/powerpc/kernel/syscalls.c b/arch/powerpc/kernel/syscalls.c index f72ced11212d..91b93d917b64 100644 --- a/arch/powerpc/kernel/syscalls.c +++ b/arch/powerpc/kernel/syscalls.c | |||
@@ -247,7 +247,7 @@ long ppc64_personality(unsigned long personality) | |||
247 | #define OVERRIDE_MACHINE 0 | 247 | #define OVERRIDE_MACHINE 0 |
248 | #endif | 248 | #endif |
249 | 249 | ||
250 | static inline int override_machine(char *mach) | 250 | static inline int override_machine(char __user *mach) |
251 | { | 251 | { |
252 | if (OVERRIDE_MACHINE) { | 252 | if (OVERRIDE_MACHINE) { |
253 | /* change ppc64 to ppc */ | 253 | /* change ppc64 to ppc */ |
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 706e8a63ced9..a33583f3b0e7 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
@@ -601,7 +601,7 @@ int hash_page(unsigned long ea, unsigned long access, unsigned long trap) | |||
601 | /* Handle hugepage regions */ | 601 | /* Handle hugepage regions */ |
602 | if (unlikely(in_hugepage_area(mm->context, ea))) { | 602 | if (unlikely(in_hugepage_area(mm->context, ea))) { |
603 | DBG_LOW(" -> huge page !\n"); | 603 | DBG_LOW(" -> huge page !\n"); |
604 | return hash_huge_page(mm, access, ea, vsid, local); | 604 | return hash_huge_page(mm, access, ea, vsid, local, trap); |
605 | } | 605 | } |
606 | 606 | ||
607 | /* Get PTE and page size from page tables */ | 607 | /* Get PTE and page size from page tables */ |
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 6bc9dbad7dea..54131b877da3 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c | |||
@@ -148,43 +148,63 @@ int is_aligned_hugepage_range(unsigned long addr, unsigned long len) | |||
148 | return 0; | 148 | return 0; |
149 | } | 149 | } |
150 | 150 | ||
151 | struct slb_flush_info { | ||
152 | struct mm_struct *mm; | ||
153 | u16 newareas; | ||
154 | }; | ||
155 | |||
151 | static void flush_low_segments(void *parm) | 156 | static void flush_low_segments(void *parm) |
152 | { | 157 | { |
153 | u16 areas = (unsigned long) parm; | 158 | struct slb_flush_info *fi = parm; |
154 | unsigned long i; | 159 | unsigned long i; |
155 | 160 | ||
156 | asm volatile("isync" : : : "memory"); | 161 | BUILD_BUG_ON((sizeof(fi->newareas)*8) != NUM_LOW_AREAS); |
162 | |||
163 | if (current->active_mm != fi->mm) | ||
164 | return; | ||
165 | |||
166 | /* Only need to do anything if this CPU is working in the same | ||
167 | * mm as the one which has changed */ | ||
157 | 168 | ||
158 | BUILD_BUG_ON((sizeof(areas)*8) != NUM_LOW_AREAS); | 169 | /* update the paca copy of the context struct */ |
170 | get_paca()->context = current->active_mm->context; | ||
159 | 171 | ||
172 | asm volatile("isync" : : : "memory"); | ||
160 | for (i = 0; i < NUM_LOW_AREAS; i++) { | 173 | for (i = 0; i < NUM_LOW_AREAS; i++) { |
161 | if (! (areas & (1U << i))) | 174 | if (! (fi->newareas & (1U << i))) |
162 | continue; | 175 | continue; |
163 | asm volatile("slbie %0" | 176 | asm volatile("slbie %0" |
164 | : : "r" ((i << SID_SHIFT) | SLBIE_C)); | 177 | : : "r" ((i << SID_SHIFT) | SLBIE_C)); |
165 | } | 178 | } |
166 | |||
167 | asm volatile("isync" : : : "memory"); | 179 | asm volatile("isync" : : : "memory"); |
168 | } | 180 | } |
169 | 181 | ||
170 | static void flush_high_segments(void *parm) | 182 | static void flush_high_segments(void *parm) |
171 | { | 183 | { |
172 | u16 areas = (unsigned long) parm; | 184 | struct slb_flush_info *fi = parm; |
173 | unsigned long i, j; | 185 | unsigned long i, j; |
174 | 186 | ||
175 | asm volatile("isync" : : : "memory"); | ||
176 | 187 | ||
177 | BUILD_BUG_ON((sizeof(areas)*8) != NUM_HIGH_AREAS); | 188 | BUILD_BUG_ON((sizeof(fi->newareas)*8) != NUM_HIGH_AREAS); |
178 | 189 | ||
190 | if (current->active_mm != fi->mm) | ||
191 | return; | ||
192 | |||
193 | /* Only need to do anything if this CPU is working in the same | ||
194 | * mm as the one which has changed */ | ||
195 | |||
196 | /* update the paca copy of the context struct */ | ||
197 | get_paca()->context = current->active_mm->context; | ||
198 | |||
199 | asm volatile("isync" : : : "memory"); | ||
179 | for (i = 0; i < NUM_HIGH_AREAS; i++) { | 200 | for (i = 0; i < NUM_HIGH_AREAS; i++) { |
180 | if (! (areas & (1U << i))) | 201 | if (! (fi->newareas & (1U << i))) |
181 | continue; | 202 | continue; |
182 | for (j = 0; j < (1UL << (HTLB_AREA_SHIFT-SID_SHIFT)); j++) | 203 | for (j = 0; j < (1UL << (HTLB_AREA_SHIFT-SID_SHIFT)); j++) |
183 | asm volatile("slbie %0" | 204 | asm volatile("slbie %0" |
184 | :: "r" (((i << HTLB_AREA_SHIFT) | 205 | :: "r" (((i << HTLB_AREA_SHIFT) |
185 | + (j << SID_SHIFT)) | SLBIE_C)); | 206 | + (j << SID_SHIFT)) | SLBIE_C)); |
186 | } | 207 | } |
187 | |||
188 | asm volatile("isync" : : : "memory"); | 208 | asm volatile("isync" : : : "memory"); |
189 | } | 209 | } |
190 | 210 | ||
@@ -229,6 +249,7 @@ static int prepare_high_area_for_htlb(struct mm_struct *mm, unsigned long area) | |||
229 | static int open_low_hpage_areas(struct mm_struct *mm, u16 newareas) | 249 | static int open_low_hpage_areas(struct mm_struct *mm, u16 newareas) |
230 | { | 250 | { |
231 | unsigned long i; | 251 | unsigned long i; |
252 | struct slb_flush_info fi; | ||
232 | 253 | ||
233 | BUILD_BUG_ON((sizeof(newareas)*8) != NUM_LOW_AREAS); | 254 | BUILD_BUG_ON((sizeof(newareas)*8) != NUM_LOW_AREAS); |
234 | BUILD_BUG_ON((sizeof(mm->context.low_htlb_areas)*8) != NUM_LOW_AREAS); | 255 | BUILD_BUG_ON((sizeof(mm->context.low_htlb_areas)*8) != NUM_LOW_AREAS); |
@@ -244,19 +265,20 @@ static int open_low_hpage_areas(struct mm_struct *mm, u16 newareas) | |||
244 | 265 | ||
245 | mm->context.low_htlb_areas |= newareas; | 266 | mm->context.low_htlb_areas |= newareas; |
246 | 267 | ||
247 | /* update the paca copy of the context struct */ | ||
248 | get_paca()->context = mm->context; | ||
249 | |||
250 | /* the context change must make it to memory before the flush, | 268 | /* the context change must make it to memory before the flush, |
251 | * so that further SLB misses do the right thing. */ | 269 | * so that further SLB misses do the right thing. */ |
252 | mb(); | 270 | mb(); |
253 | on_each_cpu(flush_low_segments, (void *)(unsigned long)newareas, 0, 1); | 271 | |
272 | fi.mm = mm; | ||
273 | fi.newareas = newareas; | ||
274 | on_each_cpu(flush_low_segments, &fi, 0, 1); | ||
254 | 275 | ||
255 | return 0; | 276 | return 0; |
256 | } | 277 | } |
257 | 278 | ||
258 | static int open_high_hpage_areas(struct mm_struct *mm, u16 newareas) | 279 | static int open_high_hpage_areas(struct mm_struct *mm, u16 newareas) |
259 | { | 280 | { |
281 | struct slb_flush_info fi; | ||
260 | unsigned long i; | 282 | unsigned long i; |
261 | 283 | ||
262 | BUILD_BUG_ON((sizeof(newareas)*8) != NUM_HIGH_AREAS); | 284 | BUILD_BUG_ON((sizeof(newareas)*8) != NUM_HIGH_AREAS); |
@@ -280,7 +302,10 @@ static int open_high_hpage_areas(struct mm_struct *mm, u16 newareas) | |||
280 | /* the context change must make it to memory before the flush, | 302 | /* the context change must make it to memory before the flush, |
281 | * so that further SLB misses do the right thing. */ | 303 | * so that further SLB misses do the right thing. */ |
282 | mb(); | 304 | mb(); |
283 | on_each_cpu(flush_high_segments, (void *)(unsigned long)newareas, 0, 1); | 305 | |
306 | fi.mm = mm; | ||
307 | fi.newareas = newareas; | ||
308 | on_each_cpu(flush_high_segments, &fi, 0, 1); | ||
284 | 309 | ||
285 | return 0; | 310 | return 0; |
286 | } | 311 | } |
@@ -639,8 +664,36 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, | |||
639 | return -ENOMEM; | 664 | return -ENOMEM; |
640 | } | 665 | } |
641 | 666 | ||
667 | /* | ||
668 | * Called by asm hashtable.S for doing lazy icache flush | ||
669 | */ | ||
670 | static unsigned int hash_huge_page_do_lazy_icache(unsigned long rflags, | ||
671 | pte_t pte, int trap) | ||
672 | { | ||
673 | struct page *page; | ||
674 | int i; | ||
675 | |||
676 | if (!pfn_valid(pte_pfn(pte))) | ||
677 | return rflags; | ||
678 | |||
679 | page = pte_page(pte); | ||
680 | |||
681 | /* page is dirty */ | ||
682 | if (!test_bit(PG_arch_1, &page->flags) && !PageReserved(page)) { | ||
683 | if (trap == 0x400) { | ||
684 | for (i = 0; i < (HPAGE_SIZE / PAGE_SIZE); i++) | ||
685 | __flush_dcache_icache(page_address(page+i)); | ||
686 | set_bit(PG_arch_1, &page->flags); | ||
687 | } else { | ||
688 | rflags |= HPTE_R_N; | ||
689 | } | ||
690 | } | ||
691 | return rflags; | ||
692 | } | ||
693 | |||
642 | int hash_huge_page(struct mm_struct *mm, unsigned long access, | 694 | int hash_huge_page(struct mm_struct *mm, unsigned long access, |
643 | unsigned long ea, unsigned long vsid, int local) | 695 | unsigned long ea, unsigned long vsid, int local, |
696 | unsigned long trap) | ||
644 | { | 697 | { |
645 | pte_t *ptep; | 698 | pte_t *ptep; |
646 | unsigned long old_pte, new_pte; | 699 | unsigned long old_pte, new_pte; |
@@ -691,6 +744,11 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access, | |||
691 | rflags = 0x2 | (!(new_pte & _PAGE_RW)); | 744 | rflags = 0x2 | (!(new_pte & _PAGE_RW)); |
692 | /* _PAGE_EXEC -> HW_NO_EXEC since it's inverted */ | 745 | /* _PAGE_EXEC -> HW_NO_EXEC since it's inverted */ |
693 | rflags |= ((new_pte & _PAGE_EXEC) ? 0 : HPTE_R_N); | 746 | rflags |= ((new_pte & _PAGE_EXEC) ? 0 : HPTE_R_N); |
747 | if (!cpu_has_feature(CPU_FTR_COHERENT_ICACHE)) | ||
748 | /* No CPU has hugepages but lacks no execute, so we | ||
749 | * don't need to worry about that case */ | ||
750 | rflags = hash_huge_page_do_lazy_icache(rflags, __pte(old_pte), | ||
751 | trap); | ||
694 | 752 | ||
695 | /* Check if pte already has an hpte (case 2) */ | 753 | /* Check if pte already has an hpte (case 2) */ |
696 | if (unlikely(old_pte & _PAGE_HASHPTE)) { | 754 | if (unlikely(old_pte & _PAGE_HASHPTE)) { |
@@ -703,7 +761,8 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access, | |||
703 | slot = (hash & htab_hash_mask) * HPTES_PER_GROUP; | 761 | slot = (hash & htab_hash_mask) * HPTES_PER_GROUP; |
704 | slot += (old_pte & _PAGE_F_GIX) >> 12; | 762 | slot += (old_pte & _PAGE_F_GIX) >> 12; |
705 | 763 | ||
706 | if (ppc_md.hpte_updatepp(slot, rflags, va, 1, local) == -1) | 764 | if (ppc_md.hpte_updatepp(slot, rflags, va, mmu_huge_psize, |
765 | local) == -1) | ||
707 | old_pte &= ~_PAGE_HPTEFLAGS; | 766 | old_pte &= ~_PAGE_HPTEFLAGS; |
708 | } | 767 | } |
709 | 768 | ||
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index f72cf87364cb..ba7a3055a9fc 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
@@ -125,7 +125,7 @@ void __init get_region(unsigned int nid, unsigned long *start_pfn, | |||
125 | 125 | ||
126 | /* We didnt find a matching region, return start/end as 0 */ | 126 | /* We didnt find a matching region, return start/end as 0 */ |
127 | if (*start_pfn == -1UL) | 127 | if (*start_pfn == -1UL) |
128 | start_pfn = 0; | 128 | *start_pfn = 0; |
129 | } | 129 | } |
130 | 130 | ||
131 | static inline void map_cpu_to_node(int cpu, int node) | 131 | static inline void map_cpu_to_node(int cpu, int node) |
diff --git a/arch/powerpc/mm/stab.c b/arch/powerpc/mm/stab.c index cfbb4e1f966b..51e7951414e5 100644 --- a/arch/powerpc/mm/stab.c +++ b/arch/powerpc/mm/stab.c | |||
@@ -288,11 +288,6 @@ void stab_initialize(unsigned long stab) | |||
288 | return; | 288 | return; |
289 | } | 289 | } |
290 | #endif /* CONFIG_PPC_ISERIES */ | 290 | #endif /* CONFIG_PPC_ISERIES */ |
291 | #ifdef CONFIG_PPC_PSERIES | 291 | |
292 | if (platform_is_lpar()) { | ||
293 | plpar_hcall_norets(H_SET_ASR, stabreal); | ||
294 | return; | ||
295 | } | ||
296 | #endif | ||
297 | mtspr(SPRN_ASR, stabreal); | 292 | mtspr(SPRN_ASR, stabreal); |
298 | } | 293 | } |
diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c index 0d7fa00fcb00..f6e22da2a5da 100644 --- a/arch/powerpc/platforms/powermac/feature.c +++ b/arch/powerpc/platforms/powermac/feature.c | |||
@@ -1650,11 +1650,19 @@ void pmac_tweak_clock_spreading(int enable) | |||
1650 | */ | 1650 | */ |
1651 | 1651 | ||
1652 | if (macio->type == macio_intrepid) { | 1652 | if (macio->type == macio_intrepid) { |
1653 | if (enable) | 1653 | struct device_node *clock = |
1654 | UN_OUT(UNI_N_CLOCK_SPREADING, 2); | 1654 | of_find_node_by_path("/uni-n@f8000000/hw-clock"); |
1655 | else | 1655 | if (clock && get_property(clock, "platform-do-clockspreading", |
1656 | UN_OUT(UNI_N_CLOCK_SPREADING, 0); | 1656 | NULL)) { |
1657 | mdelay(40); | 1657 | printk(KERN_INFO "%sabling clock spreading on Intrepid" |
1658 | " ASIC\n", enable ? "En" : "Dis"); | ||
1659 | if (enable) | ||
1660 | UN_OUT(UNI_N_CLOCK_SPREADING, 2); | ||
1661 | else | ||
1662 | UN_OUT(UNI_N_CLOCK_SPREADING, 0); | ||
1663 | mdelay(40); | ||
1664 | } | ||
1665 | of_node_put(clock); | ||
1658 | } | 1666 | } |
1659 | 1667 | ||
1660 | while (machine_is_compatible("PowerBook5,2") || | 1668 | while (machine_is_compatible("PowerBook5,2") || |
@@ -1724,6 +1732,9 @@ void pmac_tweak_clock_spreading(int enable) | |||
1724 | pmac_low_i2c_close(ui2c); | 1732 | pmac_low_i2c_close(ui2c); |
1725 | break; | 1733 | break; |
1726 | } | 1734 | } |
1735 | printk(KERN_INFO "%sabling clock spreading on i2c clock chip\n", | ||
1736 | enable ? "En" : "Dis"); | ||
1737 | |||
1727 | pmac_low_i2c_setmode(ui2c, pmac_low_i2c_mode_stdsub); | 1738 | pmac_low_i2c_setmode(ui2c, pmac_low_i2c_mode_stdsub); |
1728 | rc = pmac_low_i2c_xfer(ui2c, 0xd2 | pmac_low_i2c_write, 0x80, buffer, 9); | 1739 | rc = pmac_low_i2c_xfer(ui2c, 0xd2 | pmac_low_i2c_write, 0x80, buffer, 9); |
1729 | DBG("write result: %d,", rc); | 1740 | DBG("write result: %d,", rc); |
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index c78f2b290a73..2043659ea7b1 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c | |||
@@ -109,6 +109,9 @@ static void tce_build_pSeriesLP(struct iommu_table *tbl, long tcenum, | |||
109 | u64 rc; | 109 | u64 rc; |
110 | union tce_entry tce; | 110 | union tce_entry tce; |
111 | 111 | ||
112 | tcenum <<= TCE_PAGE_FACTOR; | ||
113 | npages <<= TCE_PAGE_FACTOR; | ||
114 | |||
112 | tce.te_word = 0; | 115 | tce.te_word = 0; |
113 | tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT; | 116 | tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT; |
114 | tce.te_rdwr = 1; | 117 | tce.te_rdwr = 1; |
@@ -143,10 +146,7 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum, | |||
143 | union tce_entry tce, *tcep; | 146 | union tce_entry tce, *tcep; |
144 | long l, limit; | 147 | long l, limit; |
145 | 148 | ||
146 | tcenum <<= TCE_PAGE_FACTOR; | 149 | if (TCE_PAGE_FACTOR == 0 && npages == 1) |
147 | npages <<= TCE_PAGE_FACTOR; | ||
148 | |||
149 | if (npages == 1) | ||
150 | return tce_build_pSeriesLP(tbl, tcenum, npages, uaddr, | 150 | return tce_build_pSeriesLP(tbl, tcenum, npages, uaddr, |
151 | direction); | 151 | direction); |
152 | 152 | ||
@@ -164,6 +164,9 @@ static void tce_buildmulti_pSeriesLP(struct iommu_table *tbl, long tcenum, | |||
164 | __get_cpu_var(tce_page) = tcep; | 164 | __get_cpu_var(tce_page) = tcep; |
165 | } | 165 | } |
166 | 166 | ||
167 | tcenum <<= TCE_PAGE_FACTOR; | ||
168 | npages <<= TCE_PAGE_FACTOR; | ||
169 | |||
167 | tce.te_word = 0; | 170 | tce.te_word = 0; |
168 | tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT; | 171 | tce.te_rpn = (virt_to_abs(uaddr)) >> TCE_SHIFT; |
169 | tce.te_rdwr = 1; | 172 | tce.te_rdwr = 1; |
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index a50e5f3f396d..cf1bc11b3346 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c | |||
@@ -298,18 +298,6 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group, | |||
298 | if (!(vflags & HPTE_V_BOLTED)) | 298 | if (!(vflags & HPTE_V_BOLTED)) |
299 | DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r); | 299 | DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r); |
300 | 300 | ||
301 | #if 1 | ||
302 | { | ||
303 | int i; | ||
304 | for (i=0;i<8;i++) { | ||
305 | unsigned long w0, w1; | ||
306 | plpar_pte_read(0, hpte_group, &w0, &w1); | ||
307 | BUG_ON (HPTE_V_COMPARE(hpte_v, w0) | ||
308 | && (w0 & HPTE_V_VALID)); | ||
309 | } | ||
310 | } | ||
311 | #endif | ||
312 | |||
313 | /* Now fill in the actual HPTE */ | 301 | /* Now fill in the actual HPTE */ |
314 | /* Set CEC cookie to 0 */ | 302 | /* Set CEC cookie to 0 */ |
315 | /* Zero page = 0 */ | 303 | /* Zero page = 0 */ |
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index 8fa51b0a32d2..cc3f64c084c5 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
@@ -767,14 +767,14 @@ config CPM2 | |||
767 | on it (826x, 827x, 8560). | 767 | on it (826x, 827x, 8560). |
768 | 768 | ||
769 | config PPC_CHRP | 769 | config PPC_CHRP |
770 | bool " Common Hardware Reference Platform (CHRP) based machines" | 770 | bool |
771 | depends on PPC_MULTIPLATFORM | 771 | depends on PPC_MULTIPLATFORM |
772 | select PPC_I8259 | 772 | select PPC_I8259 |
773 | select PPC_INDIRECT_PCI | 773 | select PPC_INDIRECT_PCI |
774 | default y | 774 | default y |
775 | 775 | ||
776 | config PPC_PMAC | 776 | config PPC_PMAC |
777 | bool " Apple PowerMac based machines" | 777 | bool |
778 | depends on PPC_MULTIPLATFORM | 778 | depends on PPC_MULTIPLATFORM |
779 | select PPC_INDIRECT_PCI | 779 | select PPC_INDIRECT_PCI |
780 | default y | 780 | default y |
@@ -785,7 +785,7 @@ config PPC_PMAC64 | |||
785 | default y | 785 | default y |
786 | 786 | ||
787 | config PPC_PREP | 787 | config PPC_PREP |
788 | bool " PowerPC Reference Platform (PReP) based machines" | 788 | bool |
789 | depends on PPC_MULTIPLATFORM | 789 | depends on PPC_MULTIPLATFORM |
790 | select PPC_I8259 | 790 | select PPC_I8259 |
791 | select PPC_INDIRECT_PCI | 791 | select PPC_INDIRECT_PCI |
diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c index 43b8fc2ca591..becbfa397556 100644 --- a/arch/ppc/kernel/smp.c +++ b/arch/ppc/kernel/smp.c | |||
@@ -301,6 +301,10 @@ void __init smp_prepare_cpus(unsigned int max_cpus) | |||
301 | 301 | ||
302 | /* Probe platform for CPUs: always linear. */ | 302 | /* Probe platform for CPUs: always linear. */ |
303 | num_cpus = smp_ops->probe(); | 303 | num_cpus = smp_ops->probe(); |
304 | |||
305 | if (num_cpus < 2) | ||
306 | smp_tb_synchronized = 1; | ||
307 | |||
304 | for (i = 0; i < num_cpus; ++i) | 308 | for (i = 0; i < num_cpus; ++i) |
305 | cpu_set(i, cpu_possible_map); | 309 | cpu_set(i, cpu_possible_map); |
306 | 310 | ||
diff --git a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c index d8991b88dc9c..5e8cc5ec6ab5 100644 --- a/arch/ppc/platforms/85xx/mpc85xx_cds_common.c +++ b/arch/ppc/platforms/85xx/mpc85xx_cds_common.c | |||
@@ -130,10 +130,11 @@ mpc85xx_cds_show_cpuinfo(struct seq_file *m) | |||
130 | } | 130 | } |
131 | 131 | ||
132 | #ifdef CONFIG_CPM2 | 132 | #ifdef CONFIG_CPM2 |
133 | static void cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs) | 133 | static irqreturn_t cpm2_cascade(int irq, void *dev_id, struct pt_regs *regs) |
134 | { | 134 | { |
135 | while((irq = cpm2_get_irq(regs)) >= 0) | 135 | while((irq = cpm2_get_irq(regs)) >= 0) |
136 | __do_IRQ(irq, regs); | 136 | __do_IRQ(irq, regs); |
137 | return IRQ_HANDLED; | ||
137 | } | 138 | } |
138 | 139 | ||
139 | static struct irqaction cpm2_irqaction = { | 140 | static struct irqaction cpm2_irqaction = { |
diff --git a/arch/ppc/platforms/pmac_feature.c b/arch/ppc/platforms/pmac_feature.c index 1e69b0593162..6b7b3a150631 100644 --- a/arch/ppc/platforms/pmac_feature.c +++ b/arch/ppc/platforms/pmac_feature.c | |||
@@ -1606,11 +1606,19 @@ void pmac_tweak_clock_spreading(int enable) | |||
1606 | */ | 1606 | */ |
1607 | 1607 | ||
1608 | if (macio->type == macio_intrepid) { | 1608 | if (macio->type == macio_intrepid) { |
1609 | if (enable) | 1609 | struct device_node *clock = |
1610 | UN_OUT(UNI_N_CLOCK_SPREADING, 2); | 1610 | of_find_node_by_path("/uni-n@f8000000/hw-clock"); |
1611 | else | 1611 | if (clock && get_property(clock, "platform-do-clockspreading", |
1612 | UN_OUT(UNI_N_CLOCK_SPREADING, 0); | 1612 | NULL)) { |
1613 | mdelay(40); | 1613 | printk(KERN_INFO "%sabling clock spreading on Intrepid" |
1614 | " ASIC\n", enable ? "En" : "Dis"); | ||
1615 | if (enable) | ||
1616 | UN_OUT(UNI_N_CLOCK_SPREADING, 2); | ||
1617 | else | ||
1618 | UN_OUT(UNI_N_CLOCK_SPREADING, 0); | ||
1619 | mdelay(40); | ||
1620 | } | ||
1621 | of_node_put(clock); | ||
1614 | } | 1622 | } |
1615 | 1623 | ||
1616 | while (machine_is_compatible("PowerBook5,2") || | 1624 | while (machine_is_compatible("PowerBook5,2") || |
@@ -1680,6 +1688,8 @@ void pmac_tweak_clock_spreading(int enable) | |||
1680 | pmac_low_i2c_close(ui2c); | 1688 | pmac_low_i2c_close(ui2c); |
1681 | break; | 1689 | break; |
1682 | } | 1690 | } |
1691 | printk(KERN_INFO "%sabling clock spreading on i2c clock chip\n", | ||
1692 | enable ? "En" : "Dis"); | ||
1683 | pmac_low_i2c_setmode(ui2c, pmac_low_i2c_mode_stdsub); | 1693 | pmac_low_i2c_setmode(ui2c, pmac_low_i2c_mode_stdsub); |
1684 | rc = pmac_low_i2c_xfer(ui2c, 0xd2 | pmac_low_i2c_write, 0x80, buffer, 9); | 1694 | rc = pmac_low_i2c_xfer(ui2c, 0xd2 | pmac_low_i2c_write, 0x80, buffer, 9); |
1685 | DBG("write result: %d,", rc); | 1695 | DBG("write result: %d,", rc); |
diff --git a/arch/ppc/syslib/ppc4xx_dma.c b/arch/ppc/syslib/ppc4xx_dma.c index f15e64285f96..05ccd598dd4e 100644 --- a/arch/ppc/syslib/ppc4xx_dma.c +++ b/arch/ppc/syslib/ppc4xx_dma.c | |||
@@ -30,6 +30,7 @@ | |||
30 | 30 | ||
31 | #include <asm/system.h> | 31 | #include <asm/system.h> |
32 | #include <asm/io.h> | 32 | #include <asm/io.h> |
33 | #include <asm/dma.h> | ||
33 | #include <asm/ppc4xx_dma.h> | 34 | #include <asm/ppc4xx_dma.h> |
34 | 35 | ||
35 | ppc_dma_ch_t dma_channels[MAX_PPC4xx_DMA_CHANNELS]; | 36 | ppc_dma_ch_t dma_channels[MAX_PPC4xx_DMA_CHANNELS]; |
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile index dea48f6cff38..4cdbb2d59ed0 100644 --- a/arch/sparc/Makefile +++ b/arch/sparc/Makefile | |||
@@ -34,7 +34,7 @@ libs-y += arch/sparc/prom/ arch/sparc/lib/ | |||
34 | # Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-) | 34 | # Renaming is done to avoid confusing pattern matching rules in 2.5.45 (multy-) |
35 | INIT_Y := $(patsubst %/, %/built-in.o, $(init-y)) | 35 | INIT_Y := $(patsubst %/, %/built-in.o, $(init-y)) |
36 | CORE_Y := $(core-y) | 36 | CORE_Y := $(core-y) |
37 | CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ | 37 | CORE_Y += kernel/ mm/ fs/ ipc/ security/ crypto/ block/ |
38 | CORE_Y := $(patsubst %/, %/built-in.o, $(CORE_Y)) | 38 | CORE_Y := $(patsubst %/, %/built-in.o, $(CORE_Y)) |
39 | DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y)) | 39 | DRIVERS_Y := $(patsubst %/, %/built-in.o, $(drivers-y)) |
40 | NET_Y := $(patsubst %/, %/built-in.o, $(net-y)) | 40 | NET_Y := $(patsubst %/, %/built-in.o, $(net-y)) |
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index 1754192c69d0..5c3529ceb5d6 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c | |||
@@ -22,7 +22,7 @@ | |||
22 | #include <asm/oplib.h> | 22 | #include <asm/oplib.h> |
23 | #include <asm/bpp.h> | 23 | #include <asm/bpp.h> |
24 | 24 | ||
25 | struct linux_ebus *ebus_chain = 0; | 25 | struct linux_ebus *ebus_chain = NULL; |
26 | 26 | ||
27 | /* We are together with pcic.c under CONFIG_PCI. */ | 27 | /* We are together with pcic.c under CONFIG_PCI. */ |
28 | extern unsigned int pcic_pin_to_irq(unsigned int, char *name); | 28 | extern unsigned int pcic_pin_to_irq(unsigned int, char *name); |
@@ -46,7 +46,7 @@ static struct ebus_device_irq je1_1[] = { | |||
46 | { "SUNW,CS4231", 0 }, | 46 | { "SUNW,CS4231", 0 }, |
47 | { "parallel", 0 }, | 47 | { "parallel", 0 }, |
48 | { "se", 2 }, | 48 | { "se", 2 }, |
49 | { 0, 0 } | 49 | { NULL, 0 } |
50 | }; | 50 | }; |
51 | 51 | ||
52 | /* | 52 | /* |
@@ -55,7 +55,7 @@ static struct ebus_device_irq je1_1[] = { | |||
55 | */ | 55 | */ |
56 | static struct ebus_system_entry ebus_blacklist[] = { | 56 | static struct ebus_system_entry ebus_blacklist[] = { |
57 | { "SUNW,JavaEngine1", je1_1 }, | 57 | { "SUNW,JavaEngine1", je1_1 }, |
58 | { 0, 0 } | 58 | { NULL, NULL } |
59 | }; | 59 | }; |
60 | 60 | ||
61 | static struct ebus_device_irq *ebus_blackp = NULL; | 61 | static struct ebus_device_irq *ebus_blackp = NULL; |
@@ -233,7 +233,7 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev) | |||
233 | ebus_alloc(sizeof(struct linux_ebus_child)); | 233 | ebus_alloc(sizeof(struct linux_ebus_child)); |
234 | 234 | ||
235 | child = dev->children; | 235 | child = dev->children; |
236 | child->next = 0; | 236 | child->next = NULL; |
237 | child->parent = dev; | 237 | child->parent = dev; |
238 | child->bus = dev->bus; | 238 | child->bus = dev->bus; |
239 | fill_ebus_child(node, ®s[0], child); | 239 | fill_ebus_child(node, ®s[0], child); |
@@ -243,7 +243,7 @@ void __init fill_ebus_device(int node, struct linux_ebus_device *dev) | |||
243 | ebus_alloc(sizeof(struct linux_ebus_child)); | 243 | ebus_alloc(sizeof(struct linux_ebus_child)); |
244 | 244 | ||
245 | child = child->next; | 245 | child = child->next; |
246 | child->next = 0; | 246 | child->next = NULL; |
247 | child->parent = dev; | 247 | child->parent = dev; |
248 | child->bus = dev->bus; | 248 | child->bus = dev->bus; |
249 | fill_ebus_child(node, ®s[0], child); | 249 | fill_ebus_child(node, ®s[0], child); |
@@ -275,7 +275,7 @@ void __init ebus_init(void) | |||
275 | } | 275 | } |
276 | } | 276 | } |
277 | 277 | ||
278 | pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, 0); | 278 | pdev = pci_get_device(PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_EBUS, NULL); |
279 | if (!pdev) { | 279 | if (!pdev) { |
280 | return; | 280 | return; |
281 | } | 281 | } |
@@ -284,7 +284,7 @@ void __init ebus_init(void) | |||
284 | 284 | ||
285 | ebus_chain = ebus = (struct linux_ebus *) | 285 | ebus_chain = ebus = (struct linux_ebus *) |
286 | ebus_alloc(sizeof(struct linux_ebus)); | 286 | ebus_alloc(sizeof(struct linux_ebus)); |
287 | ebus->next = 0; | 287 | ebus->next = NULL; |
288 | 288 | ||
289 | while (ebusnd) { | 289 | while (ebusnd) { |
290 | 290 | ||
@@ -325,8 +325,8 @@ void __init ebus_init(void) | |||
325 | ebus_alloc(sizeof(struct linux_ebus_device)); | 325 | ebus_alloc(sizeof(struct linux_ebus_device)); |
326 | 326 | ||
327 | dev = ebus->devices; | 327 | dev = ebus->devices; |
328 | dev->next = 0; | 328 | dev->next = NULL; |
329 | dev->children = 0; | 329 | dev->children = NULL; |
330 | dev->bus = ebus; | 330 | dev->bus = ebus; |
331 | fill_ebus_device(nd, dev); | 331 | fill_ebus_device(nd, dev); |
332 | 332 | ||
@@ -335,8 +335,8 @@ void __init ebus_init(void) | |||
335 | ebus_alloc(sizeof(struct linux_ebus_device)); | 335 | ebus_alloc(sizeof(struct linux_ebus_device)); |
336 | 336 | ||
337 | dev = dev->next; | 337 | dev = dev->next; |
338 | dev->next = 0; | 338 | dev->next = NULL; |
339 | dev->children = 0; | 339 | dev->children = NULL; |
340 | dev->bus = ebus; | 340 | dev->bus = ebus; |
341 | fill_ebus_device(nd, dev); | 341 | fill_ebus_device(nd, dev); |
342 | } | 342 | } |
@@ -353,7 +353,7 @@ void __init ebus_init(void) | |||
353 | ebus->next = (struct linux_ebus *) | 353 | ebus->next = (struct linux_ebus *) |
354 | ebus_alloc(sizeof(struct linux_ebus)); | 354 | ebus_alloc(sizeof(struct linux_ebus)); |
355 | ebus = ebus->next; | 355 | ebus = ebus->next; |
356 | ebus->next = 0; | 356 | ebus->next = NULL; |
357 | ++num_ebus; | 357 | ++num_ebus; |
358 | } | 358 | } |
359 | if (pdev) | 359 | if (pdev) |
diff --git a/arch/sparc/kernel/led.c b/arch/sparc/kernel/led.c index 2a3afca453c9..313d1620ae8e 100644 --- a/arch/sparc/kernel/led.c +++ b/arch/sparc/kernel/led.c | |||
@@ -55,7 +55,7 @@ static int led_read_proc(char *buf, char **start, off_t offset, int count, | |||
55 | return len; | 55 | return len; |
56 | } | 56 | } |
57 | 57 | ||
58 | static int led_write_proc(struct file *file, const char *buffer, | 58 | static int led_write_proc(struct file *file, const char __user *buffer, |
59 | unsigned long count, void *data) | 59 | unsigned long count, void *data) |
60 | { | 60 | { |
61 | char *buf = NULL; | 61 | char *buf = NULL; |
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index cccfc12802ed..42002b742deb 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c | |||
@@ -161,7 +161,7 @@ static struct pcic_sn2list pcic_known_sysnames[] = { | |||
161 | static int pcic0_up; | 161 | static int pcic0_up; |
162 | static struct linux_pcic pcic0; | 162 | static struct linux_pcic pcic0; |
163 | 163 | ||
164 | void * __iomem pcic_regs; | 164 | void __iomem *pcic_regs; |
165 | volatile int pcic_speculative; | 165 | volatile int pcic_speculative; |
166 | volatile int pcic_trapped; | 166 | volatile int pcic_trapped; |
167 | 167 | ||
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index 24814d58f9e1..7dadcdb4ca42 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
@@ -49,7 +49,7 @@ DEFINE_SPINLOCK(rtc_lock); | |||
49 | enum sparc_clock_type sp_clock_typ; | 49 | enum sparc_clock_type sp_clock_typ; |
50 | DEFINE_SPINLOCK(mostek_lock); | 50 | DEFINE_SPINLOCK(mostek_lock); |
51 | void __iomem *mstk48t02_regs = NULL; | 51 | void __iomem *mstk48t02_regs = NULL; |
52 | static struct mostek48t08 *mstk48t08_regs = NULL; | 52 | static struct mostek48t08 __iomem *mstk48t08_regs = NULL; |
53 | static int set_rtc_mmss(unsigned long); | 53 | static int set_rtc_mmss(unsigned long); |
54 | static int sbus_do_settimeofday(struct timespec *tv); | 54 | static int sbus_do_settimeofday(struct timespec *tv); |
55 | 55 | ||
@@ -342,7 +342,7 @@ static __inline__ void clock_probe(void) | |||
342 | /* XXX r/o attribute is somewhere in r.flags */ | 342 | /* XXX r/o attribute is somewhere in r.flags */ |
343 | r.flags = clk_reg[0].which_io; | 343 | r.flags = clk_reg[0].which_io; |
344 | r.start = clk_reg[0].phys_addr; | 344 | r.start = clk_reg[0].phys_addr; |
345 | mstk48t08_regs = (struct mostek48t08 *) sbus_ioremap(&r, 0, | 345 | mstk48t08_regs = sbus_ioremap(&r, 0, |
346 | sizeof(struct mostek48t08), "mk48t08"); | 346 | sizeof(struct mostek48t08), "mk48t08"); |
347 | 347 | ||
348 | mstk48t02_regs = &mstk48t08_regs->regs; | 348 | mstk48t02_regs = &mstk48t08_regs->regs; |
diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c index cb3cf0f22822..de84f8534bac 100644 --- a/arch/sparc/lib/atomic32.c +++ b/arch/sparc/lib/atomic32.c | |||
@@ -66,7 +66,6 @@ int atomic_add_unless(atomic_t *v, int a, int u) | |||
66 | return ret != u; | 66 | return ret != u; |
67 | } | 67 | } |
68 | 68 | ||
69 | static inline void atomic_clear_mask(unsigned long mask, unsigned long *addr) | ||
70 | /* Atomic operations are already serializing */ | 69 | /* Atomic operations are already serializing */ |
71 | void atomic_set(atomic_t *v, int i) | 70 | void atomic_set(atomic_t *v, int i) |
72 | { | 71 | { |
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c index 1d560390e282..731f19603cad 100644 --- a/arch/sparc/mm/sun4c.c +++ b/arch/sparc/mm/sun4c.c | |||
@@ -497,7 +497,7 @@ static void __init sun4c_probe_mmu(void) | |||
497 | patch_kernel_fault_handler(); | 497 | patch_kernel_fault_handler(); |
498 | } | 498 | } |
499 | 499 | ||
500 | volatile unsigned long *sun4c_memerr_reg = NULL; | 500 | volatile unsigned long __iomem *sun4c_memerr_reg = NULL; |
501 | 501 | ||
502 | void __init sun4c_probe_memerr_reg(void) | 502 | void __init sun4c_probe_memerr_reg(void) |
503 | { | 503 | { |
diff --git a/arch/sparc64/Makefile b/arch/sparc64/Makefile index 43fe382da078..cad10c5b83d3 100644 --- a/arch/sparc64/Makefile +++ b/arch/sparc64/Makefile | |||
@@ -17,7 +17,6 @@ CC := $(shell if $(CC) -m64 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then | |||
17 | NEW_GCC := $(call cc-option-yn, -m64 -mcmodel=medlow) | 17 | NEW_GCC := $(call cc-option-yn, -m64 -mcmodel=medlow) |
18 | NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi) | 18 | NEW_GAS := $(shell if $(LD) -V 2>&1 | grep 'elf64_sparc' > /dev/null; then echo y; else echo n; fi) |
19 | UNDECLARED_REGS := $(shell if $(CC) -c -x assembler /dev/null -Wa,--help | grep undeclared-regs > /dev/null; then echo y; else echo n; fi; ) | 19 | UNDECLARED_REGS := $(shell if $(CC) -c -x assembler /dev/null -Wa,--help | grep undeclared-regs > /dev/null; then echo y; else echo n; fi; ) |
20 | INLINE_LIMIT := $(call cc-option-yn, -m64 -finline-limit=100000) | ||
21 | 20 | ||
22 | export NEW_GCC | 21 | export NEW_GCC |
23 | 22 | ||
@@ -49,10 +48,6 @@ else | |||
49 | AFLAGS += -m64 -mcpu=ultrasparc $(CC_UNDECL) | 48 | AFLAGS += -m64 -mcpu=ultrasparc $(CC_UNDECL) |
50 | endif | 49 | endif |
51 | 50 | ||
52 | ifeq ($(INLINE_LIMIT),y) | ||
53 | CFLAGS := $(CFLAGS) -finline-limit=100000 | ||
54 | endif | ||
55 | |||
56 | ifeq ($(CONFIG_MCOUNT),y) | 51 | ifeq ($(CONFIG_MCOUNT),y) |
57 | CFLAGS := $(CFLAGS) -pg | 52 | CFLAGS := $(CFLAGS) -pg |
58 | endif | 53 | endif |
diff --git a/arch/sparc64/kernel/kprobes.c b/arch/sparc64/kernel/kprobes.c index 96bd09b098f4..a97b0f0727ab 100644 --- a/arch/sparc64/kernel/kprobes.c +++ b/arch/sparc64/kernel/kprobes.c | |||
@@ -138,7 +138,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) | |||
138 | */ | 138 | */ |
139 | save_previous_kprobe(kcb); | 139 | save_previous_kprobe(kcb); |
140 | set_current_kprobe(p, regs, kcb); | 140 | set_current_kprobe(p, regs, kcb); |
141 | p->nmissed++; | 141 | kprobes_inc_nmissed_count(p); |
142 | kcb->kprobe_status = KPROBE_REENTER; | 142 | kcb->kprobe_status = KPROBE_REENTER; |
143 | prepare_singlestep(p, regs, kcb); | 143 | prepare_singlestep(p, regs, kcb); |
144 | return 1; | 144 | return 1; |
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 563301fe5df8..1eb21de9d1b5 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
@@ -289,6 +289,8 @@ source "arch/um/Kconfig.net" | |||
289 | 289 | ||
290 | source "drivers/net/Kconfig" | 290 | source "drivers/net/Kconfig" |
291 | 291 | ||
292 | source "drivers/connector/Kconfig" | ||
293 | |||
292 | source "fs/Kconfig" | 294 | source "fs/Kconfig" |
293 | 295 | ||
294 | source "security/Kconfig" | 296 | source "security/Kconfig" |
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64 index 4f118d5cc2ee..38df311e75dc 100644 --- a/arch/um/Makefile-x86_64 +++ b/arch/um/Makefile-x86_64 | |||
@@ -12,3 +12,7 @@ CHECKFLAGS += -m64 | |||
12 | 12 | ||
13 | ELF_ARCH := i386:x86-64 | 13 | ELF_ARCH := i386:x86-64 |
14 | ELF_FORMAT := elf64-x86-64 | 14 | ELF_FORMAT := elf64-x86-64 |
15 | |||
16 | # Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example. | ||
17 | |||
18 | LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64 | ||
diff --git a/arch/um/include/sysdep-i386/stub.h b/arch/um/include/sysdep-i386/stub.h index 6ba8cbbe0d36..b492b12b4a10 100644 --- a/arch/um/include/sysdep-i386/stub.h +++ b/arch/um/include/sysdep-i386/stub.h | |||
@@ -6,8 +6,12 @@ | |||
6 | #ifndef __SYSDEP_STUB_H | 6 | #ifndef __SYSDEP_STUB_H |
7 | #define __SYSDEP_STUB_H | 7 | #define __SYSDEP_STUB_H |
8 | 8 | ||
9 | #include <sys/mman.h> | ||
9 | #include <asm/ptrace.h> | 10 | #include <asm/ptrace.h> |
10 | #include <asm/unistd.h> | 11 | #include <asm/unistd.h> |
12 | #include "stub-data.h" | ||
13 | #include "kern_constants.h" | ||
14 | #include "uml-config.h" | ||
11 | 15 | ||
12 | extern void stub_segv_handler(int sig); | 16 | extern void stub_segv_handler(int sig); |
13 | extern void stub_clone_handler(void); | 17 | extern void stub_clone_handler(void); |
@@ -76,23 +80,22 @@ static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3, | |||
76 | return ret; | 80 | return ret; |
77 | } | 81 | } |
78 | 82 | ||
79 | static inline long stub_syscall6(long syscall, long arg1, long arg2, long arg3, | 83 | static inline void trap_myself(void) |
80 | long arg4, long arg5, long arg6) | ||
81 | { | 84 | { |
82 | long ret; | 85 | __asm("int3"); |
83 | |||
84 | __asm__ volatile ("push %%ebp ; movl %%eax,%%ebp ; movl %1,%%eax ; " | ||
85 | "int $0x80 ; pop %%ebp" | ||
86 | : "=a" (ret) | ||
87 | : "g" (syscall), "b" (arg1), "c" (arg2), "d" (arg3), | ||
88 | "S" (arg4), "D" (arg5), "0" (arg6)); | ||
89 | |||
90 | return ret; | ||
91 | } | 86 | } |
92 | 87 | ||
93 | static inline void trap_myself(void) | 88 | static inline void remap_stack(int fd, unsigned long offset) |
94 | { | 89 | { |
95 | __asm("int3"); | 90 | __asm__ volatile ("movl %%eax,%%ebp ; movl %0,%%eax ; int $0x80 ;" |
91 | "movl %7, %%ebx ; movl %%eax, (%%ebx)" | ||
92 | : : "g" (STUB_MMAP_NR), "b" (UML_CONFIG_STUB_DATA), | ||
93 | "c" (UM_KERN_PAGE_SIZE), | ||
94 | "d" (PROT_READ | PROT_WRITE), | ||
95 | "S" (MAP_FIXED | MAP_SHARED), "D" (fd), | ||
96 | "a" (offset), | ||
97 | "i" (&((struct stub_data *) UML_CONFIG_STUB_DATA)->err) | ||
98 | : "memory"); | ||
96 | } | 99 | } |
97 | 100 | ||
98 | #endif | 101 | #endif |
diff --git a/arch/um/include/sysdep-x86_64/stub.h b/arch/um/include/sysdep-x86_64/stub.h index c41689c13dc9..92e989f81761 100644 --- a/arch/um/include/sysdep-x86_64/stub.h +++ b/arch/um/include/sysdep-x86_64/stub.h | |||
@@ -6,8 +6,12 @@ | |||
6 | #ifndef __SYSDEP_STUB_H | 6 | #ifndef __SYSDEP_STUB_H |
7 | #define __SYSDEP_STUB_H | 7 | #define __SYSDEP_STUB_H |
8 | 8 | ||
9 | #include <sys/mman.h> | ||
9 | #include <asm/unistd.h> | 10 | #include <asm/unistd.h> |
10 | #include <sysdep/ptrace_user.h> | 11 | #include <sysdep/ptrace_user.h> |
12 | #include "stub-data.h" | ||
13 | #include "kern_constants.h" | ||
14 | #include "uml-config.h" | ||
11 | 15 | ||
12 | extern void stub_segv_handler(int sig); | 16 | extern void stub_segv_handler(int sig); |
13 | extern void stub_clone_handler(void); | 17 | extern void stub_clone_handler(void); |
@@ -81,23 +85,23 @@ static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3, | |||
81 | return ret; | 85 | return ret; |
82 | } | 86 | } |
83 | 87 | ||
84 | static inline long stub_syscall6(long syscall, long arg1, long arg2, long arg3, | 88 | static inline void trap_myself(void) |
85 | long arg4, long arg5, long arg6) | ||
86 | { | 89 | { |
87 | long ret; | 90 | __asm("int3"); |
88 | |||
89 | __asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; " | ||
90 | "movq %7, %%r9; " __syscall : "=a" (ret) | ||
91 | : "0" (syscall), "D" (arg1), "S" (arg2), "d" (arg3), | ||
92 | "g" (arg4), "g" (arg5), "g" (arg6) | ||
93 | : __syscall_clobber, "r10", "r8", "r9" ); | ||
94 | |||
95 | return ret; | ||
96 | } | 91 | } |
97 | 92 | ||
98 | static inline void trap_myself(void) | 93 | static inline void remap_stack(long fd, unsigned long offset) |
99 | { | 94 | { |
100 | __asm("int3"); | 95 | __asm__ volatile ("movq %4,%%r10 ; movq %5,%%r8 ; " |
96 | "movq %6, %%r9; " __syscall "; movq %7, %%rbx ; " | ||
97 | "movq %%rax, (%%rbx)": | ||
98 | : "a" (STUB_MMAP_NR), "D" (UML_CONFIG_STUB_DATA), | ||
99 | "S" (UM_KERN_PAGE_SIZE), | ||
100 | "d" (PROT_READ | PROT_WRITE), | ||
101 | "g" (MAP_FIXED | MAP_SHARED), "g" (fd), | ||
102 | "g" (offset), | ||
103 | "i" (&((struct stub_data *) UML_CONFIG_STUB_DATA)->err) | ||
104 | : __syscall_clobber, "r10", "r8", "r9" ); | ||
101 | } | 105 | } |
102 | 106 | ||
103 | #endif | 107 | #endif |
diff --git a/arch/um/include/um_uaccess.h b/arch/um/include/um_uaccess.h index f8760a3f43b0..4567f1eeb4a7 100644 --- a/arch/um/include/um_uaccess.h +++ b/arch/um/include/um_uaccess.h | |||
@@ -17,6 +17,8 @@ | |||
17 | #include "uaccess-skas.h" | 17 | #include "uaccess-skas.h" |
18 | #endif | 18 | #endif |
19 | 19 | ||
20 | #include "asm/fixmap.h" | ||
21 | |||
20 | #define __under_task_size(addr, size) \ | 22 | #define __under_task_size(addr, size) \ |
21 | (((unsigned long) (addr) < TASK_SIZE) && \ | 23 | (((unsigned long) (addr) < TASK_SIZE) && \ |
22 | (((unsigned long) (addr) + (size)) < TASK_SIZE)) | 24 | (((unsigned long) (addr) + (size)) < TASK_SIZE)) |
diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c index cb37ce9124a6..47b812b3bca8 100644 --- a/arch/um/kernel/skas/clone.c +++ b/arch/um/kernel/skas/clone.c | |||
@@ -18,11 +18,10 @@ | |||
18 | * on some systems. | 18 | * on some systems. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #define STUB_DATA(field) (((struct stub_data *) UML_CONFIG_STUB_DATA)->field) | ||
22 | |||
23 | void __attribute__ ((__section__ (".__syscall_stub"))) | 21 | void __attribute__ ((__section__ (".__syscall_stub"))) |
24 | stub_clone_handler(void) | 22 | stub_clone_handler(void) |
25 | { | 23 | { |
24 | struct stub_data *data = (struct stub_data *) UML_CONFIG_STUB_DATA; | ||
26 | long err; | 25 | long err; |
27 | 26 | ||
28 | err = stub_syscall2(__NR_clone, CLONE_PARENT | CLONE_FILES | SIGCHLD, | 27 | err = stub_syscall2(__NR_clone, CLONE_PARENT | CLONE_FILES | SIGCHLD, |
@@ -35,17 +34,21 @@ stub_clone_handler(void) | |||
35 | if(err) | 34 | if(err) |
36 | goto out; | 35 | goto out; |
37 | 36 | ||
38 | err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL, | 37 | err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL, |
39 | (long) &STUB_DATA(timer), 0); | 38 | (long) &data->timer, 0); |
40 | if(err) | 39 | if(err) |
41 | goto out; | 40 | goto out; |
42 | 41 | ||
43 | err = stub_syscall6(STUB_MMAP_NR, UML_CONFIG_STUB_DATA, | 42 | remap_stack(data->fd, data->offset); |
44 | UM_KERN_PAGE_SIZE, PROT_READ | PROT_WRITE, | 43 | goto done; |
45 | MAP_FIXED | MAP_SHARED, STUB_DATA(fd), | 44 | |
46 | STUB_DATA(offset)); | ||
47 | out: | 45 | out: |
48 | /* save current result. Parent: pid; child: retcode of mmap */ | 46 | /* save current result. |
49 | STUB_DATA(err) = err; | 47 | * Parent: pid; |
48 | * child: retcode of mmap already saved and it jumps around this | ||
49 | * assignment | ||
50 | */ | ||
51 | data->err = err; | ||
52 | done: | ||
50 | trap_myself(); | 53 | trap_myself(); |
51 | } | 54 | } |
diff --git a/arch/um/kernel/skas/include/uaccess-skas.h b/arch/um/kernel/skas/include/uaccess-skas.h index f611f83ad4ff..64516c556cdf 100644 --- a/arch/um/kernel/skas/include/uaccess-skas.h +++ b/arch/um/kernel/skas/include/uaccess-skas.h | |||
@@ -7,7 +7,6 @@ | |||
7 | #define __SKAS_UACCESS_H | 7 | #define __SKAS_UACCESS_H |
8 | 8 | ||
9 | #include "asm/errno.h" | 9 | #include "asm/errno.h" |
10 | #include "asm/fixmap.h" | ||
11 | 10 | ||
12 | /* No SKAS-specific checking. */ | 11 | /* No SKAS-specific checking. */ |
13 | #define access_ok_skas(type, addr, size) 0 | 12 | #define access_ok_skas(type, addr, size) 0 |
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules index b3fbf125709b..2e41cabd3d93 100644 --- a/arch/um/scripts/Makefile.rules +++ b/arch/um/scripts/Makefile.rules | |||
@@ -21,11 +21,6 @@ define unprofile | |||
21 | endef | 21 | endef |
22 | 22 | ||
23 | 23 | ||
24 | # The stubs and unmap.o can't try to call mcount or update basic block data | ||
25 | define unprofile | ||
26 | $(patsubst -pg,,$(patsubst -fprofile-arcs -ftest-coverage,,$(1))) | ||
27 | endef | ||
28 | |||
29 | # cmd_make_link checks to see if the $(foo-dir) variable starts with a /. If | 24 | # cmd_make_link checks to see if the $(foo-dir) variable starts with a /. If |
30 | # so, it's considered to be a path relative to $(srcdir) rather than | 25 | # so, it's considered to be a path relative to $(srcdir) rather than |
31 | # $(srcdir)/arch/$(SUBARCH). This is because x86_64 wants to get ldt.c from | 26 | # $(srcdir)/arch/$(SUBARCH). This is because x86_64 wants to get ldt.c from |
diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c index 830feb272eca..2b760d0d9ce2 100644 --- a/arch/x86_64/ia32/ia32_binfmt.c +++ b/arch/x86_64/ia32/ia32_binfmt.c | |||
@@ -217,8 +217,7 @@ elf_core_copy_task_fpregs(struct task_struct *tsk, struct pt_regs *regs, elf_fpr | |||
217 | if (!tsk_used_math(tsk)) | 217 | if (!tsk_used_math(tsk)) |
218 | return 0; | 218 | return 0; |
219 | if (!regs) | 219 | if (!regs) |
220 | regs = (struct pt_regs *)tsk->thread.rsp0; | 220 | regs = ((struct pt_regs *)tsk->thread.rsp0) - 1; |
221 | --regs; | ||
222 | if (tsk == current) | 221 | if (tsk == current) |
223 | unlazy_fpu(tsk); | 222 | unlazy_fpu(tsk); |
224 | set_fs(KERNEL_DS); | 223 | set_fs(KERNEL_DS); |
diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86_64/kernel/kprobes.c index dddeb678b440..afe11f4fbd1d 100644 --- a/arch/x86_64/kernel/kprobes.c +++ b/arch/x86_64/kernel/kprobes.c | |||
@@ -329,7 +329,7 @@ int __kprobes kprobe_handler(struct pt_regs *regs) | |||
329 | */ | 329 | */ |
330 | save_previous_kprobe(kcb); | 330 | save_previous_kprobe(kcb); |
331 | set_current_kprobe(p, regs, kcb); | 331 | set_current_kprobe(p, regs, kcb); |
332 | p->nmissed++; | 332 | kprobes_inc_nmissed_count(p); |
333 | prepare_singlestep(p, regs); | 333 | prepare_singlestep(p, regs); |
334 | kcb->kprobe_status = KPROBE_REENTER; | 334 | kcb->kprobe_status = KPROBE_REENTER; |
335 | return 1; | 335 | return 1; |
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c index 683c33f7b967..ecbd7b83acc1 100644 --- a/arch/x86_64/kernel/smpboot.c +++ b/arch/x86_64/kernel/smpboot.c | |||
@@ -1181,7 +1181,7 @@ int __cpu_disable(void) | |||
1181 | if (cpu == 0) | 1181 | if (cpu == 0) |
1182 | return -EBUSY; | 1182 | return -EBUSY; |
1183 | 1183 | ||
1184 | disable_APIC_timer(); | 1184 | clear_local_APIC(); |
1185 | 1185 | ||
1186 | /* | 1186 | /* |
1187 | * HACK: | 1187 | * HACK: |
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index fdaddc4e5284..74102796e5c0 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c | |||
@@ -59,7 +59,7 @@ static int notsc __initdata = 0; | |||
59 | unsigned int cpu_khz; /* TSC clocks / usec, not used here */ | 59 | unsigned int cpu_khz; /* TSC clocks / usec, not used here */ |
60 | static unsigned long hpet_period; /* fsecs / HPET clock */ | 60 | static unsigned long hpet_period; /* fsecs / HPET clock */ |
61 | unsigned long hpet_tick; /* HPET clocks / interrupt */ | 61 | unsigned long hpet_tick; /* HPET clocks / interrupt */ |
62 | static int hpet_use_timer; | 62 | static int hpet_use_timer; /* Use counter of hpet for time keeping, otherwise PIT */ |
63 | unsigned long vxtime_hz = PIT_TICK_RATE; | 63 | unsigned long vxtime_hz = PIT_TICK_RATE; |
64 | int report_lost_ticks; /* command line option */ | 64 | int report_lost_ticks; /* command line option */ |
65 | unsigned long long monotonic_base; | 65 | unsigned long long monotonic_base; |
@@ -908,12 +908,14 @@ void __init time_init(void) | |||
908 | if (!hpet_init()) | 908 | if (!hpet_init()) |
909 | vxtime_hz = (1000000000000000L + hpet_period / 2) / | 909 | vxtime_hz = (1000000000000000L + hpet_period / 2) / |
910 | hpet_period; | 910 | hpet_period; |
911 | else | ||
912 | vxtime.hpet_address = 0; | ||
911 | 913 | ||
912 | if (hpet_use_timer) { | 914 | if (hpet_use_timer) { |
913 | cpu_khz = hpet_calibrate_tsc(); | 915 | cpu_khz = hpet_calibrate_tsc(); |
914 | timename = "HPET"; | 916 | timename = "HPET"; |
915 | #ifdef CONFIG_X86_PM_TIMER | 917 | #ifdef CONFIG_X86_PM_TIMER |
916 | } else if (pmtmr_ioport) { | 918 | } else if (pmtmr_ioport && !vxtime.hpet_address) { |
917 | vxtime_hz = PM_TIMER_FREQUENCY; | 919 | vxtime_hz = PM_TIMER_FREQUENCY; |
918 | timename = "PM"; | 920 | timename = "PM"; |
919 | pit_init(); | 921 | pit_init(); |
diff --git a/arch/x86_64/mm/ioremap.c b/arch/x86_64/mm/ioremap.c index ecf7acb5db9b..ae207064201e 100644 --- a/arch/x86_64/mm/ioremap.c +++ b/arch/x86_64/mm/ioremap.c | |||
@@ -247,9 +247,15 @@ void __iomem *ioremap_nocache (unsigned long phys_addr, unsigned long size) | |||
247 | return __ioremap(phys_addr, size, _PAGE_PCD); | 247 | return __ioremap(phys_addr, size, _PAGE_PCD); |
248 | } | 248 | } |
249 | 249 | ||
250 | /** | ||
251 | * iounmap - Free a IO remapping | ||
252 | * @addr: virtual address from ioremap_* | ||
253 | * | ||
254 | * Caller must ensure there is only one unmapping for the same pointer. | ||
255 | */ | ||
250 | void iounmap(volatile void __iomem *addr) | 256 | void iounmap(volatile void __iomem *addr) |
251 | { | 257 | { |
252 | struct vm_struct *p; | 258 | struct vm_struct *p, *o; |
253 | 259 | ||
254 | if (addr <= high_memory) | 260 | if (addr <= high_memory) |
255 | return; | 261 | return; |
@@ -257,12 +263,31 @@ void iounmap(volatile void __iomem *addr) | |||
257 | addr < phys_to_virt(ISA_END_ADDRESS)) | 263 | addr < phys_to_virt(ISA_END_ADDRESS)) |
258 | return; | 264 | return; |
259 | 265 | ||
260 | write_lock(&vmlist_lock); | 266 | addr = (volatile void __iomem *)(PAGE_MASK & (unsigned long __force)addr); |
261 | p = __remove_vm_area((void *)((unsigned long)addr & PAGE_MASK)); | 267 | /* Use the vm area unlocked, assuming the caller |
262 | if (!p) | 268 | ensures there isn't another iounmap for the same address |
269 | in parallel. Reuse of the virtual address is prevented by | ||
270 | leaving it in the global lists until we're done with it. | ||
271 | cpa takes care of the direct mappings. */ | ||
272 | read_lock(&vmlist_lock); | ||
273 | for (p = vmlist; p; p = p->next) { | ||
274 | if (p->addr == addr) | ||
275 | break; | ||
276 | } | ||
277 | read_unlock(&vmlist_lock); | ||
278 | |||
279 | if (!p) { | ||
263 | printk("iounmap: bad address %p\n", addr); | 280 | printk("iounmap: bad address %p\n", addr); |
264 | else if (p->flags >> 20) | 281 | dump_stack(); |
282 | return; | ||
283 | } | ||
284 | |||
285 | /* Reset the direct mapping. Can block */ | ||
286 | if (p->flags >> 20) | ||
265 | ioremap_change_attr(p->phys_addr, p->size, 0); | 287 | ioremap_change_attr(p->phys_addr, p->size, 0); |
266 | write_unlock(&vmlist_lock); | 288 | |
289 | /* Finally remove it */ | ||
290 | o = remove_vm_area((void *)addr); | ||
291 | BUG_ON(p != o || o == NULL); | ||
267 | kfree(p); | 292 | kfree(p); |
268 | } | 293 | } |
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c index a828a01739cc..15b67d2760cb 100644 --- a/arch/x86_64/mm/numa.c +++ b/arch/x86_64/mm/numa.c | |||
@@ -53,6 +53,8 @@ static int __init populate_memnodemap( | |||
53 | int res = -1; | 53 | int res = -1; |
54 | unsigned long addr, end; | 54 | unsigned long addr, end; |
55 | 55 | ||
56 | if (shift >= 64) | ||
57 | return -1; | ||
56 | memset(memnodemap, 0xff, sizeof(memnodemap)); | 58 | memset(memnodemap, 0xff, sizeof(memnodemap)); |
57 | for (i = 0; i < numnodes; i++) { | 59 | for (i = 0; i < numnodes; i++) { |
58 | addr = nodes[i].start; | 60 | addr = nodes[i].start; |
@@ -65,7 +67,7 @@ static int __init populate_memnodemap( | |||
65 | if (memnodemap[addr >> shift] != 0xff) | 67 | if (memnodemap[addr >> shift] != 0xff) |
66 | return -1; | 68 | return -1; |
67 | memnodemap[addr >> shift] = i; | 69 | memnodemap[addr >> shift] = i; |
68 | addr += (1 << shift); | 70 | addr += (1UL << shift); |
69 | } while (addr < end); | 71 | } while (addr < end); |
70 | res = 1; | 72 | res = 1; |
71 | } | 73 | } |
diff --git a/arch/x86_64/pci/Makefile b/arch/x86_64/pci/Makefile index bb34e5ef916c..a8f75a2a0f6f 100644 --- a/arch/x86_64/pci/Makefile +++ b/arch/x86_64/pci/Makefile | |||
@@ -11,7 +11,7 @@ obj-y += fixup.o | |||
11 | obj-$(CONFIG_ACPI) += acpi.o | 11 | obj-$(CONFIG_ACPI) += acpi.o |
12 | obj-y += legacy.o irq.o common.o | 12 | obj-y += legacy.o irq.o common.o |
13 | # mmconfig has a 64bit special | 13 | # mmconfig has a 64bit special |
14 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o | 14 | obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o direct.o |
15 | 15 | ||
16 | obj-$(CONFIG_NUMA) += k8-bus.o | 16 | obj-$(CONFIG_NUMA) += k8-bus.o |
17 | 17 | ||
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c index a0838c4a94e4..f16c0d57c552 100644 --- a/arch/x86_64/pci/mmconfig.c +++ b/arch/x86_64/pci/mmconfig.c | |||
@@ -8,18 +8,21 @@ | |||
8 | #include <linux/pci.h> | 8 | #include <linux/pci.h> |
9 | #include <linux/init.h> | 9 | #include <linux/init.h> |
10 | #include <linux/acpi.h> | 10 | #include <linux/acpi.h> |
11 | #include <linux/bitmap.h> | ||
11 | #include "pci.h" | 12 | #include "pci.h" |
12 | 13 | ||
13 | #define MMCONFIG_APER_SIZE (256*1024*1024) | 14 | #define MMCONFIG_APER_SIZE (256*1024*1024) |
14 | 15 | ||
16 | static DECLARE_BITMAP(fallback_slots, 32); | ||
17 | |||
15 | /* Static virtual mapping of the MMCONFIG aperture */ | 18 | /* Static virtual mapping of the MMCONFIG aperture */ |
16 | struct mmcfg_virt { | 19 | struct mmcfg_virt { |
17 | struct acpi_table_mcfg_config *cfg; | 20 | struct acpi_table_mcfg_config *cfg; |
18 | char *virt; | 21 | char __iomem *virt; |
19 | }; | 22 | }; |
20 | static struct mmcfg_virt *pci_mmcfg_virt; | 23 | static struct mmcfg_virt *pci_mmcfg_virt; |
21 | 24 | ||
22 | static char *get_virt(unsigned int seg, int bus) | 25 | static char __iomem *get_virt(unsigned int seg, unsigned bus) |
23 | { | 26 | { |
24 | int cfg_num = -1; | 27 | int cfg_num = -1; |
25 | struct acpi_table_mcfg_config *cfg; | 28 | struct acpi_table_mcfg_config *cfg; |
@@ -27,10 +30,9 @@ static char *get_virt(unsigned int seg, int bus) | |||
27 | while (1) { | 30 | while (1) { |
28 | ++cfg_num; | 31 | ++cfg_num; |
29 | if (cfg_num >= pci_mmcfg_config_num) { | 32 | if (cfg_num >= pci_mmcfg_config_num) { |
30 | /* something bad is going on, no cfg table is found. */ | 33 | /* Not found - fall back to type 1. This happens |
31 | /* so we fall back to the old way we used to do this */ | 34 | e.g. on the internal devices of a K8 northbridge. */ |
32 | /* and just rely on the first entry to be correct. */ | 35 | return NULL; |
33 | return pci_mmcfg_virt[0].virt; | ||
34 | } | 36 | } |
35 | cfg = pci_mmcfg_virt[cfg_num].cfg; | 37 | cfg = pci_mmcfg_virt[cfg_num].cfg; |
36 | if (cfg->pci_segment_group_number != seg) | 38 | if (cfg->pci_segment_group_number != seg) |
@@ -41,20 +43,30 @@ static char *get_virt(unsigned int seg, int bus) | |||
41 | } | 43 | } |
42 | } | 44 | } |
43 | 45 | ||
44 | static inline char *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn) | 46 | static char __iomem *pci_dev_base(unsigned int seg, unsigned int bus, unsigned int devfn) |
45 | { | 47 | { |
46 | 48 | char __iomem *addr; | |
47 | return get_virt(seg, bus) + ((bus << 20) | (devfn << 12)); | 49 | if (seg == 0 && bus == 0 && test_bit(PCI_SLOT(devfn), &fallback_slots)) |
50 | return NULL; | ||
51 | addr = get_virt(seg, bus); | ||
52 | if (!addr) | ||
53 | return NULL; | ||
54 | return addr + ((bus << 20) | (devfn << 12)); | ||
48 | } | 55 | } |
49 | 56 | ||
50 | static int pci_mmcfg_read(unsigned int seg, unsigned int bus, | 57 | static int pci_mmcfg_read(unsigned int seg, unsigned int bus, |
51 | unsigned int devfn, int reg, int len, u32 *value) | 58 | unsigned int devfn, int reg, int len, u32 *value) |
52 | { | 59 | { |
53 | char *addr = pci_dev_base(seg, bus, devfn); | 60 | char __iomem *addr; |
54 | 61 | ||
62 | /* Why do we have this when nobody checks it. How about a BUG()!? -AK */ | ||
55 | if (unlikely(!value || (bus > 255) || (devfn > 255) || (reg > 4095))) | 63 | if (unlikely(!value || (bus > 255) || (devfn > 255) || (reg > 4095))) |
56 | return -EINVAL; | 64 | return -EINVAL; |
57 | 65 | ||
66 | addr = pci_dev_base(seg, bus, devfn); | ||
67 | if (!addr) | ||
68 | return pci_conf1_read(seg,bus,devfn,reg,len,value); | ||
69 | |||
58 | switch (len) { | 70 | switch (len) { |
59 | case 1: | 71 | case 1: |
60 | *value = readb(addr + reg); | 72 | *value = readb(addr + reg); |
@@ -73,11 +85,16 @@ static int pci_mmcfg_read(unsigned int seg, unsigned int bus, | |||
73 | static int pci_mmcfg_write(unsigned int seg, unsigned int bus, | 85 | static int pci_mmcfg_write(unsigned int seg, unsigned int bus, |
74 | unsigned int devfn, int reg, int len, u32 value) | 86 | unsigned int devfn, int reg, int len, u32 value) |
75 | { | 87 | { |
76 | char *addr = pci_dev_base(seg, bus, devfn); | 88 | char __iomem *addr; |
77 | 89 | ||
90 | /* Why do we have this when nobody checks it. How about a BUG()!? -AK */ | ||
78 | if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) | 91 | if (unlikely((bus > 255) || (devfn > 255) || (reg > 4095))) |
79 | return -EINVAL; | 92 | return -EINVAL; |
80 | 93 | ||
94 | addr = pci_dev_base(seg, bus, devfn); | ||
95 | if (!addr) | ||
96 | return pci_conf1_write(seg,bus,devfn,reg,len,value); | ||
97 | |||
81 | switch (len) { | 98 | switch (len) { |
82 | case 1: | 99 | case 1: |
83 | writeb(value, addr + reg); | 100 | writeb(value, addr + reg); |
@@ -98,6 +115,30 @@ static struct pci_raw_ops pci_mmcfg = { | |||
98 | .write = pci_mmcfg_write, | 115 | .write = pci_mmcfg_write, |
99 | }; | 116 | }; |
100 | 117 | ||
118 | /* K8 systems have some devices (typically in the builtin northbridge) | ||
119 | that are only accessible using type1 | ||
120 | Normally this can be expressed in the MCFG by not listing them | ||
121 | and assigning suitable _SEGs, but this isn't implemented in some BIOS. | ||
122 | Instead try to discover all devices on bus 0 that are unreachable using MM | ||
123 | and fallback for them. | ||
124 | We only do this for bus 0/seg 0 */ | ||
125 | static __init void unreachable_devices(void) | ||
126 | { | ||
127 | int i; | ||
128 | for (i = 0; i < 32; i++) { | ||
129 | u32 val1; | ||
130 | char __iomem *addr; | ||
131 | |||
132 | pci_conf1_read(0, 0, PCI_DEVFN(i,0), 0, 4, &val1); | ||
133 | if (val1 == 0xffffffff) | ||
134 | continue; | ||
135 | addr = pci_dev_base(0, 0, PCI_DEVFN(i, 0)); | ||
136 | if (addr == NULL|| readl(addr) != val1) { | ||
137 | set_bit(i, &fallback_slots); | ||
138 | } | ||
139 | } | ||
140 | } | ||
141 | |||
101 | static int __init pci_mmcfg_init(void) | 142 | static int __init pci_mmcfg_init(void) |
102 | { | 143 | { |
103 | int i; | 144 | int i; |
@@ -128,6 +169,8 @@ static int __init pci_mmcfg_init(void) | |||
128 | printk(KERN_INFO "PCI: Using MMCONFIG at %x\n", pci_mmcfg_config[i].base_address); | 169 | printk(KERN_INFO "PCI: Using MMCONFIG at %x\n", pci_mmcfg_config[i].base_address); |
129 | } | 170 | } |
130 | 171 | ||
172 | unreachable_devices(); | ||
173 | |||
131 | raw_pci_ops = &pci_mmcfg; | 174 | raw_pci_ops = &pci_mmcfg; |
132 | pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; | 175 | pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF; |
133 | 176 | ||
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index 382dea7b224c..6e7db2e79f42 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c | |||
@@ -442,11 +442,37 @@ error: | |||
442 | return err; | 442 | return err; |
443 | } | 443 | } |
444 | 444 | ||
445 | |||
446 | /* Send basic block requests */ | ||
447 | static int __blk_send_generic(request_queue_t *q, struct gendisk *bd_disk, int cmd, int data) | ||
448 | { | ||
449 | struct request *rq; | ||
450 | int err; | ||
451 | |||
452 | rq = blk_get_request(q, WRITE, __GFP_WAIT); | ||
453 | rq->flags |= REQ_BLOCK_PC; | ||
454 | rq->data = NULL; | ||
455 | rq->data_len = 0; | ||
456 | rq->timeout = BLK_DEFAULT_TIMEOUT; | ||
457 | memset(rq->cmd, 0, sizeof(rq->cmd)); | ||
458 | rq->cmd[0] = cmd; | ||
459 | rq->cmd[4] = data; | ||
460 | rq->cmd_len = 6; | ||
461 | err = blk_execute_rq(q, bd_disk, rq, 0); | ||
462 | blk_put_request(rq); | ||
463 | |||
464 | return err; | ||
465 | } | ||
466 | |||
467 | static inline int blk_send_start_stop(request_queue_t *q, struct gendisk *bd_disk, int data) | ||
468 | { | ||
469 | return __blk_send_generic(q, bd_disk, GPCMD_START_STOP_UNIT, data); | ||
470 | } | ||
471 | |||
445 | int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd, void __user *arg) | 472 | int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd, void __user *arg) |
446 | { | 473 | { |
447 | request_queue_t *q; | 474 | request_queue_t *q; |
448 | struct request *rq; | 475 | int err; |
449 | int close = 0, err; | ||
450 | 476 | ||
451 | q = bd_disk->queue; | 477 | q = bd_disk->queue; |
452 | if (!q) | 478 | if (!q) |
@@ -564,19 +590,10 @@ int scsi_cmd_ioctl(struct file *file, struct gendisk *bd_disk, unsigned int cmd, | |||
564 | err = sg_scsi_ioctl(file, q, bd_disk, arg); | 590 | err = sg_scsi_ioctl(file, q, bd_disk, arg); |
565 | break; | 591 | break; |
566 | case CDROMCLOSETRAY: | 592 | case CDROMCLOSETRAY: |
567 | close = 1; | 593 | err = blk_send_start_stop(q, bd_disk, 0x03); |
594 | break; | ||
568 | case CDROMEJECT: | 595 | case CDROMEJECT: |
569 | rq = blk_get_request(q, WRITE, __GFP_WAIT); | 596 | err = blk_send_start_stop(q, bd_disk, 0x02); |
570 | rq->flags |= REQ_BLOCK_PC; | ||
571 | rq->data = NULL; | ||
572 | rq->data_len = 0; | ||
573 | rq->timeout = BLK_DEFAULT_TIMEOUT; | ||
574 | memset(rq->cmd, 0, sizeof(rq->cmd)); | ||
575 | rq->cmd[0] = GPCMD_START_STOP_UNIT; | ||
576 | rq->cmd[4] = 0x02 + (close != 0); | ||
577 | rq->cmd_len = 6; | ||
578 | err = blk_execute_rq(q, bd_disk, rq, 0); | ||
579 | blk_put_request(rq); | ||
580 | break; | 597 | break; |
581 | default: | 598 | default: |
582 | err = -ENOTTY; | 599 | err = -ENOTTY; |
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 82292b77e5c6..78927c0f1551 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
@@ -316,7 +316,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) | |||
316 | if (!link || !irq) | 316 | if (!link || !irq) |
317 | return_VALUE(-EINVAL); | 317 | return_VALUE(-EINVAL); |
318 | 318 | ||
319 | resource = kmalloc(sizeof(*resource) + 1, GFP_KERNEL); | 319 | resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC); |
320 | if (!resource) | 320 | if (!resource) |
321 | return_VALUE(-ENOMEM); | 321 | return_VALUE(-ENOMEM); |
322 | 322 | ||
diff --git a/drivers/atm/adummy.c b/drivers/atm/adummy.c index d15c194be44a..d1387cfe2d30 100644 --- a/drivers/atm/adummy.c +++ b/drivers/atm/adummy.c | |||
@@ -123,7 +123,7 @@ static int __init adummy_init(void) | |||
123 | } | 123 | } |
124 | memset(adummy_dev, 0, sizeof(struct adummy_dev)); | 124 | memset(adummy_dev, 0, sizeof(struct adummy_dev)); |
125 | 125 | ||
126 | atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, 0); | 126 | atm_dev = atm_dev_register(DEV_LABEL, &adummy_ops, -1, NULL); |
127 | if (!atm_dev) { | 127 | if (!atm_dev) { |
128 | printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n"); | 128 | printk(KERN_ERR DEV_LABEL ": atm_dev_register() failed\n"); |
129 | err = -ENODEV; | 129 | err = -ENODEV; |
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index b7ddd651d664..bc3ca6a656b2 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c | |||
@@ -28,7 +28,6 @@ | |||
28 | static struct sysdev_class memory_sysdev_class = { | 28 | static struct sysdev_class memory_sysdev_class = { |
29 | set_kset_name(MEMORY_CLASS_NAME), | 29 | set_kset_name(MEMORY_CLASS_NAME), |
30 | }; | 30 | }; |
31 | EXPORT_SYMBOL(memory_sysdev_class); | ||
32 | 31 | ||
33 | static char *memory_hotplug_name(struct kset *kset, struct kobject *kobj) | 32 | static char *memory_hotplug_name(struct kset *kset, struct kobject *kobj) |
34 | { | 33 | { |
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index a9e33db46e68..c3441b3f086e 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -1146,7 +1146,6 @@ static int revalidate_allvol(ctlr_info_t *host) | |||
1146 | del_gendisk(disk); | 1146 | del_gendisk(disk); |
1147 | if (q) | 1147 | if (q) |
1148 | blk_cleanup_queue(q); | 1148 | blk_cleanup_queue(q); |
1149 | put_disk(disk); | ||
1150 | } | 1149 | } |
1151 | } | 1150 | } |
1152 | 1151 | ||
@@ -1465,9 +1464,10 @@ static int deregister_disk(struct gendisk *disk, drive_info_struct *drv, | |||
1465 | request_queue_t *q = disk->queue; | 1464 | request_queue_t *q = disk->queue; |
1466 | if (disk->flags & GENHD_FL_UP) | 1465 | if (disk->flags & GENHD_FL_UP) |
1467 | del_gendisk(disk); | 1466 | del_gendisk(disk); |
1468 | if (q) | 1467 | if (q) { |
1469 | blk_cleanup_queue(q); | 1468 | blk_cleanup_queue(q); |
1470 | put_disk(disk); | 1469 | drv->queue = NULL; |
1470 | } | ||
1471 | } | 1471 | } |
1472 | } | 1472 | } |
1473 | 1473 | ||
@@ -3243,7 +3243,6 @@ static void __devexit cciss_remove_one (struct pci_dev *pdev) | |||
3243 | del_gendisk(disk); | 3243 | del_gendisk(disk); |
3244 | if (q) | 3244 | if (q) |
3245 | blk_cleanup_queue(q); | 3245 | blk_cleanup_queue(q); |
3246 | put_disk(disk); | ||
3247 | } | 3246 | } |
3248 | } | 3247 | } |
3249 | 3248 | ||
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 970f70d498f4..696f72787fe8 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -687,7 +687,7 @@ config NVRAM | |||
687 | 687 | ||
688 | config RTC | 688 | config RTC |
689 | tristate "Enhanced Real Time Clock Support" | 689 | tristate "Enhanced Real Time Clock Support" |
690 | depends on !PPC32 && !PARISC && !IA64 && !M68K | 690 | depends on !PPC32 && !PARISC && !IA64 && !M68K && (!(SPARC32 || SPARC64) || PCI) |
691 | ---help--- | 691 | ---help--- |
692 | If you say Y here and create a character special file /dev/rtc with | 692 | If you say Y here and create a character special file /dev/rtc with |
693 | major number 10 and minor number 135 using mknod ("man mknod"), you | 693 | major number 10 and minor number 135 using mknod ("man mknod"), you |
@@ -943,6 +943,15 @@ config RAW_DRIVER | |||
943 | Applications should simply open the device (eg /dev/hda1) | 943 | Applications should simply open the device (eg /dev/hda1) |
944 | with the O_DIRECT flag. | 944 | with the O_DIRECT flag. |
945 | 945 | ||
946 | config MAX_RAW_DEVS | ||
947 | int "Maximum number of RAW devices to support (1-8192)" | ||
948 | depends on RAW_DRIVER | ||
949 | default "256" | ||
950 | help | ||
951 | The maximum number of RAW devices that are supported. | ||
952 | Default is 256. Increase this number in case you need lots of | ||
953 | raw devices. | ||
954 | |||
946 | config HPET | 955 | config HPET |
947 | bool "HPET - High Precision Event Timer" if (X86 || IA64) | 956 | bool "HPET - High Precision Event Timer" if (X86 || IA64) |
948 | default n | 957 | default n |
@@ -974,15 +983,6 @@ config HPET_MMAP | |||
974 | exposed to the user. If this applies to your hardware, | 983 | exposed to the user. If this applies to your hardware, |
975 | say N here. | 984 | say N here. |
976 | 985 | ||
977 | config MAX_RAW_DEVS | ||
978 | int "Maximum number of RAW devices to support (1-8192)" | ||
979 | depends on RAW_DRIVER | ||
980 | default "256" | ||
981 | help | ||
982 | The maximum number of RAW devices that are supported. | ||
983 | Default is 256. Increase this number in case you need lots of | ||
984 | raw devices. | ||
985 | |||
986 | config HANGCHECK_TIMER | 986 | config HANGCHECK_TIMER |
987 | tristate "Hangcheck timer" | 987 | tristate "Hangcheck timer" |
988 | depends on X86 || IA64 || PPC64 || ARCH_S390 | 988 | depends on X86 || IA64 || PPC64 || ARCH_S390 |
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c index 03839ea31092..501e557cbc86 100644 --- a/drivers/char/drm/radeon_cp.c +++ b/drivers/char/drm/radeon_cp.c | |||
@@ -1311,7 +1311,9 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on) | |||
1311 | 1311 | ||
1312 | static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) | 1312 | static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) |
1313 | { | 1313 | { |
1314 | drm_radeon_private_t *dev_priv = dev->dev_private;; | 1314 | drm_radeon_private_t *dev_priv = dev->dev_private; |
1315 | unsigned int mem_size; | ||
1316 | |||
1315 | DRM_DEBUG("\n"); | 1317 | DRM_DEBUG("\n"); |
1316 | 1318 | ||
1317 | dev_priv->is_pci = init->is_pci; | 1319 | dev_priv->is_pci = init->is_pci; |
@@ -1521,8 +1523,11 @@ static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init) | |||
1521 | + dev_priv->fb_location) >> 10)); | 1523 | + dev_priv->fb_location) >> 10)); |
1522 | 1524 | ||
1523 | dev_priv->gart_size = init->gart_size; | 1525 | dev_priv->gart_size = init->gart_size; |
1524 | dev_priv->gart_vm_start = dev_priv->fb_location | 1526 | |
1525 | + RADEON_READ(RADEON_CONFIG_APER_SIZE); | 1527 | mem_size = RADEON_READ(RADEON_CONFIG_MEMSIZE); |
1528 | if (mem_size == 0) | ||
1529 | mem_size = 0x800000; | ||
1530 | dev_priv->gart_vm_start = dev_priv->fb_location + mem_size; | ||
1526 | 1531 | ||
1527 | #if __OS_HAS_AGP | 1532 | #if __OS_HAS_AGP |
1528 | if (!dev_priv->is_pci) | 1533 | if (!dev_priv->is_pci) |
diff --git a/drivers/char/drm/radeon_drv.h b/drivers/char/drm/radeon_drv.h index 7bda7e33d2bd..d92ccee3e54c 100644 --- a/drivers/char/drm/radeon_drv.h +++ b/drivers/char/drm/radeon_drv.h | |||
@@ -379,6 +379,7 @@ extern int r300_do_cp_cmdbuf(drm_device_t * dev, DRMFILE filp, | |||
379 | # define RADEON_PLL_WR_EN (1 << 7) | 379 | # define RADEON_PLL_WR_EN (1 << 7) |
380 | #define RADEON_CLOCK_CNTL_INDEX 0x0008 | 380 | #define RADEON_CLOCK_CNTL_INDEX 0x0008 |
381 | #define RADEON_CONFIG_APER_SIZE 0x0108 | 381 | #define RADEON_CONFIG_APER_SIZE 0x0108 |
382 | #define RADEON_CONFIG_MEMSIZE 0x00f8 | ||
382 | #define RADEON_CRTC_OFFSET 0x0224 | 383 | #define RADEON_CRTC_OFFSET 0x0224 |
383 | #define RADEON_CRTC_OFFSET_CNTL 0x0228 | 384 | #define RADEON_CRTC_OFFSET_CNTL 0x0228 |
384 | # define RADEON_CRTC_TILE_EN (1 << 15) | 385 | # define RADEON_CRTC_TILE_EN (1 << 15) |
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 6b302a930e5f..1f56b4cf0f58 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c | |||
@@ -2986,7 +2986,7 @@ static void send_panic_events(char *str) | |||
2986 | msg.cmd = 2; /* Platform event command. */ | 2986 | msg.cmd = 2; /* Platform event command. */ |
2987 | msg.data = data; | 2987 | msg.data = data; |
2988 | msg.data_len = 8; | 2988 | msg.data_len = 8; |
2989 | data[0] = 0x21; /* Kernel generator ID, IPMI table 5-4 */ | 2989 | data[0] = 0x41; /* Kernel generator ID, IPMI table 5-4 */ |
2990 | data[1] = 0x03; /* This is for IPMI 1.0. */ | 2990 | data[1] = 0x03; /* This is for IPMI 1.0. */ |
2991 | data[2] = 0x20; /* OS Critical Stop, IPMI table 36-3 */ | 2991 | data[2] = 0x20; /* OS Critical Stop, IPMI table 36-3 */ |
2992 | data[4] = 0x6f; /* Sensor specific, IPMI table 36-1 */ | 2992 | data[4] = 0x6f; /* Sensor specific, IPMI table 36-1 */ |
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 01a1f6badb53..beea450ee4b2 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c | |||
@@ -2399,7 +2399,8 @@ static int init_one_smi(int intf_num, struct smi_info **smi) | |||
2399 | new_smi->handlers->cleanup(new_smi->si_sm); | 2399 | new_smi->handlers->cleanup(new_smi->si_sm); |
2400 | kfree(new_smi->si_sm); | 2400 | kfree(new_smi->si_sm); |
2401 | } | 2401 | } |
2402 | new_smi->io_cleanup(new_smi); | 2402 | if (new_smi->io_cleanup) |
2403 | new_smi->io_cleanup(new_smi); | ||
2403 | 2404 | ||
2404 | return rv; | 2405 | return rv; |
2405 | } | 2406 | } |
@@ -2518,7 +2519,8 @@ static void __exit cleanup_one_si(struct smi_info *to_clean) | |||
2518 | 2519 | ||
2519 | kfree(to_clean->si_sm); | 2520 | kfree(to_clean->si_sm); |
2520 | 2521 | ||
2521 | to_clean->io_cleanup(to_clean); | 2522 | if (to_clean->io_cleanup) |
2523 | to_clean->io_cleanup(to_clean); | ||
2522 | } | 2524 | } |
2523 | 2525 | ||
2524 | static __exit void cleanup_ipmi_si(void) | 2526 | static __exit void cleanup_ipmi_si(void) |
diff --git a/drivers/char/mwave/mwavepub.h b/drivers/char/mwave/mwavepub.h index f1f9da7a65c1..60c961ae23b4 100644 --- a/drivers/char/mwave/mwavepub.h +++ b/drivers/char/mwave/mwavepub.h | |||
@@ -69,7 +69,7 @@ typedef struct _MW_ABILITIES { | |||
69 | typedef struct _MW_READWRITE { | 69 | typedef struct _MW_READWRITE { |
70 | unsigned short usDspAddress; /* The dsp address */ | 70 | unsigned short usDspAddress; /* The dsp address */ |
71 | unsigned long ulDataLength; /* The size in bytes of the data or user buffer */ | 71 | unsigned long ulDataLength; /* The size in bytes of the data or user buffer */ |
72 | void *pBuf; /* Input:variable sized buffer */ | 72 | void __user *pBuf; /* Input:variable sized buffer */ |
73 | } MW_READWRITE, *pMW_READWRITE; | 73 | } MW_READWRITE, *pMW_READWRITE; |
74 | 74 | ||
75 | #define IOCTL_MW_RESET _IO(MWAVE_MINOR,1) | 75 | #define IOCTL_MW_RESET _IO(MWAVE_MINOR,1) |
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index ef011ef5dc46..61681c9f3f72 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c | |||
@@ -1444,6 +1444,7 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, | |||
1444 | dev_link_t *link; | 1444 | dev_link_t *link; |
1445 | int size; | 1445 | int size; |
1446 | int rc; | 1446 | int rc; |
1447 | void __user *argp = (void __user *)arg; | ||
1447 | #ifdef PCMCIA_DEBUG | 1448 | #ifdef PCMCIA_DEBUG |
1448 | char *ioctl_names[CM_IOC_MAXNR + 1] = { | 1449 | char *ioctl_names[CM_IOC_MAXNR + 1] = { |
1449 | [_IOC_NR(CM_IOCGSTATUS)] "CM_IOCGSTATUS", | 1450 | [_IOC_NR(CM_IOCGSTATUS)] "CM_IOCGSTATUS", |
@@ -1481,11 +1482,11 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, | |||
1481 | _IOC_DIR(cmd), _IOC_READ, _IOC_WRITE, size, cmd); | 1482 | _IOC_DIR(cmd), _IOC_READ, _IOC_WRITE, size, cmd); |
1482 | 1483 | ||
1483 | if (_IOC_DIR(cmd) & _IOC_READ) { | 1484 | if (_IOC_DIR(cmd) & _IOC_READ) { |
1484 | if (!access_ok(VERIFY_WRITE, (void *)arg, size)) | 1485 | if (!access_ok(VERIFY_WRITE, argp, size)) |
1485 | return -EFAULT; | 1486 | return -EFAULT; |
1486 | } | 1487 | } |
1487 | if (_IOC_DIR(cmd) & _IOC_WRITE) { | 1488 | if (_IOC_DIR(cmd) & _IOC_WRITE) { |
1488 | if (!access_ok(VERIFY_READ, (void *)arg, size)) | 1489 | if (!access_ok(VERIFY_READ, argp, size)) |
1489 | return -EFAULT; | 1490 | return -EFAULT; |
1490 | } | 1491 | } |
1491 | 1492 | ||
@@ -1506,14 +1507,14 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, | |||
1506 | status |= CM_NO_READER; | 1507 | status |= CM_NO_READER; |
1507 | if (test_bit(IS_BAD_CARD, &dev->flags)) | 1508 | if (test_bit(IS_BAD_CARD, &dev->flags)) |
1508 | status |= CM_BAD_CARD; | 1509 | status |= CM_BAD_CARD; |
1509 | if (copy_to_user((int *)arg, &status, sizeof(int))) | 1510 | if (copy_to_user(argp, &status, sizeof(int))) |
1510 | return -EFAULT; | 1511 | return -EFAULT; |
1511 | } | 1512 | } |
1512 | return 0; | 1513 | return 0; |
1513 | case CM_IOCGATR: | 1514 | case CM_IOCGATR: |
1514 | DEBUGP(4, dev, "... in CM_IOCGATR\n"); | 1515 | DEBUGP(4, dev, "... in CM_IOCGATR\n"); |
1515 | { | 1516 | { |
1516 | struct atreq *atreq = (struct atreq *) arg; | 1517 | struct atreq __user *atreq = argp; |
1517 | int tmp; | 1518 | int tmp; |
1518 | /* allow nonblocking io and being interrupted */ | 1519 | /* allow nonblocking io and being interrupted */ |
1519 | if (wait_event_interruptible | 1520 | if (wait_event_interruptible |
@@ -1597,7 +1598,7 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, | |||
1597 | { | 1598 | { |
1598 | struct ptsreq krnptsreq; | 1599 | struct ptsreq krnptsreq; |
1599 | 1600 | ||
1600 | if (copy_from_user(&krnptsreq, (struct ptsreq *) arg, | 1601 | if (copy_from_user(&krnptsreq, argp, |
1601 | sizeof(struct ptsreq))) | 1602 | sizeof(struct ptsreq))) |
1602 | return -EFAULT; | 1603 | return -EFAULT; |
1603 | 1604 | ||
@@ -1641,7 +1642,7 @@ static int cmm_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, | |||
1641 | int old_pc_debug = 0; | 1642 | int old_pc_debug = 0; |
1642 | 1643 | ||
1643 | old_pc_debug = pc_debug; | 1644 | old_pc_debug = pc_debug; |
1644 | if (copy_from_user(&pc_debug, (int *)arg, sizeof(int))) | 1645 | if (copy_from_user(&pc_debug, argp, sizeof(int))) |
1645 | return -EFAULT; | 1646 | return -EFAULT; |
1646 | 1647 | ||
1647 | if (old_pc_debug != pc_debug) | 1648 | if (old_pc_debug != pc_debug) |
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c index 65830ec71042..b6640606b44d 100644 --- a/drivers/char/watchdog/booke_wdt.c +++ b/drivers/char/watchdog/booke_wdt.c | |||
@@ -72,7 +72,7 @@ static __inline__ void booke_wdt_ping(void) | |||
72 | /* | 72 | /* |
73 | * booke_wdt_write: | 73 | * booke_wdt_write: |
74 | */ | 74 | */ |
75 | static ssize_t booke_wdt_write (struct file *file, const char *buf, | 75 | static ssize_t booke_wdt_write (struct file *file, const char __user *buf, |
76 | size_t count, loff_t *ppos) | 76 | size_t count, loff_t *ppos) |
77 | { | 77 | { |
78 | booke_wdt_ping(); | 78 | booke_wdt_ping(); |
@@ -92,14 +92,15 @@ static int booke_wdt_ioctl (struct inode *inode, struct file *file, | |||
92 | unsigned int cmd, unsigned long arg) | 92 | unsigned int cmd, unsigned long arg) |
93 | { | 93 | { |
94 | u32 tmp = 0; | 94 | u32 tmp = 0; |
95 | u32 __user *p = (u32 __user *)arg; | ||
95 | 96 | ||
96 | switch (cmd) { | 97 | switch (cmd) { |
97 | case WDIOC_GETSUPPORT: | 98 | case WDIOC_GETSUPPORT: |
98 | if (copy_to_user ((struct watchdog_info *) arg, &ident, | 99 | if (copy_to_user ((struct watchdog_info __user *) arg, &ident, |
99 | sizeof(struct watchdog_info))) | 100 | sizeof(struct watchdog_info))) |
100 | return -EFAULT; | 101 | return -EFAULT; |
101 | case WDIOC_GETSTATUS: | 102 | case WDIOC_GETSTATUS: |
102 | return put_user(ident.options, (u32 *) arg); | 103 | return put_user(ident.options, p); |
103 | case WDIOC_GETBOOTSTATUS: | 104 | case WDIOC_GETBOOTSTATUS: |
104 | /* XXX: something is clearing TSR */ | 105 | /* XXX: something is clearing TSR */ |
105 | tmp = mfspr(SPRN_TSR) & TSR_WRS(3); | 106 | tmp = mfspr(SPRN_TSR) & TSR_WRS(3); |
@@ -109,14 +110,14 @@ static int booke_wdt_ioctl (struct inode *inode, struct file *file, | |||
109 | booke_wdt_ping(); | 110 | booke_wdt_ping(); |
110 | return 0; | 111 | return 0; |
111 | case WDIOC_SETTIMEOUT: | 112 | case WDIOC_SETTIMEOUT: |
112 | if (get_user(booke_wdt_period, (u32 *) arg)) | 113 | if (get_user(booke_wdt_period, p)) |
113 | return -EFAULT; | 114 | return -EFAULT; |
114 | mtspr(SPRN_TCR, (mfspr(SPRN_TCR)&~WDTP(0))|WDTP(booke_wdt_period)); | 115 | mtspr(SPRN_TCR, (mfspr(SPRN_TCR)&~WDTP(0))|WDTP(booke_wdt_period)); |
115 | return 0; | 116 | return 0; |
116 | case WDIOC_GETTIMEOUT: | 117 | case WDIOC_GETTIMEOUT: |
117 | return put_user(booke_wdt_period, (u32 *) arg); | 118 | return put_user(booke_wdt_period, p); |
118 | case WDIOC_SETOPTIONS: | 119 | case WDIOC_SETOPTIONS: |
119 | if (get_user(tmp, (u32 *) arg)) | 120 | if (get_user(tmp, p)) |
120 | return -EINVAL; | 121 | return -EINVAL; |
121 | if (tmp == WDIOS_ENABLECARD) { | 122 | if (tmp == WDIOS_ENABLECARD) { |
122 | booke_wdt_ping(); | 123 | booke_wdt_ping(); |
@@ -172,7 +173,7 @@ static int __init booke_wdt_init(void) | |||
172 | int ret = 0; | 173 | int ret = 0; |
173 | 174 | ||
174 | printk (KERN_INFO "PowerPC Book-E Watchdog Timer Loaded\n"); | 175 | printk (KERN_INFO "PowerPC Book-E Watchdog Timer Loaded\n"); |
175 | ident.firmware_version = cpu_specs[0].pvr_value; | 176 | ident.firmware_version = cur_cpu_spec->pvr_value; |
176 | 177 | ||
177 | ret = misc_register(&booke_wdt_miscdev); | 178 | ret = misc_register(&booke_wdt_miscdev); |
178 | if (ret) { | 179 | if (ret) { |
diff --git a/drivers/char/watchdog/mpcore_wdt.c b/drivers/char/watchdog/mpcore_wdt.c index 9defcf861b67..b4d843489881 100644 --- a/drivers/char/watchdog/mpcore_wdt.c +++ b/drivers/char/watchdog/mpcore_wdt.c | |||
@@ -180,10 +180,6 @@ static ssize_t mpcore_wdt_write(struct file *file, const char *data, size_t len, | |||
180 | { | 180 | { |
181 | struct mpcore_wdt *wdt = file->private_data; | 181 | struct mpcore_wdt *wdt = file->private_data; |
182 | 182 | ||
183 | /* Can't seek (pwrite) on this device */ | ||
184 | if (ppos != &file->f_pos) | ||
185 | return -ESPIPE; | ||
186 | |||
187 | /* | 183 | /* |
188 | * Refresh the timer. | 184 | * Refresh the timer. |
189 | */ | 185 | */ |
diff --git a/drivers/char/watchdog/wdrtas.c b/drivers/char/watchdog/wdrtas.c index 619e2ffca33f..dacfe31caccf 100644 --- a/drivers/char/watchdog/wdrtas.c +++ b/drivers/char/watchdog/wdrtas.c | |||
@@ -320,7 +320,7 @@ static int | |||
320 | wdrtas_ioctl(struct inode *inode, struct file *file, | 320 | wdrtas_ioctl(struct inode *inode, struct file *file, |
321 | unsigned int cmd, unsigned long arg) | 321 | unsigned int cmd, unsigned long arg) |
322 | { | 322 | { |
323 | int __user *argp = (void *)arg; | 323 | int __user *argp = (void __user *)arg; |
324 | int i; | 324 | int i; |
325 | static struct watchdog_info wdinfo = { | 325 | static struct watchdog_info wdinfo = { |
326 | .options = WDRTAS_SUPPORTED_MASK, | 326 | .options = WDRTAS_SUPPORTED_MASK, |
diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c index fcdf0fff13a6..969d2b4aaec0 100644 --- a/drivers/connector/cn_proc.c +++ b/drivers/connector/cn_proc.c | |||
@@ -56,6 +56,7 @@ void proc_fork_connector(struct task_struct *task) | |||
56 | msg = (struct cn_msg*)buffer; | 56 | msg = (struct cn_msg*)buffer; |
57 | ev = (struct proc_event*)msg->data; | 57 | ev = (struct proc_event*)msg->data; |
58 | get_seq(&msg->seq, &ev->cpu); | 58 | get_seq(&msg->seq, &ev->cpu); |
59 | getnstimestamp(&ev->timestamp); | ||
59 | ev->what = PROC_EVENT_FORK; | 60 | ev->what = PROC_EVENT_FORK; |
60 | ev->event_data.fork.parent_pid = task->real_parent->pid; | 61 | ev->event_data.fork.parent_pid = task->real_parent->pid; |
61 | ev->event_data.fork.parent_tgid = task->real_parent->tgid; | 62 | ev->event_data.fork.parent_tgid = task->real_parent->tgid; |
@@ -81,6 +82,7 @@ void proc_exec_connector(struct task_struct *task) | |||
81 | msg = (struct cn_msg*)buffer; | 82 | msg = (struct cn_msg*)buffer; |
82 | ev = (struct proc_event*)msg->data; | 83 | ev = (struct proc_event*)msg->data; |
83 | get_seq(&msg->seq, &ev->cpu); | 84 | get_seq(&msg->seq, &ev->cpu); |
85 | getnstimestamp(&ev->timestamp); | ||
84 | ev->what = PROC_EVENT_EXEC; | 86 | ev->what = PROC_EVENT_EXEC; |
85 | ev->event_data.exec.process_pid = task->pid; | 87 | ev->event_data.exec.process_pid = task->pid; |
86 | ev->event_data.exec.process_tgid = task->tgid; | 88 | ev->event_data.exec.process_tgid = task->tgid; |
@@ -114,6 +116,7 @@ void proc_id_connector(struct task_struct *task, int which_id) | |||
114 | } else | 116 | } else |
115 | return; | 117 | return; |
116 | get_seq(&msg->seq, &ev->cpu); | 118 | get_seq(&msg->seq, &ev->cpu); |
119 | getnstimestamp(&ev->timestamp); | ||
117 | 120 | ||
118 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); | 121 | memcpy(&msg->id, &cn_proc_event_id, sizeof(msg->id)); |
119 | msg->ack = 0; /* not used */ | 122 | msg->ack = 0; /* not used */ |
@@ -133,6 +136,7 @@ void proc_exit_connector(struct task_struct *task) | |||
133 | msg = (struct cn_msg*)buffer; | 136 | msg = (struct cn_msg*)buffer; |
134 | ev = (struct proc_event*)msg->data; | 137 | ev = (struct proc_event*)msg->data; |
135 | get_seq(&msg->seq, &ev->cpu); | 138 | get_seq(&msg->seq, &ev->cpu); |
139 | getnstimestamp(&ev->timestamp); | ||
136 | ev->what = PROC_EVENT_EXIT; | 140 | ev->what = PROC_EVENT_EXIT; |
137 | ev->event_data.exit.process_pid = task->pid; | 141 | ev->event_data.exit.process_pid = task->pid; |
138 | ev->event_data.exit.process_tgid = task->tgid; | 142 | ev->event_data.exit.process_tgid = task->tgid; |
@@ -165,6 +169,7 @@ static void cn_proc_ack(int err, int rcvd_seq, int rcvd_ack) | |||
165 | msg = (struct cn_msg*)buffer; | 169 | msg = (struct cn_msg*)buffer; |
166 | ev = (struct proc_event*)msg->data; | 170 | ev = (struct proc_event*)msg->data; |
167 | msg->seq = rcvd_seq; | 171 | msg->seq = rcvd_seq; |
172 | getnstimestamp(&ev->timestamp); | ||
168 | ev->cpu = -1; | 173 | ev->cpu = -1; |
169 | ev->what = PROC_EVENT_NONE; | 174 | ev->what = PROC_EVENT_NONE; |
170 | ev->event_data.ack.err = err; | 175 | ev->event_data.ack.err = err; |
diff --git a/drivers/firmware/dell_rbu.c b/drivers/firmware/dell_rbu.c index 6d83299e7c9b..dfedb777d8c9 100644 --- a/drivers/firmware/dell_rbu.c +++ b/drivers/firmware/dell_rbu.c | |||
@@ -105,8 +105,8 @@ static int create_packet(void *data, size_t length) | |||
105 | int ordernum = 0; | 105 | int ordernum = 0; |
106 | int retval = 0; | 106 | int retval = 0; |
107 | unsigned int packet_array_size = 0; | 107 | unsigned int packet_array_size = 0; |
108 | void **invalid_addr_packet_array = 0; | 108 | void **invalid_addr_packet_array = NULL; |
109 | void *packet_data_temp_buf = 0; | 109 | void *packet_data_temp_buf = NULL; |
110 | unsigned int idx = 0; | 110 | unsigned int idx = 0; |
111 | 111 | ||
112 | pr_debug("create_packet: entry \n"); | 112 | pr_debug("create_packet: entry \n"); |
@@ -178,7 +178,7 @@ static int create_packet(void *data, size_t length) | |||
178 | packet_data_temp_buf), | 178 | packet_data_temp_buf), |
179 | allocation_floor); | 179 | allocation_floor); |
180 | invalid_addr_packet_array[idx++] = packet_data_temp_buf; | 180 | invalid_addr_packet_array[idx++] = packet_data_temp_buf; |
181 | packet_data_temp_buf = 0; | 181 | packet_data_temp_buf = NULL; |
182 | } | 182 | } |
183 | } | 183 | } |
184 | spin_lock(&rbu_data.lock); | 184 | spin_lock(&rbu_data.lock); |
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index afd7634e5cc9..81031eb51056 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c | |||
@@ -529,14 +529,15 @@ mv64xxx_i2c_probe(struct platform_device *pd) | |||
529 | i2c_set_adapdata(&drv_data->adapter, drv_data); | 529 | i2c_set_adapdata(&drv_data->adapter, drv_data); |
530 | 530 | ||
531 | if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0, | 531 | if (request_irq(drv_data->irq, mv64xxx_i2c_intr, 0, |
532 | MV64XXX_I2C_CTLR_NAME, drv_data)) { | 532 | MV64XXX_I2C_CTLR_NAME, drv_data)) { |
533 | 533 | dev_err(&drv_data->adapter.dev, | |
534 | dev_err(dev, "mv64xxx: Can't register intr handler " | 534 | "mv64xxx: Can't register intr handler irq: %d\n", |
535 | "irq: %d\n", drv_data->irq); | 535 | drv_data->irq); |
536 | rc = -EINVAL; | 536 | rc = -EINVAL; |
537 | goto exit_unmap_regs; | 537 | goto exit_unmap_regs; |
538 | } else if ((rc = i2c_add_adapter(&drv_data->adapter)) != 0) { | 538 | } else if ((rc = i2c_add_adapter(&drv_data->adapter)) != 0) { |
539 | dev_err(dev, "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc); | 539 | dev_err(&drv_data->adapter.dev, |
540 | "mv64xxx: Can't add i2c adapter, rc: %d\n", -rc); | ||
540 | goto exit_free_irq; | 541 | goto exit_free_irq; |
541 | } | 542 | } |
542 | 543 | ||
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 31e649a9ff71..1c81174595b3 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -807,14 +807,6 @@ config BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | |||
807 | depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX | 807 | depends on SOC_AU1200 && BLK_DEV_IDE_AU1XXX |
808 | endchoice | 808 | endchoice |
809 | 809 | ||
810 | config BLK_DEV_IDE_AU1XXX_BURSTABLE_ON | ||
811 | bool "Enable burstable Mode on DbDMA" | ||
812 | default false | ||
813 | depends BLK_DEV_IDE_AU1XXX | ||
814 | help | ||
815 | This option enable the burstable Flag on DbDMA controller | ||
816 | (cf. "AMD Alchemy 'Au1200' Processor Data Book - PRELIMINARY"). | ||
817 | |||
818 | config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ | 810 | config BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ |
819 | int "Maximum transfer size (KB) per request (up to 128)" | 811 | int "Maximum transfer size (KB) per request (up to 128)" |
820 | default "128" | 812 | default "128" |
@@ -940,7 +932,7 @@ config BLK_DEV_Q40IDE | |||
940 | 932 | ||
941 | config BLK_DEV_MPC8xx_IDE | 933 | config BLK_DEV_MPC8xx_IDE |
942 | bool "MPC8xx IDE support" | 934 | bool "MPC8xx IDE support" |
943 | depends on 8xx | 935 | depends on 8xx && IDE=y && BLK_DEV_IDE=y |
944 | help | 936 | help |
945 | This option provides support for IDE on Motorola MPC8xx Systems. | 937 | This option provides support for IDE on Motorola MPC8xx Systems. |
946 | Please see 'Type of MPC8xx IDE interface' for details. | 938 | Please see 'Type of MPC8xx IDE interface' for details. |
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 9455e42abb23..b4d7a3efb90f 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -1292,7 +1292,6 @@ static ide_startstop_t cdrom_start_seek (ide_drive_t *drive, unsigned int block) | |||
1292 | struct cdrom_info *info = drive->driver_data; | 1292 | struct cdrom_info *info = drive->driver_data; |
1293 | 1293 | ||
1294 | info->dma = 0; | 1294 | info->dma = 0; |
1295 | info->cmd = 0; | ||
1296 | info->start_seek = jiffies; | 1295 | info->start_seek = jiffies; |
1297 | return cdrom_start_packet_command(drive, 0, cdrom_start_seek_continuation); | 1296 | return cdrom_start_packet_command(drive, 0, cdrom_start_seek_continuation); |
1298 | } | 1297 | } |
@@ -1344,8 +1343,6 @@ static ide_startstop_t cdrom_start_read (ide_drive_t *drive, unsigned int block) | |||
1344 | (rq->nr_sectors & (sectors_per_frame - 1))) | 1343 | (rq->nr_sectors & (sectors_per_frame - 1))) |
1345 | info->dma = 0; | 1344 | info->dma = 0; |
1346 | 1345 | ||
1347 | info->cmd = READ; | ||
1348 | |||
1349 | /* Start sending the read request to the drive. */ | 1346 | /* Start sending the read request to the drive. */ |
1350 | return cdrom_start_packet_command(drive, 32768, cdrom_start_read_continuation); | 1347 | return cdrom_start_packet_command(drive, 32768, cdrom_start_read_continuation); |
1351 | } | 1348 | } |
@@ -1484,7 +1481,6 @@ static ide_startstop_t cdrom_do_packet_command (ide_drive_t *drive) | |||
1484 | struct cdrom_info *info = drive->driver_data; | 1481 | struct cdrom_info *info = drive->driver_data; |
1485 | 1482 | ||
1486 | info->dma = 0; | 1483 | info->dma = 0; |
1487 | info->cmd = 0; | ||
1488 | rq->flags &= ~REQ_FAILED; | 1484 | rq->flags &= ~REQ_FAILED; |
1489 | len = rq->data_len; | 1485 | len = rq->data_len; |
1490 | 1486 | ||
@@ -1891,7 +1887,6 @@ static ide_startstop_t cdrom_start_write(ide_drive_t *drive, struct request *rq) | |||
1891 | /* use dma, if possible. we don't need to check more, since we | 1887 | /* use dma, if possible. we don't need to check more, since we |
1892 | * know that the transfer is always (at least!) frame aligned */ | 1888 | * know that the transfer is always (at least!) frame aligned */ |
1893 | info->dma = drive->using_dma ? 1 : 0; | 1889 | info->dma = drive->using_dma ? 1 : 0; |
1894 | info->cmd = WRITE; | ||
1895 | 1890 | ||
1896 | info->devinfo.media_written = 1; | 1891 | info->devinfo.media_written = 1; |
1897 | 1892 | ||
@@ -1916,7 +1911,6 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq) | |||
1916 | rq->flags |= REQ_QUIET; | 1911 | rq->flags |= REQ_QUIET; |
1917 | 1912 | ||
1918 | info->dma = 0; | 1913 | info->dma = 0; |
1919 | info->cmd = 0; | ||
1920 | 1914 | ||
1921 | /* | 1915 | /* |
1922 | * sg request | 1916 | * sg request |
@@ -1925,7 +1919,6 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq) | |||
1925 | int mask = drive->queue->dma_alignment; | 1919 | int mask = drive->queue->dma_alignment; |
1926 | unsigned long addr = (unsigned long) page_address(bio_page(rq->bio)); | 1920 | unsigned long addr = (unsigned long) page_address(bio_page(rq->bio)); |
1927 | 1921 | ||
1928 | info->cmd = rq_data_dir(rq); | ||
1929 | info->dma = drive->using_dma; | 1922 | info->dma = drive->using_dma; |
1930 | 1923 | ||
1931 | /* | 1924 | /* |
diff --git a/drivers/ide/ide-cd.h b/drivers/ide/ide-cd.h index 7ca3e5afc665..ad1f2ed14a37 100644 --- a/drivers/ide/ide-cd.h +++ b/drivers/ide/ide-cd.h | |||
@@ -480,7 +480,6 @@ struct cdrom_info { | |||
480 | 480 | ||
481 | struct request request_sense_request; | 481 | struct request request_sense_request; |
482 | int dma; | 482 | int dma; |
483 | int cmd; | ||
484 | unsigned long last_block; | 483 | unsigned long last_block; |
485 | unsigned long start_seek; | 484 | unsigned long start_seek; |
486 | /* Buffer to hold mechanism status and changer slot table. */ | 485 | /* Buffer to hold mechanism status and changer slot table. */ |
diff --git a/drivers/ide/ide-disk.c b/drivers/ide/ide-disk.c index f4e3d3527b0e..449522f0540c 100644 --- a/drivers/ide/ide-disk.c +++ b/drivers/ide/ide-disk.c | |||
@@ -1034,12 +1034,12 @@ static int ide_disk_remove(struct device *dev) | |||
1034 | struct ide_disk_obj *idkp = drive->driver_data; | 1034 | struct ide_disk_obj *idkp = drive->driver_data; |
1035 | struct gendisk *g = idkp->disk; | 1035 | struct gendisk *g = idkp->disk; |
1036 | 1036 | ||
1037 | ide_cacheflush_p(drive); | ||
1038 | |||
1039 | ide_unregister_subdriver(drive, idkp->driver); | 1037 | ide_unregister_subdriver(drive, idkp->driver); |
1040 | 1038 | ||
1041 | del_gendisk(g); | 1039 | del_gendisk(g); |
1042 | 1040 | ||
1041 | ide_cacheflush_p(drive); | ||
1042 | |||
1043 | ide_disk_put(idkp); | 1043 | ide_disk_put(idkp); |
1044 | 1044 | ||
1045 | return 0; | 1045 | return 0; |
diff --git a/drivers/ide/ide-dma.c b/drivers/ide/ide-dma.c index 1e1531334c25..0523da77425a 100644 --- a/drivers/ide/ide-dma.c +++ b/drivers/ide/ide-dma.c | |||
@@ -90,11 +90,6 @@ | |||
90 | #include <asm/io.h> | 90 | #include <asm/io.h> |
91 | #include <asm/irq.h> | 91 | #include <asm/irq.h> |
92 | 92 | ||
93 | struct drive_list_entry { | ||
94 | const char *id_model; | ||
95 | const char *id_firmware; | ||
96 | }; | ||
97 | |||
98 | static const struct drive_list_entry drive_whitelist [] = { | 93 | static const struct drive_list_entry drive_whitelist [] = { |
99 | 94 | ||
100 | { "Micropolis 2112A" , "ALL" }, | 95 | { "Micropolis 2112A" , "ALL" }, |
@@ -139,7 +134,7 @@ static const struct drive_list_entry drive_blacklist [] = { | |||
139 | }; | 134 | }; |
140 | 135 | ||
141 | /** | 136 | /** |
142 | * in_drive_list - look for drive in black/white list | 137 | * ide_in_drive_list - look for drive in black/white list |
143 | * @id: drive identifier | 138 | * @id: drive identifier |
144 | * @drive_table: list to inspect | 139 | * @drive_table: list to inspect |
145 | * | 140 | * |
@@ -147,7 +142,7 @@ static const struct drive_list_entry drive_blacklist [] = { | |||
147 | * Returns 1 if the drive is found in the table. | 142 | * Returns 1 if the drive is found in the table. |
148 | */ | 143 | */ |
149 | 144 | ||
150 | static int in_drive_list(struct hd_driveid *id, const struct drive_list_entry *drive_table) | 145 | int ide_in_drive_list(struct hd_driveid *id, const struct drive_list_entry *drive_table) |
151 | { | 146 | { |
152 | for ( ; drive_table->id_model ; drive_table++) | 147 | for ( ; drive_table->id_model ; drive_table++) |
153 | if ((!strcmp(drive_table->id_model, id->model)) && | 148 | if ((!strcmp(drive_table->id_model, id->model)) && |
@@ -157,6 +152,8 @@ static int in_drive_list(struct hd_driveid *id, const struct drive_list_entry *d | |||
157 | return 0; | 152 | return 0; |
158 | } | 153 | } |
159 | 154 | ||
155 | EXPORT_SYMBOL_GPL(ide_in_drive_list); | ||
156 | |||
160 | /** | 157 | /** |
161 | * ide_dma_intr - IDE DMA interrupt handler | 158 | * ide_dma_intr - IDE DMA interrupt handler |
162 | * @drive: the drive the interrupt is for | 159 | * @drive: the drive the interrupt is for |
@@ -663,7 +660,7 @@ int __ide_dma_bad_drive (ide_drive_t *drive) | |||
663 | { | 660 | { |
664 | struct hd_driveid *id = drive->id; | 661 | struct hd_driveid *id = drive->id; |
665 | 662 | ||
666 | int blacklist = in_drive_list(id, drive_blacklist); | 663 | int blacklist = ide_in_drive_list(id, drive_blacklist); |
667 | if (blacklist) { | 664 | if (blacklist) { |
668 | printk(KERN_WARNING "%s: Disabling (U)DMA for %s (blacklisted)\n", | 665 | printk(KERN_WARNING "%s: Disabling (U)DMA for %s (blacklisted)\n", |
669 | drive->name, id->model); | 666 | drive->name, id->model); |
@@ -677,7 +674,7 @@ EXPORT_SYMBOL(__ide_dma_bad_drive); | |||
677 | int __ide_dma_good_drive (ide_drive_t *drive) | 674 | int __ide_dma_good_drive (ide_drive_t *drive) |
678 | { | 675 | { |
679 | struct hd_driveid *id = drive->id; | 676 | struct hd_driveid *id = drive->id; |
680 | return in_drive_list(id, drive_whitelist); | 677 | return ide_in_drive_list(id, drive_whitelist); |
681 | } | 678 | } |
682 | 679 | ||
683 | EXPORT_SYMBOL(__ide_dma_good_drive); | 680 | EXPORT_SYMBOL(__ide_dma_good_drive); |
diff --git a/drivers/ide/mips/Makefile b/drivers/ide/mips/Makefile index 578e52a59588..677c7b2bac92 100644 --- a/drivers/ide/mips/Makefile +++ b/drivers/ide/mips/Makefile | |||
@@ -1 +1,4 @@ | |||
1 | obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o | 1 | obj-$(CONFIG_BLK_DEV_IDE_SWARM) += swarm.o |
2 | obj-$(CONFIG_BLK_DEV_IDE_AU1XXX) += au1xxx-ide.o | ||
3 | |||
4 | EXTRA_CFLAGS := -Idrivers/ide | ||
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c index 2b6327c576b9..32431dcf5d8e 100644 --- a/drivers/ide/mips/au1xxx-ide.c +++ b/drivers/ide/mips/au1xxx-ide.c | |||
@@ -31,865 +31,638 @@ | |||
31 | */ | 31 | */ |
32 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ | 32 | #undef REALLY_SLOW_IO /* most systems can safely undef this */ |
33 | 33 | ||
34 | #include <linux/config.h> /* for CONFIG_BLK_DEV_IDEPCI */ | ||
35 | #include <linux/types.h> | 34 | #include <linux/types.h> |
36 | #include <linux/module.h> | 35 | #include <linux/module.h> |
37 | #include <linux/kernel.h> | 36 | #include <linux/kernel.h> |
38 | #include <linux/delay.h> | 37 | #include <linux/delay.h> |
39 | #include <linux/timer.h> | 38 | #include <linux/platform_device.h> |
40 | #include <linux/mm.h> | 39 | |
41 | #include <linux/ioport.h> | ||
42 | #include <linux/hdreg.h> | ||
43 | #include <linux/init.h> | 40 | #include <linux/init.h> |
44 | #include <linux/ide.h> | 41 | #include <linux/ide.h> |
45 | #include <linux/sysdev.h> | 42 | #include <linux/sysdev.h> |
46 | 43 | ||
47 | #include <linux/dma-mapping.h> | 44 | #include <linux/dma-mapping.h> |
48 | 45 | ||
46 | #include "ide-timing.h" | ||
47 | |||
49 | #include <asm/io.h> | 48 | #include <asm/io.h> |
50 | #include <asm/mach-au1x00/au1xxx.h> | 49 | #include <asm/mach-au1x00/au1xxx.h> |
51 | #include <asm/mach-au1x00/au1xxx_dbdma.h> | 50 | #include <asm/mach-au1x00/au1xxx_dbdma.h> |
52 | 51 | ||
53 | #if CONFIG_PM | ||
54 | #include <asm/mach-au1x00/au1xxx_pm.h> | ||
55 | #endif | ||
56 | |||
57 | #include <asm/mach-au1x00/au1xxx_ide.h> | 52 | #include <asm/mach-au1x00/au1xxx_ide.h> |
58 | 53 | ||
59 | #define DRV_NAME "au1200-ide" | 54 | #define DRV_NAME "au1200-ide" |
60 | #define DRV_VERSION "1.0" | 55 | #define DRV_VERSION "1.0" |
61 | #define DRV_AUTHOR "AMD PCS / Pete Popov <ppopov@embeddedalley.com>" | 56 | #define DRV_AUTHOR "Enrico Walther <enrico.walther@amd.com> / Pete Popov <ppopov@embeddedalley.com>" |
62 | #define DRV_DESC "Au1200 IDE" | ||
63 | |||
64 | static _auide_hwif auide_hwif; | ||
65 | static spinlock_t ide_tune_drive_spin_lock = SPIN_LOCK_UNLOCKED; | ||
66 | static spinlock_t ide_tune_chipset_spin_lock = SPIN_LOCK_UNLOCKED; | ||
67 | static int dbdma_init_done = 0; | ||
68 | |||
69 | /* | ||
70 | * local I/O functions | ||
71 | */ | ||
72 | u8 auide_inb(unsigned long port) | ||
73 | { | ||
74 | return (au_readb(port)); | ||
75 | } | ||
76 | 57 | ||
77 | u16 auide_inw(unsigned long port) | 58 | /* enable the burstmode in the dbdma */ |
78 | { | 59 | #define IDE_AU1XXX_BURSTMODE 1 |
79 | return (au_readw(port)); | ||
80 | } | ||
81 | 60 | ||
82 | u32 auide_inl(unsigned long port) | 61 | static _auide_hwif auide_hwif; |
83 | { | 62 | static int dbdma_init_done; |
84 | return (au_readl(port)); | ||
85 | } | ||
86 | 63 | ||
87 | void auide_insw(unsigned long port, void *addr, u32 count) | ||
88 | { | ||
89 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA) | 64 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA) |
90 | 65 | ||
91 | _auide_hwif *ahwif = &auide_hwif; | 66 | void auide_insw(unsigned long port, void *addr, u32 count) |
92 | chan_tab_t *ctp; | ||
93 | au1x_ddma_desc_t *dp; | ||
94 | |||
95 | if(!put_dest_flags(ahwif->rx_chan, (void*)addr, count << 1, | ||
96 | DDMA_FLAGS_NOIE)) { | ||
97 | printk(KERN_ERR "%s failed %d\n", __FUNCTION__, __LINE__); | ||
98 | return; | ||
99 | } | ||
100 | ctp = *((chan_tab_t **)ahwif->rx_chan); | ||
101 | dp = ctp->cur_ptr; | ||
102 | while (dp->dscr_cmd0 & DSCR_CMD0_V) | ||
103 | ; | ||
104 | ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp); | ||
105 | #else | ||
106 | while (count--) | ||
107 | { | ||
108 | *(u16 *)addr = au_readw(port); | ||
109 | addr +=2 ; | ||
110 | } | ||
111 | #endif | ||
112 | } | ||
113 | |||
114 | void auide_insl(unsigned long port, void *addr, u32 count) | ||
115 | { | ||
116 | while (count--) | ||
117 | { | ||
118 | *(u32 *)addr = au_readl(port); | ||
119 | /* NOTE: For IDE interfaces over PCMCIA, | ||
120 | * 32-bit access does not work | ||
121 | */ | ||
122 | addr += 4; | ||
123 | } | ||
124 | } | ||
125 | |||
126 | void auide_outb(u8 addr, unsigned long port) | ||
127 | { | 67 | { |
128 | return (au_writeb(addr, port)); | 68 | _auide_hwif *ahwif = &auide_hwif; |
129 | } | 69 | chan_tab_t *ctp; |
70 | au1x_ddma_desc_t *dp; | ||
130 | 71 | ||
131 | void auide_outbsync(ide_drive_t *drive, u8 addr, unsigned long port) | 72 | if(!put_dest_flags(ahwif->rx_chan, (void*)addr, count << 1, |
132 | { | 73 | DDMA_FLAGS_NOIE)) { |
133 | return (au_writeb(addr, port)); | 74 | printk(KERN_ERR "%s failed %d\n", __FUNCTION__, __LINE__); |
75 | return; | ||
76 | } | ||
77 | ctp = *((chan_tab_t **)ahwif->rx_chan); | ||
78 | dp = ctp->cur_ptr; | ||
79 | while (dp->dscr_cmd0 & DSCR_CMD0_V) | ||
80 | ; | ||
81 | ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp); | ||
134 | } | 82 | } |
135 | 83 | ||
136 | void auide_outw(u16 addr, unsigned long port) | 84 | void auide_outsw(unsigned long port, void *addr, u32 count) |
137 | { | 85 | { |
138 | return (au_writew(addr, port)); | 86 | _auide_hwif *ahwif = &auide_hwif; |
139 | } | 87 | chan_tab_t *ctp; |
88 | au1x_ddma_desc_t *dp; | ||
140 | 89 | ||
141 | void auide_outl(u32 addr, unsigned long port) | 90 | if(!put_source_flags(ahwif->tx_chan, (void*)addr, |
142 | { | 91 | count << 1, DDMA_FLAGS_NOIE)) { |
143 | return (au_writel(addr, port)); | 92 | printk(KERN_ERR "%s failed %d\n", __FUNCTION__, __LINE__); |
93 | return; | ||
94 | } | ||
95 | ctp = *((chan_tab_t **)ahwif->tx_chan); | ||
96 | dp = ctp->cur_ptr; | ||
97 | while (dp->dscr_cmd0 & DSCR_CMD0_V) | ||
98 | ; | ||
99 | ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp); | ||
144 | } | 100 | } |
145 | 101 | ||
146 | void auide_outsw(unsigned long port, void *addr, u32 count) | ||
147 | { | ||
148 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA) | ||
149 | _auide_hwif *ahwif = &auide_hwif; | ||
150 | chan_tab_t *ctp; | ||
151 | au1x_ddma_desc_t *dp; | ||
152 | |||
153 | if(!put_source_flags(ahwif->tx_chan, (void*)addr, | ||
154 | count << 1, DDMA_FLAGS_NOIE)) { | ||
155 | printk(KERN_ERR "%s failed %d\n", __FUNCTION__, __LINE__); | ||
156 | return; | ||
157 | } | ||
158 | ctp = *((chan_tab_t **)ahwif->tx_chan); | ||
159 | dp = ctp->cur_ptr; | ||
160 | while (dp->dscr_cmd0 & DSCR_CMD0_V) | ||
161 | ; | ||
162 | ctp->cur_ptr = au1xxx_ddma_get_nextptr_virt(dp); | ||
163 | #else | ||
164 | while (count--) | ||
165 | { | ||
166 | au_writew(*(u16 *)addr, port); | ||
167 | addr += 2; | ||
168 | } | ||
169 | #endif | 102 | #endif |
170 | } | ||
171 | |||
172 | void auide_outsl(unsigned long port, void *addr, u32 count) | ||
173 | { | ||
174 | while (count--) | ||
175 | { | ||
176 | au_writel(*(u32 *)addr, port); | ||
177 | /* NOTE: For IDE interfaces over PCMCIA, | ||
178 | * 32-bit access does not work | ||
179 | */ | ||
180 | addr += 4; | ||
181 | } | ||
182 | } | ||
183 | 103 | ||
184 | static void auide_tune_drive(ide_drive_t *drive, byte pio) | 104 | static void auide_tune_drive(ide_drive_t *drive, byte pio) |
185 | { | 105 | { |
186 | int mem_sttime; | 106 | int mem_sttime; |
187 | int mem_stcfg; | 107 | int mem_stcfg; |
188 | unsigned long flags; | 108 | u8 speed; |
189 | u8 speed; | 109 | |
190 | 110 | /* get the best pio mode for the drive */ | |
191 | /* get the best pio mode for the drive */ | 111 | pio = ide_get_best_pio_mode(drive, pio, 4, NULL); |
192 | pio = ide_get_best_pio_mode(drive, pio, 4, NULL); | 112 | |
193 | 113 | printk(KERN_INFO "%s: setting Au1XXX IDE to PIO mode%d\n", | |
194 | printk("%s: setting Au1XXX IDE to PIO mode%d\n", | 114 | drive->name, pio); |
195 | drive->name, pio); | 115 | |
196 | 116 | mem_sttime = 0; | |
197 | spin_lock_irqsave(&ide_tune_drive_spin_lock, flags); | 117 | mem_stcfg = au_readl(MEM_STCFG2); |
198 | 118 | ||
199 | mem_sttime = 0; | 119 | /* set pio mode! */ |
200 | mem_stcfg = au_readl(MEM_STCFG2); | 120 | switch(pio) { |
201 | 121 | case 0: | |
202 | /* set pio mode! */ | 122 | mem_sttime = SBC_IDE_TIMING(PIO0); |
203 | switch(pio) { | 123 | |
204 | case 0: | 124 | /* set configuration for RCS2# */ |
205 | /* set timing parameters for RCS2# */ | 125 | mem_stcfg |= TS_MASK; |
206 | mem_sttime = SBC_IDE_PIO0_TWCS | 126 | mem_stcfg &= ~TCSOE_MASK; |
207 | | SBC_IDE_PIO0_TCSH | 127 | mem_stcfg &= ~TOECS_MASK; |
208 | | SBC_IDE_PIO0_TCSOFF | 128 | mem_stcfg |= SBC_IDE_PIO0_TCSOE | SBC_IDE_PIO0_TOECS; |
209 | | SBC_IDE_PIO0_TWP | 129 | break; |
210 | | SBC_IDE_PIO0_TCSW | 130 | |
211 | | SBC_IDE_PIO0_TPM | 131 | case 1: |
212 | | SBC_IDE_PIO0_TA; | 132 | mem_sttime = SBC_IDE_TIMING(PIO1); |
213 | /* set configuration for RCS2# */ | 133 | |
214 | mem_stcfg |= TS_MASK; | 134 | /* set configuration for RCS2# */ |
215 | mem_stcfg &= ~TCSOE_MASK; | 135 | mem_stcfg |= TS_MASK; |
216 | mem_stcfg &= ~TOECS_MASK; | 136 | mem_stcfg &= ~TCSOE_MASK; |
217 | mem_stcfg |= SBC_IDE_PIO0_TCSOE | SBC_IDE_PIO0_TOECS; | 137 | mem_stcfg &= ~TOECS_MASK; |
218 | 138 | mem_stcfg |= SBC_IDE_PIO1_TCSOE | SBC_IDE_PIO1_TOECS; | |
219 | au_writel(mem_sttime,MEM_STTIME2); | 139 | break; |
220 | au_writel(mem_stcfg,MEM_STCFG2); | 140 | |
221 | break; | 141 | case 2: |
222 | 142 | mem_sttime = SBC_IDE_TIMING(PIO2); | |
223 | case 1: | 143 | |
224 | /* set timing parameters for RCS2# */ | 144 | /* set configuration for RCS2# */ |
225 | mem_sttime = SBC_IDE_PIO1_TWCS | 145 | mem_stcfg &= ~TS_MASK; |
226 | | SBC_IDE_PIO1_TCSH | 146 | mem_stcfg &= ~TCSOE_MASK; |
227 | | SBC_IDE_PIO1_TCSOFF | 147 | mem_stcfg &= ~TOECS_MASK; |
228 | | SBC_IDE_PIO1_TWP | 148 | mem_stcfg |= SBC_IDE_PIO2_TCSOE | SBC_IDE_PIO2_TOECS; |
229 | | SBC_IDE_PIO1_TCSW | 149 | break; |
230 | | SBC_IDE_PIO1_TPM | 150 | |
231 | | SBC_IDE_PIO1_TA; | 151 | case 3: |
232 | /* set configuration for RCS2# */ | 152 | mem_sttime = SBC_IDE_TIMING(PIO3); |
233 | mem_stcfg |= TS_MASK; | 153 | |
234 | mem_stcfg &= ~TCSOE_MASK; | 154 | /* set configuration for RCS2# */ |
235 | mem_stcfg &= ~TOECS_MASK; | 155 | mem_stcfg &= ~TS_MASK; |
236 | mem_stcfg |= SBC_IDE_PIO1_TCSOE | SBC_IDE_PIO1_TOECS; | 156 | mem_stcfg &= ~TCSOE_MASK; |
237 | break; | 157 | mem_stcfg &= ~TOECS_MASK; |
238 | 158 | mem_stcfg |= SBC_IDE_PIO3_TCSOE | SBC_IDE_PIO3_TOECS; | |
239 | case 2: | 159 | |
240 | /* set timing parameters for RCS2# */ | 160 | break; |
241 | mem_sttime = SBC_IDE_PIO2_TWCS | 161 | |
242 | | SBC_IDE_PIO2_TCSH | 162 | case 4: |
243 | | SBC_IDE_PIO2_TCSOFF | 163 | mem_sttime = SBC_IDE_TIMING(PIO4); |
244 | | SBC_IDE_PIO2_TWP | 164 | |
245 | | SBC_IDE_PIO2_TCSW | 165 | /* set configuration for RCS2# */ |
246 | | SBC_IDE_PIO2_TPM | 166 | mem_stcfg &= ~TS_MASK; |
247 | | SBC_IDE_PIO2_TA; | 167 | mem_stcfg &= ~TCSOE_MASK; |
248 | /* set configuration for RCS2# */ | 168 | mem_stcfg &= ~TOECS_MASK; |
249 | mem_stcfg &= ~TS_MASK; | 169 | mem_stcfg |= SBC_IDE_PIO4_TCSOE | SBC_IDE_PIO4_TOECS; |
250 | mem_stcfg &= ~TCSOE_MASK; | 170 | break; |
251 | mem_stcfg &= ~TOECS_MASK; | 171 | } |
252 | mem_stcfg |= SBC_IDE_PIO2_TCSOE | SBC_IDE_PIO2_TOECS; | 172 | |
253 | break; | 173 | au_writel(mem_sttime,MEM_STTIME2); |
254 | 174 | au_writel(mem_stcfg,MEM_STCFG2); | |
255 | case 3: | 175 | |
256 | /* set timing parameters for RCS2# */ | 176 | speed = pio + XFER_PIO_0; |
257 | mem_sttime = SBC_IDE_PIO3_TWCS | 177 | ide_config_drive_speed(drive, speed); |
258 | | SBC_IDE_PIO3_TCSH | ||
259 | | SBC_IDE_PIO3_TCSOFF | ||
260 | | SBC_IDE_PIO3_TWP | ||
261 | | SBC_IDE_PIO3_TCSW | ||
262 | | SBC_IDE_PIO3_TPM | ||
263 | | SBC_IDE_PIO3_TA; | ||
264 | /* set configuration for RCS2# */ | ||
265 | mem_stcfg |= TS_MASK; | ||
266 | mem_stcfg &= ~TS_MASK; | ||
267 | mem_stcfg &= ~TCSOE_MASK; | ||
268 | mem_stcfg &= ~TOECS_MASK; | ||
269 | mem_stcfg |= SBC_IDE_PIO3_TCSOE | SBC_IDE_PIO3_TOECS; | ||
270 | |||
271 | break; | ||
272 | |||
273 | case 4: | ||
274 | /* set timing parameters for RCS2# */ | ||
275 | mem_sttime = SBC_IDE_PIO4_TWCS | ||
276 | | SBC_IDE_PIO4_TCSH | ||
277 | | SBC_IDE_PIO4_TCSOFF | ||
278 | | SBC_IDE_PIO4_TWP | ||
279 | | SBC_IDE_PIO4_TCSW | ||
280 | | SBC_IDE_PIO4_TPM | ||
281 | | SBC_IDE_PIO4_TA; | ||
282 | /* set configuration for RCS2# */ | ||
283 | mem_stcfg &= ~TS_MASK; | ||
284 | mem_stcfg &= ~TCSOE_MASK; | ||
285 | mem_stcfg &= ~TOECS_MASK; | ||
286 | mem_stcfg |= SBC_IDE_PIO4_TCSOE | SBC_IDE_PIO4_TOECS; | ||
287 | break; | ||
288 | } | ||
289 | |||
290 | au_writel(mem_sttime,MEM_STTIME2); | ||
291 | au_writel(mem_stcfg,MEM_STCFG2); | ||
292 | |||
293 | spin_unlock_irqrestore(&ide_tune_drive_spin_lock, flags); | ||
294 | |||
295 | speed = pio + XFER_PIO_0; | ||
296 | ide_config_drive_speed(drive, speed); | ||
297 | } | 178 | } |
298 | 179 | ||
299 | static int auide_tune_chipset (ide_drive_t *drive, u8 speed) | 180 | static int auide_tune_chipset (ide_drive_t *drive, u8 speed) |
300 | { | 181 | { |
301 | u8 mode = 0; | 182 | int mem_sttime; |
302 | int mem_sttime; | 183 | int mem_stcfg; |
303 | int mem_stcfg; | 184 | unsigned long mode; |
304 | unsigned long flags; | 185 | |
305 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 186 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
306 | struct hd_driveid *id = drive->id; | 187 | if (ide_use_dma(drive)) |
307 | 188 | mode = ide_dma_speed(drive, 0); | |
308 | /* | ||
309 | * Now see what the current drive is capable of, | ||
310 | * selecting UDMA only if the mate said it was ok. | ||
311 | */ | ||
312 | if (id && (id->capability & 1) && drive->autodma && | ||
313 | !__ide_dma_bad_drive(drive)) { | ||
314 | if (!mode && (id->field_valid & 2) && (id->dma_mword & 7)) { | ||
315 | if (id->dma_mword & 4) | ||
316 | mode = XFER_MW_DMA_2; | ||
317 | else if (id->dma_mword & 2) | ||
318 | mode = XFER_MW_DMA_1; | ||
319 | else if (id->dma_mword & 1) | ||
320 | mode = XFER_MW_DMA_0; | ||
321 | } | ||
322 | } | ||
323 | #endif | 189 | #endif |
324 | 190 | ||
325 | spin_lock_irqsave(&ide_tune_chipset_spin_lock, flags); | 191 | mem_sttime = 0; |
192 | mem_stcfg = au_readl(MEM_STCFG2); | ||
326 | 193 | ||
327 | mem_sttime = 0; | 194 | if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) { |
328 | mem_stcfg = au_readl(MEM_STCFG2); | 195 | auide_tune_drive(drive, speed - XFER_PIO_0); |
329 | 196 | return 0; | |
330 | switch(speed) { | 197 | } |
331 | case XFER_PIO_4: | 198 | |
332 | case XFER_PIO_3: | 199 | switch(speed) { |
333 | case XFER_PIO_2: | ||
334 | case XFER_PIO_1: | ||
335 | case XFER_PIO_0: | ||
336 | auide_tune_drive(drive, (speed - XFER_PIO_0)); | ||
337 | break; | ||
338 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 200 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
339 | case XFER_MW_DMA_2: | 201 | case XFER_MW_DMA_2: |
340 | /* set timing parameters for RCS2# */ | 202 | mem_sttime = SBC_IDE_TIMING(MDMA2); |
341 | mem_sttime = SBC_IDE_MDMA2_TWCS | 203 | |
342 | | SBC_IDE_MDMA2_TCSH | 204 | /* set configuration for RCS2# */ |
343 | | SBC_IDE_MDMA2_TCSOFF | 205 | mem_stcfg &= ~TS_MASK; |
344 | | SBC_IDE_MDMA2_TWP | 206 | mem_stcfg &= ~TCSOE_MASK; |
345 | | SBC_IDE_MDMA2_TCSW | 207 | mem_stcfg &= ~TOECS_MASK; |
346 | | SBC_IDE_MDMA2_TPM | 208 | mem_stcfg |= SBC_IDE_MDMA2_TCSOE | SBC_IDE_MDMA2_TOECS; |
347 | | SBC_IDE_MDMA2_TA; | 209 | |
348 | /* set configuration for RCS2# */ | 210 | mode = XFER_MW_DMA_2; |
349 | mem_stcfg &= ~TS_MASK; | 211 | break; |
350 | mem_stcfg &= ~TCSOE_MASK; | 212 | case XFER_MW_DMA_1: |
351 | mem_stcfg &= ~TOECS_MASK; | 213 | mem_sttime = SBC_IDE_TIMING(MDMA1); |
352 | mem_stcfg |= SBC_IDE_MDMA2_TCSOE | SBC_IDE_MDMA2_TOECS; | 214 | |
353 | 215 | /* set configuration for RCS2# */ | |
354 | mode = XFER_MW_DMA_2; | 216 | mem_stcfg &= ~TS_MASK; |
355 | break; | 217 | mem_stcfg &= ~TCSOE_MASK; |
356 | case XFER_MW_DMA_1: | 218 | mem_stcfg &= ~TOECS_MASK; |
357 | /* set timing parameters for RCS2# */ | 219 | mem_stcfg |= SBC_IDE_MDMA1_TCSOE | SBC_IDE_MDMA1_TOECS; |
358 | mem_sttime = SBC_IDE_MDMA1_TWCS | 220 | |
359 | | SBC_IDE_MDMA1_TCSH | 221 | mode = XFER_MW_DMA_1; |
360 | | SBC_IDE_MDMA1_TCSOFF | 222 | break; |
361 | | SBC_IDE_MDMA1_TWP | 223 | case XFER_MW_DMA_0: |
362 | | SBC_IDE_MDMA1_TCSW | 224 | mem_sttime = SBC_IDE_TIMING(MDMA0); |
363 | | SBC_IDE_MDMA1_TPM | 225 | |
364 | | SBC_IDE_MDMA1_TA; | 226 | /* set configuration for RCS2# */ |
365 | /* set configuration for RCS2# */ | 227 | mem_stcfg |= TS_MASK; |
366 | mem_stcfg &= ~TS_MASK; | 228 | mem_stcfg &= ~TCSOE_MASK; |
367 | mem_stcfg &= ~TCSOE_MASK; | 229 | mem_stcfg &= ~TOECS_MASK; |
368 | mem_stcfg &= ~TOECS_MASK; | 230 | mem_stcfg |= SBC_IDE_MDMA0_TCSOE | SBC_IDE_MDMA0_TOECS; |
369 | mem_stcfg |= SBC_IDE_MDMA1_TCSOE | SBC_IDE_MDMA1_TOECS; | 231 | |
370 | 232 | mode = XFER_MW_DMA_0; | |
371 | mode = XFER_MW_DMA_1; | 233 | break; |
372 | break; | ||
373 | case XFER_MW_DMA_0: | ||
374 | /* set timing parameters for RCS2# */ | ||
375 | mem_sttime = SBC_IDE_MDMA0_TWCS | ||
376 | | SBC_IDE_MDMA0_TCSH | ||
377 | | SBC_IDE_MDMA0_TCSOFF | ||
378 | | SBC_IDE_MDMA0_TWP | ||
379 | | SBC_IDE_MDMA0_TCSW | ||
380 | | SBC_IDE_MDMA0_TPM | ||
381 | | SBC_IDE_MDMA0_TA; | ||
382 | /* set configuration for RCS2# */ | ||
383 | mem_stcfg |= TS_MASK; | ||
384 | mem_stcfg &= ~TCSOE_MASK; | ||
385 | mem_stcfg &= ~TOECS_MASK; | ||
386 | mem_stcfg |= SBC_IDE_MDMA0_TCSOE | SBC_IDE_MDMA0_TOECS; | ||
387 | |||
388 | mode = XFER_MW_DMA_0; | ||
389 | break; | ||
390 | #endif | 234 | #endif |
391 | default: | 235 | default: |
392 | return 1; | 236 | return 1; |
393 | } | 237 | } |
394 | 238 | ||
395 | /* | 239 | if (ide_config_drive_speed(drive, mode)) |
396 | * Tell the drive to switch to the new mode; abort on failure. | 240 | return 1; |
397 | */ | ||
398 | if (!mode || ide_config_drive_speed(drive, mode)) | ||
399 | { | ||
400 | return 1; /* failure */ | ||
401 | } | ||
402 | |||
403 | |||
404 | au_writel(mem_sttime,MEM_STTIME2); | ||
405 | au_writel(mem_stcfg,MEM_STCFG2); | ||
406 | 241 | ||
407 | spin_unlock_irqrestore(&ide_tune_chipset_spin_lock, flags); | 242 | au_writel(mem_sttime,MEM_STTIME2); |
243 | au_writel(mem_stcfg,MEM_STCFG2); | ||
408 | 244 | ||
409 | return 0; | 245 | return 0; |
410 | } | 246 | } |
411 | 247 | ||
412 | /* | 248 | /* |
413 | * Multi-Word DMA + DbDMA functions | 249 | * Multi-Word DMA + DbDMA functions |
414 | */ | 250 | */ |
415 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | ||
416 | 251 | ||
417 | static int in_drive_list(struct hd_driveid *id, | 252 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
418 | const struct drive_list_entry *drive_table) | ||
419 | { | ||
420 | for ( ; drive_table->id_model ; drive_table++){ | ||
421 | if ((!strcmp(drive_table->id_model, id->model)) && | ||
422 | ((strstr(drive_table->id_firmware, id->fw_rev)) || | ||
423 | (!strcmp(drive_table->id_firmware, "ALL"))) | ||
424 | ) | ||
425 | return 1; | ||
426 | } | ||
427 | return 0; | ||
428 | } | ||
429 | 253 | ||
430 | static int auide_build_sglist(ide_drive_t *drive, struct request *rq) | 254 | static int auide_build_sglist(ide_drive_t *drive, struct request *rq) |
431 | { | 255 | { |
432 | ide_hwif_t *hwif = drive->hwif; | 256 | ide_hwif_t *hwif = drive->hwif; |
433 | _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data; | 257 | _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data; |
434 | struct scatterlist *sg = hwif->sg_table; | 258 | struct scatterlist *sg = hwif->sg_table; |
435 | 259 | ||
436 | ide_map_sg(drive, rq); | 260 | ide_map_sg(drive, rq); |
437 | 261 | ||
438 | if (rq_data_dir(rq) == READ) | 262 | if (rq_data_dir(rq) == READ) |
439 | hwif->sg_dma_direction = DMA_FROM_DEVICE; | 263 | hwif->sg_dma_direction = DMA_FROM_DEVICE; |
440 | else | 264 | else |
441 | hwif->sg_dma_direction = DMA_TO_DEVICE; | 265 | hwif->sg_dma_direction = DMA_TO_DEVICE; |
442 | 266 | ||
443 | return dma_map_sg(ahwif->dev, sg, hwif->sg_nents, | 267 | return dma_map_sg(ahwif->dev, sg, hwif->sg_nents, |
444 | hwif->sg_dma_direction); | 268 | hwif->sg_dma_direction); |
445 | } | 269 | } |
446 | 270 | ||
447 | static int auide_build_dmatable(ide_drive_t *drive) | 271 | static int auide_build_dmatable(ide_drive_t *drive) |
448 | { | 272 | { |
449 | int i, iswrite, count = 0; | 273 | int i, iswrite, count = 0; |
450 | ide_hwif_t *hwif = HWIF(drive); | 274 | ide_hwif_t *hwif = HWIF(drive); |
451 | 275 | ||
452 | struct request *rq = HWGROUP(drive)->rq; | 276 | struct request *rq = HWGROUP(drive)->rq; |
453 | 277 | ||
454 | _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data; | 278 | _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data; |
455 | struct scatterlist *sg; | 279 | struct scatterlist *sg; |
456 | 280 | ||
457 | iswrite = (rq_data_dir(rq) == WRITE); | 281 | iswrite = (rq_data_dir(rq) == WRITE); |
458 | /* Save for interrupt context */ | 282 | /* Save for interrupt context */ |
459 | ahwif->drive = drive; | 283 | ahwif->drive = drive; |
460 | 284 | ||
461 | /* Build sglist */ | 285 | /* Build sglist */ |
462 | hwif->sg_nents = i = auide_build_sglist(drive, rq); | 286 | hwif->sg_nents = i = auide_build_sglist(drive, rq); |
463 | 287 | ||
464 | if (!i) | 288 | if (!i) |
465 | return 0; | 289 | return 0; |
466 | 290 | ||
467 | /* fill the descriptors */ | 291 | /* fill the descriptors */ |
468 | sg = hwif->sg_table; | 292 | sg = hwif->sg_table; |
469 | while (i && sg_dma_len(sg)) { | 293 | while (i && sg_dma_len(sg)) { |
470 | u32 cur_addr; | 294 | u32 cur_addr; |
471 | u32 cur_len; | 295 | u32 cur_len; |
472 | 296 | ||
473 | cur_addr = sg_dma_address(sg); | 297 | cur_addr = sg_dma_address(sg); |
474 | cur_len = sg_dma_len(sg); | 298 | cur_len = sg_dma_len(sg); |
475 | 299 | ||
476 | while (cur_len) { | 300 | while (cur_len) { |
477 | u32 flags = DDMA_FLAGS_NOIE; | 301 | u32 flags = DDMA_FLAGS_NOIE; |
478 | unsigned int tc = (cur_len < 0xfe00)? cur_len: 0xfe00; | 302 | unsigned int tc = (cur_len < 0xfe00)? cur_len: 0xfe00; |
479 | 303 | ||
480 | if (++count >= PRD_ENTRIES) { | 304 | if (++count >= PRD_ENTRIES) { |
481 | printk(KERN_WARNING "%s: DMA table too small\n", | 305 | printk(KERN_WARNING "%s: DMA table too small\n", |
482 | drive->name); | 306 | drive->name); |
483 | goto use_pio_instead; | 307 | goto use_pio_instead; |
484 | } | 308 | } |
485 | 309 | ||
486 | /* Lets enable intr for the last descriptor only */ | 310 | /* Lets enable intr for the last descriptor only */ |
487 | if (1==i) | 311 | if (1==i) |
488 | flags = DDMA_FLAGS_IE; | 312 | flags = DDMA_FLAGS_IE; |
489 | else | 313 | else |
490 | flags = DDMA_FLAGS_NOIE; | 314 | flags = DDMA_FLAGS_NOIE; |
491 | 315 | ||
492 | if (iswrite) { | 316 | if (iswrite) { |
493 | if(!put_source_flags(ahwif->tx_chan, | 317 | if(!put_source_flags(ahwif->tx_chan, |
494 | (void*)(page_address(sg->page) | 318 | (void*)(page_address(sg->page) |
495 | + sg->offset), | 319 | + sg->offset), |
496 | tc, flags)) { | 320 | tc, flags)) { |
497 | printk(KERN_ERR "%s failed %d\n", | 321 | printk(KERN_ERR "%s failed %d\n", |
498 | __FUNCTION__, __LINE__); | 322 | __FUNCTION__, __LINE__); |
499 | } | 323 | } |
500 | } else | 324 | } else |
501 | { | 325 | { |
502 | if(!put_dest_flags(ahwif->rx_chan, | 326 | if(!put_dest_flags(ahwif->rx_chan, |
503 | (void*)(page_address(sg->page) | 327 | (void*)(page_address(sg->page) |
504 | + sg->offset), | 328 | + sg->offset), |
505 | tc, flags)) { | 329 | tc, flags)) { |
506 | printk(KERN_ERR "%s failed %d\n", | 330 | printk(KERN_ERR "%s failed %d\n", |
507 | __FUNCTION__, __LINE__); | 331 | __FUNCTION__, __LINE__); |
508 | } | 332 | } |
509 | } | 333 | } |
510 | 334 | ||
511 | cur_addr += tc; | 335 | cur_addr += tc; |
512 | cur_len -= tc; | 336 | cur_len -= tc; |
513 | } | 337 | } |
514 | sg++; | 338 | sg++; |
515 | i--; | 339 | i--; |
516 | } | 340 | } |
517 | 341 | ||
518 | if (count) | 342 | if (count) |
519 | return 1; | 343 | return 1; |
520 | 344 | ||
521 | use_pio_instead: | 345 | use_pio_instead: |
522 | dma_unmap_sg(ahwif->dev, | 346 | dma_unmap_sg(ahwif->dev, |
523 | hwif->sg_table, | 347 | hwif->sg_table, |
524 | hwif->sg_nents, | 348 | hwif->sg_nents, |
525 | hwif->sg_dma_direction); | 349 | hwif->sg_dma_direction); |
526 | 350 | ||
527 | return 0; /* revert to PIO for this request */ | 351 | return 0; /* revert to PIO for this request */ |
528 | } | 352 | } |
529 | 353 | ||
530 | static int auide_dma_end(ide_drive_t *drive) | 354 | static int auide_dma_end(ide_drive_t *drive) |
531 | { | 355 | { |
532 | ide_hwif_t *hwif = HWIF(drive); | 356 | ide_hwif_t *hwif = HWIF(drive); |
533 | _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data; | 357 | _auide_hwif *ahwif = (_auide_hwif*)hwif->hwif_data; |
534 | 358 | ||
535 | if (hwif->sg_nents) { | 359 | if (hwif->sg_nents) { |
536 | dma_unmap_sg(ahwif->dev, hwif->sg_table, hwif->sg_nents, | 360 | dma_unmap_sg(ahwif->dev, hwif->sg_table, hwif->sg_nents, |
537 | hwif->sg_dma_direction); | 361 | hwif->sg_dma_direction); |
538 | hwif->sg_nents = 0; | 362 | hwif->sg_nents = 0; |
539 | } | 363 | } |
540 | 364 | ||
541 | return 0; | 365 | return 0; |
542 | } | 366 | } |
543 | 367 | ||
544 | static void auide_dma_start(ide_drive_t *drive ) | 368 | static void auide_dma_start(ide_drive_t *drive ) |
545 | { | 369 | { |
546 | // printk("%s\n", __FUNCTION__); | ||
547 | } | 370 | } |
548 | 371 | ||
549 | ide_startstop_t auide_dma_intr(ide_drive_t *drive) | ||
550 | { | ||
551 | //printk("%s\n", __FUNCTION__); | ||
552 | |||
553 | u8 stat = 0, dma_stat = 0; | ||
554 | |||
555 | dma_stat = HWIF(drive)->ide_dma_end(drive); | ||
556 | stat = HWIF(drive)->INB(IDE_STATUS_REG); /* get drive status */ | ||
557 | if (OK_STAT(stat,DRIVE_READY,drive->bad_wstat|DRQ_STAT)) { | ||
558 | if (!dma_stat) { | ||
559 | struct request *rq = HWGROUP(drive)->rq; | ||
560 | |||
561 | ide_end_request(drive, 1, rq->nr_sectors); | ||
562 | return ide_stopped; | ||
563 | } | ||
564 | printk(KERN_ERR "%s: dma_intr: bad DMA status (dma_stat=%x)\n", | ||
565 | drive->name, dma_stat); | ||
566 | } | ||
567 | return ide_error(drive, "dma_intr", stat); | ||
568 | } | ||
569 | 372 | ||
570 | static void auide_dma_exec_cmd(ide_drive_t *drive, u8 command) | 373 | static void auide_dma_exec_cmd(ide_drive_t *drive, u8 command) |
571 | { | 374 | { |
572 | //printk("%s\n", __FUNCTION__); | 375 | /* issue cmd to drive */ |
573 | 376 | ide_execute_command(drive, command, &ide_dma_intr, | |
574 | /* issue cmd to drive */ | 377 | (2*WAIT_CMD), NULL); |
575 | ide_execute_command(drive, command, &auide_dma_intr, | ||
576 | (2*WAIT_CMD), NULL); | ||
577 | } | 378 | } |
578 | 379 | ||
579 | static int auide_dma_setup(ide_drive_t *drive) | 380 | static int auide_dma_setup(ide_drive_t *drive) |
580 | { | 381 | { |
581 | // printk("%s\n", __FUNCTION__); | 382 | struct request *rq = HWGROUP(drive)->rq; |
582 | |||
583 | if (drive->media != ide_disk) | ||
584 | return 1; | ||
585 | |||
586 | if (!auide_build_dmatable(drive)) | ||
587 | /* try PIO instead of DMA */ | ||
588 | return 1; | ||
589 | 383 | ||
590 | drive->waiting_for_dma = 1; | 384 | if (!auide_build_dmatable(drive)) { |
385 | ide_map_sg(drive, rq); | ||
386 | return 1; | ||
387 | } | ||
591 | 388 | ||
592 | return 0; | 389 | drive->waiting_for_dma = 1; |
390 | return 0; | ||
593 | } | 391 | } |
594 | 392 | ||
595 | static int auide_dma_check(ide_drive_t *drive) | 393 | static int auide_dma_check(ide_drive_t *drive) |
596 | { | 394 | { |
597 | // printk("%s\n", __FUNCTION__); | 395 | u8 speed; |
598 | 396 | ||
599 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 397 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
600 | if( !dbdma_init_done ){ | 398 | |
601 | auide_hwif.white_list = in_drive_list(drive->id, | 399 | if( dbdma_init_done == 0 ){ |
602 | dma_white_list); | 400 | auide_hwif.white_list = ide_in_drive_list(drive->id, |
603 | auide_hwif.black_list = in_drive_list(drive->id, | 401 | dma_white_list); |
604 | dma_black_list); | 402 | auide_hwif.black_list = ide_in_drive_list(drive->id, |
605 | auide_hwif.drive = drive; | 403 | dma_black_list); |
606 | auide_ddma_init(&auide_hwif); | 404 | auide_hwif.drive = drive; |
607 | dbdma_init_done = 1; | 405 | auide_ddma_init(&auide_hwif); |
608 | } | 406 | dbdma_init_done = 1; |
407 | } | ||
609 | #endif | 408 | #endif |
610 | 409 | ||
611 | /* Is the drive in our DMA black list? */ | 410 | /* Is the drive in our DMA black list? */ |
612 | if ( auide_hwif.black_list ) { | 411 | |
613 | drive->using_dma = 0; | 412 | if ( auide_hwif.black_list ) { |
614 | printk("%s found in dma_blacklist[]! Disabling DMA.\n", | 413 | drive->using_dma = 0; |
615 | drive->id->model); | 414 | |
616 | } | 415 | /* Borrowed the warning message from ide-dma.c */ |
617 | else | ||
618 | drive->using_dma = 1; | ||
619 | 416 | ||
620 | return HWIF(drive)->ide_dma_host_on(drive); | 417 | printk(KERN_WARNING "%s: Disabling DMA for %s (blacklisted)\n", |
418 | drive->name, drive->id->model); | ||
419 | } | ||
420 | else | ||
421 | drive->using_dma = 1; | ||
422 | |||
423 | speed = ide_find_best_mode(drive, XFER_PIO | XFER_MWDMA); | ||
424 | |||
425 | if (drive->autodma && (speed & XFER_MODE) != XFER_PIO) | ||
426 | return HWIF(drive)->ide_dma_on(drive); | ||
427 | |||
428 | return HWIF(drive)->ide_dma_off_quietly(drive); | ||
621 | } | 429 | } |
622 | 430 | ||
623 | static int auide_dma_test_irq(ide_drive_t *drive) | 431 | static int auide_dma_test_irq(ide_drive_t *drive) |
624 | { | 432 | { |
625 | // printk("%s\n", __FUNCTION__); | 433 | if (drive->waiting_for_dma == 0) |
626 | 434 | printk(KERN_WARNING "%s: ide_dma_test_irq \ | |
627 | if (!drive->waiting_for_dma) | ||
628 | printk(KERN_WARNING "%s: ide_dma_test_irq \ | ||
629 | called while not waiting\n", drive->name); | 435 | called while not waiting\n", drive->name); |
630 | 436 | ||
631 | /* If dbdma didn't execute the STOP command yet, the | 437 | /* If dbdma didn't execute the STOP command yet, the |
632 | * active bit is still set | 438 | * active bit is still set |
633 | */ | 439 | */ |
634 | drive->waiting_for_dma++; | 440 | drive->waiting_for_dma++; |
635 | if (drive->waiting_for_dma >= DMA_WAIT_TIMEOUT) { | 441 | if (drive->waiting_for_dma >= DMA_WAIT_TIMEOUT) { |
636 | printk(KERN_WARNING "%s: timeout waiting for ddma to \ | 442 | printk(KERN_WARNING "%s: timeout waiting for ddma to \ |
637 | complete\n", drive->name); | 443 | complete\n", drive->name); |
638 | return 1; | 444 | return 1; |
639 | } | 445 | } |
640 | udelay(10); | 446 | udelay(10); |
641 | return 0; | 447 | return 0; |
642 | } | 448 | } |
643 | 449 | ||
644 | static int auide_dma_host_on(ide_drive_t *drive) | 450 | static int auide_dma_host_on(ide_drive_t *drive) |
645 | { | 451 | { |
646 | // printk("%s\n", __FUNCTION__); | 452 | return 0; |
647 | return 0; | ||
648 | } | 453 | } |
649 | 454 | ||
650 | static int auide_dma_on(ide_drive_t *drive) | 455 | static int auide_dma_on(ide_drive_t *drive) |
651 | { | 456 | { |
652 | // printk("%s\n", __FUNCTION__); | 457 | drive->using_dma = 1; |
653 | drive->using_dma = 1; | 458 | return auide_dma_host_on(drive); |
654 | return auide_dma_host_on(drive); | ||
655 | } | 459 | } |
656 | 460 | ||
657 | 461 | ||
658 | static int auide_dma_host_off(ide_drive_t *drive) | 462 | static int auide_dma_host_off(ide_drive_t *drive) |
659 | { | 463 | { |
660 | // printk("%s\n", __FUNCTION__); | 464 | return 0; |
661 | return 0; | ||
662 | } | 465 | } |
663 | 466 | ||
664 | static int auide_dma_off_quietly(ide_drive_t *drive) | 467 | static int auide_dma_off_quietly(ide_drive_t *drive) |
665 | { | 468 | { |
666 | // printk("%s\n", __FUNCTION__); | 469 | drive->using_dma = 0; |
667 | drive->using_dma = 0; | 470 | return auide_dma_host_off(drive); |
668 | return auide_dma_host_off(drive); | ||
669 | } | 471 | } |
670 | 472 | ||
671 | static int auide_dma_lostirq(ide_drive_t *drive) | 473 | static int auide_dma_lostirq(ide_drive_t *drive) |
672 | { | 474 | { |
673 | // printk("%s\n", __FUNCTION__); | 475 | printk(KERN_ERR "%s: IRQ lost\n", drive->name); |
674 | 476 | return 0; | |
675 | printk(KERN_ERR "%s: IRQ lost\n", drive->name); | ||
676 | return 0; | ||
677 | } | 477 | } |
678 | 478 | ||
679 | static void auide_ddma_tx_callback(int irq, void *param, struct pt_regs *regs) | 479 | static void auide_ddma_tx_callback(int irq, void *param, struct pt_regs *regs) |
680 | { | 480 | { |
681 | // printk("%s\n", __FUNCTION__); | 481 | _auide_hwif *ahwif = (_auide_hwif*)param; |
682 | 482 | ahwif->drive->waiting_for_dma = 0; | |
683 | _auide_hwif *ahwif = (_auide_hwif*)param; | ||
684 | ahwif->drive->waiting_for_dma = 0; | ||
685 | return; | ||
686 | } | 483 | } |
687 | 484 | ||
688 | static void auide_ddma_rx_callback(int irq, void *param, struct pt_regs *regs) | 485 | static void auide_ddma_rx_callback(int irq, void *param, struct pt_regs *regs) |
689 | { | 486 | { |
690 | // printk("%s\n", __FUNCTION__); | 487 | _auide_hwif *ahwif = (_auide_hwif*)param; |
488 | ahwif->drive->waiting_for_dma = 0; | ||
489 | } | ||
490 | |||
491 | #endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */ | ||
691 | 492 | ||
692 | _auide_hwif *ahwif = (_auide_hwif*)param; | 493 | static void auide_init_dbdma_dev(dbdev_tab_t *dev, u32 dev_id, u32 tsize, u32 devwidth, u32 flags) |
693 | ahwif->drive->waiting_for_dma = 0; | 494 | { |
694 | return; | 495 | dev->dev_id = dev_id; |
496 | dev->dev_physaddr = (u32)AU1XXX_ATA_PHYS_ADDR; | ||
497 | dev->dev_intlevel = 0; | ||
498 | dev->dev_intpolarity = 0; | ||
499 | dev->dev_tsize = tsize; | ||
500 | dev->dev_devwidth = devwidth; | ||
501 | dev->dev_flags = flags; | ||
695 | } | 502 | } |
503 | |||
504 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) | ||
696 | 505 | ||
697 | static int auide_dma_timeout(ide_drive_t *drive) | 506 | static int auide_dma_timeout(ide_drive_t *drive) |
698 | { | 507 | { |
699 | // printk("%s\n", __FUNCTION__); | 508 | // printk("%s\n", __FUNCTION__); |
700 | 509 | ||
701 | printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name); | 510 | printk(KERN_ERR "%s: DMA timeout occurred: ", drive->name); |
702 | 511 | ||
703 | if (HWIF(drive)->ide_dma_test_irq(drive)) | 512 | if (HWIF(drive)->ide_dma_test_irq(drive)) |
704 | return 0; | 513 | return 0; |
705 | 514 | ||
706 | return HWIF(drive)->ide_dma_end(drive); | 515 | return HWIF(drive)->ide_dma_end(drive); |
707 | } | 516 | } |
708 | #endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */ | 517 | |
709 | 518 | ||
519 | static int auide_ddma_init(_auide_hwif *auide) { | ||
520 | |||
521 | dbdev_tab_t source_dev_tab, target_dev_tab; | ||
522 | u32 dev_id, tsize, devwidth, flags; | ||
523 | ide_hwif_t *hwif = auide->hwif; | ||
710 | 524 | ||
711 | static int auide_ddma_init( _auide_hwif *auide ) | 525 | dev_id = AU1XXX_ATA_DDMA_REQ; |
712 | { | ||
713 | // printk("%s\n", __FUNCTION__); | ||
714 | 526 | ||
715 | dbdev_tab_t source_dev_tab; | 527 | if (auide->white_list || auide->black_list) { |
716 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) | 528 | tsize = 8; |
717 | dbdev_tab_t target_dev_tab; | 529 | devwidth = 32; |
718 | ide_hwif_t *hwif = auide->hwif; | 530 | } |
719 | char warning_output [2][80]; | 531 | else { |
720 | int i; | 532 | tsize = 1; |
721 | #endif | 533 | devwidth = 16; |
534 | |||
535 | printk(KERN_ERR "au1xxx-ide: %s is not on ide driver whitelist.\n",auide_hwif.drive->id->model); | ||
536 | printk(KERN_ERR " please read 'Documentation/mips/AU1xxx_IDE.README'"); | ||
537 | } | ||
722 | 538 | ||
723 | /* Add our custom device to DDMA device table */ | 539 | #ifdef IDE_AU1XXX_BURSTMODE |
724 | /* Create our new device entries in the table */ | 540 | flags = DEV_FLAGS_SYNC | DEV_FLAGS_BURSTABLE; |
725 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) | ||
726 | source_dev_tab.dev_id = AU1XXX_ATA_DDMA_REQ; | ||
727 | |||
728 | if( auide->white_list || auide->black_list ){ | ||
729 | source_dev_tab.dev_tsize = 8; | ||
730 | source_dev_tab.dev_devwidth = 32; | ||
731 | source_dev_tab.dev_physaddr = (u32)AU1XXX_ATA_PHYS_ADDR; | ||
732 | source_dev_tab.dev_intlevel = 0; | ||
733 | source_dev_tab.dev_intpolarity = 0; | ||
734 | |||
735 | /* init device table for target - static bus controller - */ | ||
736 | target_dev_tab.dev_id = DSCR_CMD0_ALWAYS; | ||
737 | target_dev_tab.dev_tsize = 8; | ||
738 | target_dev_tab.dev_devwidth = 32; | ||
739 | target_dev_tab.dev_physaddr = (u32)AU1XXX_ATA_PHYS_ADDR; | ||
740 | target_dev_tab.dev_intlevel = 0; | ||
741 | target_dev_tab.dev_intpolarity = 0; | ||
742 | target_dev_tab.dev_flags = DEV_FLAGS_ANYUSE; | ||
743 | } | ||
744 | else{ | ||
745 | source_dev_tab.dev_tsize = 1; | ||
746 | source_dev_tab.dev_devwidth = 16; | ||
747 | source_dev_tab.dev_physaddr = (u32)AU1XXX_ATA_PHYS_ADDR; | ||
748 | source_dev_tab.dev_intlevel = 0; | ||
749 | source_dev_tab.dev_intpolarity = 0; | ||
750 | |||
751 | /* init device table for target - static bus controller - */ | ||
752 | target_dev_tab.dev_id = DSCR_CMD0_ALWAYS; | ||
753 | target_dev_tab.dev_tsize = 1; | ||
754 | target_dev_tab.dev_devwidth = 16; | ||
755 | target_dev_tab.dev_physaddr = (u32)AU1XXX_ATA_PHYS_ADDR; | ||
756 | target_dev_tab.dev_intlevel = 0; | ||
757 | target_dev_tab.dev_intpolarity = 0; | ||
758 | target_dev_tab.dev_flags = DEV_FLAGS_ANYUSE; | ||
759 | |||
760 | sprintf(&warning_output[0][0], | ||
761 | "%s is not on ide driver white list.", | ||
762 | auide_hwif.drive->id->model); | ||
763 | for ( i=strlen(&warning_output[0][0]) ; i<76; i++ ){ | ||
764 | sprintf(&warning_output[0][i]," "); | ||
765 | } | ||
766 | |||
767 | sprintf(&warning_output[1][0], | ||
768 | "To add %s please read 'Documentation/mips/AU1xxx_IDE.README'.", | ||
769 | auide_hwif.drive->id->model); | ||
770 | for ( i=strlen(&warning_output[1][0]) ; i<76; i++ ){ | ||
771 | sprintf(&warning_output[1][i]," "); | ||
772 | } | ||
773 | |||
774 | printk("\n****************************************"); | ||
775 | printk("****************************************\n"); | ||
776 | printk("* %s *\n",&warning_output[0][0]); | ||
777 | printk("* Switch to safe MWDMA Mode! "); | ||
778 | printk(" *\n"); | ||
779 | printk("* %s *\n",&warning_output[1][0]); | ||
780 | printk("****************************************"); | ||
781 | printk("****************************************\n\n"); | ||
782 | } | ||
783 | #else | 541 | #else |
784 | source_dev_tab.dev_id = DSCR_CMD0_ALWAYS; | 542 | flags = DEV_FLAGS_SYNC; |
785 | source_dev_tab.dev_tsize = 8; | ||
786 | source_dev_tab.dev_devwidth = 32; | ||
787 | source_dev_tab.dev_physaddr = (u32)AU1XXX_ATA_PHYS_ADDR; | ||
788 | source_dev_tab.dev_intlevel = 0; | ||
789 | source_dev_tab.dev_intpolarity = 0; | ||
790 | #endif | 543 | #endif |
791 | 544 | ||
792 | #if CONFIG_BLK_DEV_IDE_AU1XXX_BURSTABLE_ON | 545 | /* setup dev_tab for tx channel */ |
793 | /* set flags for tx channel */ | 546 | auide_init_dbdma_dev( &source_dev_tab, |
794 | source_dev_tab.dev_flags = DEV_FLAGS_OUT | 547 | dev_id, |
795 | | DEV_FLAGS_SYNC | 548 | tsize, devwidth, DEV_FLAGS_OUT | flags); |
796 | | DEV_FLAGS_BURSTABLE; | 549 | auide->tx_dev_id = au1xxx_ddma_add_device( &source_dev_tab ); |
797 | auide->tx_dev_id = au1xxx_ddma_add_device( &source_dev_tab ); | 550 | |
798 | /* set flags for rx channel */ | 551 | auide_init_dbdma_dev( &source_dev_tab, |
799 | source_dev_tab.dev_flags = DEV_FLAGS_IN | 552 | dev_id, |
800 | | DEV_FLAGS_SYNC | 553 | tsize, devwidth, DEV_FLAGS_IN | flags); |
801 | | DEV_FLAGS_BURSTABLE; | 554 | auide->rx_dev_id = au1xxx_ddma_add_device( &source_dev_tab ); |
802 | auide->rx_dev_id = au1xxx_ddma_add_device( &source_dev_tab ); | 555 | |
556 | /* We also need to add a target device for the DMA */ | ||
557 | auide_init_dbdma_dev( &target_dev_tab, | ||
558 | (u32)DSCR_CMD0_ALWAYS, | ||
559 | tsize, devwidth, DEV_FLAGS_ANYUSE); | ||
560 | auide->target_dev_id = au1xxx_ddma_add_device(&target_dev_tab); | ||
561 | |||
562 | /* Get a channel for TX */ | ||
563 | auide->tx_chan = au1xxx_dbdma_chan_alloc(auide->target_dev_id, | ||
564 | auide->tx_dev_id, | ||
565 | auide_ddma_tx_callback, | ||
566 | (void*)auide); | ||
567 | |||
568 | /* Get a channel for RX */ | ||
569 | auide->rx_chan = au1xxx_dbdma_chan_alloc(auide->rx_dev_id, | ||
570 | auide->target_dev_id, | ||
571 | auide_ddma_rx_callback, | ||
572 | (void*)auide); | ||
573 | |||
574 | auide->tx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->tx_chan, | ||
575 | NUM_DESCRIPTORS); | ||
576 | auide->rx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->rx_chan, | ||
577 | NUM_DESCRIPTORS); | ||
578 | |||
579 | hwif->dmatable_cpu = dma_alloc_coherent(auide->dev, | ||
580 | PRD_ENTRIES * PRD_BYTES, /* 1 Page */ | ||
581 | &hwif->dmatable_dma, GFP_KERNEL); | ||
582 | |||
583 | au1xxx_dbdma_start( auide->tx_chan ); | ||
584 | au1xxx_dbdma_start( auide->rx_chan ); | ||
585 | |||
586 | return 0; | ||
587 | } | ||
803 | #else | 588 | #else |
804 | /* set flags for tx channel */ | 589 | |
805 | source_dev_tab.dev_flags = DEV_FLAGS_OUT | DEV_FLAGS_SYNC; | 590 | static int auide_ddma_init( _auide_hwif *auide ) |
806 | auide->tx_dev_id = au1xxx_ddma_add_device( &source_dev_tab ); | 591 | { |
807 | /* set flags for rx channel */ | 592 | dbdev_tab_t source_dev_tab; |
808 | source_dev_tab.dev_flags = DEV_FLAGS_IN | DEV_FLAGS_SYNC; | 593 | int flags; |
809 | auide->rx_dev_id = au1xxx_ddma_add_device( &source_dev_tab ); | ||
810 | #endif | ||
811 | 594 | ||
812 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) | 595 | #ifdef IDE_AU1XXX_BURSTMODE |
813 | 596 | flags = DEV_FLAGS_SYNC | DEV_FLAGS_BURSTABLE; | |
814 | auide->target_dev_id = au1xxx_ddma_add_device(&target_dev_tab); | 597 | #else |
815 | 598 | flags = DEV_FLAGS_SYNC; | |
816 | /* Get a channel for TX */ | ||
817 | auide->tx_chan = au1xxx_dbdma_chan_alloc(auide->target_dev_id, | ||
818 | auide->tx_dev_id, | ||
819 | auide_ddma_tx_callback, | ||
820 | (void*)auide); | ||
821 | /* Get a channel for RX */ | ||
822 | auide->rx_chan = au1xxx_dbdma_chan_alloc(auide->rx_dev_id, | ||
823 | auide->target_dev_id, | ||
824 | auide_ddma_rx_callback, | ||
825 | (void*)auide); | ||
826 | #else /* CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA */ | ||
827 | /* | ||
828 | * Note: if call back is not enabled, update ctp->cur_ptr manually | ||
829 | */ | ||
830 | auide->tx_chan = au1xxx_dbdma_chan_alloc(DSCR_CMD0_ALWAYS, | ||
831 | auide->tx_dev_id, | ||
832 | NULL, | ||
833 | (void*)auide); | ||
834 | auide->rx_chan = au1xxx_dbdma_chan_alloc(auide->rx_dev_id, | ||
835 | DSCR_CMD0_ALWAYS, | ||
836 | NULL, | ||
837 | (void*)auide); | ||
838 | #endif | 599 | #endif |
839 | auide->tx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->tx_chan, | ||
840 | NUM_DESCRIPTORS); | ||
841 | auide->rx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->rx_chan, | ||
842 | NUM_DESCRIPTORS); | ||
843 | 600 | ||
844 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) | 601 | /* setup dev_tab for tx channel */ |
845 | hwif->dmatable_cpu = dma_alloc_coherent(auide->dev, | 602 | auide_init_dbdma_dev( &source_dev_tab, |
846 | PRD_ENTRIES * PRD_BYTES, /* 1 Page */ | 603 | (u32)DSCR_CMD0_ALWAYS, |
847 | &hwif->dmatable_dma, GFP_KERNEL); | 604 | 8, 32, DEV_FLAGS_OUT | flags); |
848 | 605 | auide->tx_dev_id = au1xxx_ddma_add_device( &source_dev_tab ); | |
849 | auide->sg_table = kmalloc(sizeof(struct scatterlist) * PRD_ENTRIES, | 606 | |
850 | GFP_KERNEL|GFP_DMA); | 607 | auide_init_dbdma_dev( &source_dev_tab, |
851 | if (auide->sg_table == NULL) { | 608 | (u32)DSCR_CMD0_ALWAYS, |
852 | return -ENOMEM; | 609 | 8, 32, DEV_FLAGS_IN | flags); |
853 | } | 610 | auide->rx_dev_id = au1xxx_ddma_add_device( &source_dev_tab ); |
854 | #endif | 611 | |
855 | au1xxx_dbdma_start( auide->tx_chan ); | 612 | /* Get a channel for TX */ |
856 | au1xxx_dbdma_start( auide->rx_chan ); | 613 | auide->tx_chan = au1xxx_dbdma_chan_alloc(DSCR_CMD0_ALWAYS, |
857 | return 0; | 614 | auide->tx_dev_id, |
615 | NULL, | ||
616 | (void*)auide); | ||
617 | |||
618 | /* Get a channel for RX */ | ||
619 | auide->rx_chan = au1xxx_dbdma_chan_alloc(auide->rx_dev_id, | ||
620 | DSCR_CMD0_ALWAYS, | ||
621 | NULL, | ||
622 | (void*)auide); | ||
623 | |||
624 | auide->tx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->tx_chan, | ||
625 | NUM_DESCRIPTORS); | ||
626 | auide->rx_desc_head = (void*)au1xxx_dbdma_ring_alloc(auide->rx_chan, | ||
627 | NUM_DESCRIPTORS); | ||
628 | |||
629 | au1xxx_dbdma_start( auide->tx_chan ); | ||
630 | au1xxx_dbdma_start( auide->rx_chan ); | ||
631 | |||
632 | return 0; | ||
858 | } | 633 | } |
634 | #endif | ||
859 | 635 | ||
860 | static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif) | 636 | static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif) |
861 | { | 637 | { |
862 | int i; | 638 | int i; |
863 | #define ide_ioreg_t unsigned long | 639 | unsigned long *ata_regs = hw->io_ports; |
864 | ide_ioreg_t *ata_regs = hw->io_ports; | 640 | |
865 | 641 | /* FIXME? */ | |
866 | /* fixme */ | 642 | for (i = 0; i < IDE_CONTROL_OFFSET; i++) { |
867 | for (i = 0; i < IDE_CONTROL_OFFSET; i++) { | 643 | *ata_regs++ = ahwif->regbase + (i << AU1XXX_ATA_REG_OFFSET); |
868 | *ata_regs++ = (ide_ioreg_t) ahwif->regbase | 644 | } |
869 | + (ide_ioreg_t)(i << AU1XXX_ATA_REG_OFFSET); | 645 | |
870 | } | 646 | /* set the Alternative Status register */ |
871 | 647 | *ata_regs = ahwif->regbase + (14 << AU1XXX_ATA_REG_OFFSET); | |
872 | /* set the Alternative Status register */ | ||
873 | *ata_regs = (ide_ioreg_t) ahwif->regbase | ||
874 | + (ide_ioreg_t)(14 << AU1XXX_ATA_REG_OFFSET); | ||
875 | } | 648 | } |
876 | 649 | ||
877 | static int au_ide_probe(struct device *dev) | 650 | static int au_ide_probe(struct device *dev) |
878 | { | 651 | { |
879 | struct platform_device *pdev = to_platform_device(dev); | 652 | struct platform_device *pdev = to_platform_device(dev); |
880 | _auide_hwif *ahwif = &auide_hwif; | 653 | _auide_hwif *ahwif = &auide_hwif; |
881 | ide_hwif_t *hwif; | 654 | ide_hwif_t *hwif; |
882 | struct resource *res; | 655 | struct resource *res; |
883 | int ret = 0; | 656 | int ret = 0; |
884 | 657 | ||
885 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) | 658 | #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA) |
886 | char *mode = "MWDMA2"; | 659 | char *mode = "MWDMA2"; |
887 | #elif defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA) | 660 | #elif defined(CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA) |
888 | char *mode = "PIO+DDMA(offload)"; | 661 | char *mode = "PIO+DDMA(offload)"; |
889 | #endif | 662 | #endif |
890 | 663 | ||
891 | memset(&auide_hwif, 0, sizeof(_auide_hwif)); | 664 | memset(&auide_hwif, 0, sizeof(_auide_hwif)); |
892 | auide_hwif.dev = 0; | 665 | auide_hwif.dev = 0; |
893 | 666 | ||
894 | ahwif->dev = dev; | 667 | ahwif->dev = dev; |
895 | ahwif->irq = platform_get_irq(pdev, 0); | 668 | ahwif->irq = platform_get_irq(pdev, 0); |
@@ -902,11 +675,11 @@ static int au_ide_probe(struct device *dev) | |||
902 | goto out; | 675 | goto out; |
903 | } | 676 | } |
904 | 677 | ||
905 | if (!request_mem_region (res->start, res->end-res->start, pdev->name)) { | 678 | if (!request_mem_region (res->start, res->end-res->start, pdev->name)) { |
906 | pr_debug("%s: request_mem_region failed\n", DRV_NAME); | 679 | pr_debug("%s: request_mem_region failed\n", DRV_NAME); |
907 | ret = -EBUSY; | 680 | ret = -EBUSY; |
908 | goto out; | 681 | goto out; |
909 | } | 682 | } |
910 | 683 | ||
911 | ahwif->regbase = (u32)ioremap(res->start, res->end-res->start); | 684 | ahwif->regbase = (u32)ioremap(res->start, res->end-res->start); |
912 | if (ahwif->regbase == 0) { | 685 | if (ahwif->regbase == 0) { |
@@ -914,130 +687,92 @@ static int au_ide_probe(struct device *dev) | |||
914 | goto out; | 687 | goto out; |
915 | } | 688 | } |
916 | 689 | ||
917 | hwif = &ide_hwifs[pdev->id]; | 690 | /* FIXME: This might possibly break PCMCIA IDE devices */ |
691 | |||
692 | hwif = &ide_hwifs[pdev->id]; | ||
918 | hw_regs_t *hw = &hwif->hw; | 693 | hw_regs_t *hw = &hwif->hw; |
919 | hwif->irq = hw->irq = ahwif->irq; | 694 | hwif->irq = hw->irq = ahwif->irq; |
920 | hwif->chipset = ide_au1xxx; | 695 | hwif->chipset = ide_au1xxx; |
921 | 696 | ||
922 | auide_setup_ports(hw, ahwif); | 697 | auide_setup_ports(hw, ahwif); |
923 | memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports)); | 698 | memcpy(hwif->io_ports, hw->io_ports, sizeof(hwif->io_ports)); |
924 | 699 | ||
925 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ | 700 | hwif->ultra_mask = 0x0; /* Disable Ultra DMA */ |
926 | hwif->rqsize = CONFIG_BLK_DEV_IDE_AU1XXX_SEQTS_PER_RQ; | ||
927 | hwif->rqsize = ((hwif->rqsize > AU1XXX_ATA_RQSIZE) | ||
928 | || (hwif->rqsize < 32)) ? AU1XXX_ATA_RQSIZE : hwif->rqsize; | ||
929 | #else /* if kernel config is not set */ | ||
930 | hwif->rqsize = AU1XXX_ATA_RQSIZE; | ||
931 | #endif | ||
932 | |||
933 | hwif->ultra_mask = 0x0; /* Disable Ultra DMA */ | ||
934 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 701 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
935 | hwif->mwdma_mask = 0x07; /* Multimode-2 DMA */ | 702 | hwif->mwdma_mask = 0x07; /* Multimode-2 DMA */ |
936 | hwif->swdma_mask = 0x07; | 703 | hwif->swdma_mask = 0x00; |
937 | #else | 704 | #else |
938 | hwif->mwdma_mask = 0x0; | 705 | hwif->mwdma_mask = 0x0; |
939 | hwif->swdma_mask = 0x0; | 706 | hwif->swdma_mask = 0x0; |
707 | #endif | ||
708 | |||
709 | hwif->noprobe = 0; | ||
710 | hwif->drives[0].unmask = 1; | ||
711 | hwif->drives[1].unmask = 1; | ||
712 | |||
713 | /* hold should be on in all cases */ | ||
714 | hwif->hold = 1; | ||
715 | hwif->mmio = 2; | ||
716 | |||
717 | /* If the user has selected DDMA assisted copies, | ||
718 | then set up a few local I/O function entry points | ||
719 | */ | ||
720 | |||
721 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA | ||
722 | hwif->INSW = auide_insw; | ||
723 | hwif->OUTSW = auide_outsw; | ||
940 | #endif | 724 | #endif |
941 | //hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET]; | 725 | |
942 | hwif->noprobe = 0; | 726 | hwif->tuneproc = &auide_tune_drive; |
943 | hwif->drives[0].unmask = 1; | 727 | hwif->speedproc = &auide_tune_chipset; |
944 | hwif->drives[1].unmask = 1; | ||
945 | |||
946 | /* hold should be on in all cases */ | ||
947 | hwif->hold = 1; | ||
948 | hwif->mmio = 2; | ||
949 | |||
950 | /* set up local I/O function entry points */ | ||
951 | hwif->INB = auide_inb; | ||
952 | hwif->INW = auide_inw; | ||
953 | hwif->INL = auide_inl; | ||
954 | hwif->INSW = auide_insw; | ||
955 | hwif->INSL = auide_insl; | ||
956 | hwif->OUTB = auide_outb; | ||
957 | hwif->OUTBSYNC = auide_outbsync; | ||
958 | hwif->OUTW = auide_outw; | ||
959 | hwif->OUTL = auide_outl; | ||
960 | hwif->OUTSW = auide_outsw; | ||
961 | hwif->OUTSL = auide_outsl; | ||
962 | |||
963 | hwif->tuneproc = &auide_tune_drive; | ||
964 | hwif->speedproc = &auide_tune_chipset; | ||
965 | 728 | ||
966 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 729 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
967 | hwif->ide_dma_off_quietly = &auide_dma_off_quietly; | 730 | hwif->ide_dma_off_quietly = &auide_dma_off_quietly; |
968 | hwif->ide_dma_timeout = &auide_dma_timeout; | 731 | hwif->ide_dma_timeout = &auide_dma_timeout; |
969 | 732 | ||
970 | hwif->ide_dma_check = &auide_dma_check; | 733 | hwif->ide_dma_check = &auide_dma_check; |
971 | hwif->dma_exec_cmd = &auide_dma_exec_cmd; | 734 | hwif->dma_exec_cmd = &auide_dma_exec_cmd; |
972 | hwif->dma_start = &auide_dma_start; | 735 | hwif->dma_start = &auide_dma_start; |
973 | hwif->ide_dma_end = &auide_dma_end; | 736 | hwif->ide_dma_end = &auide_dma_end; |
974 | hwif->dma_setup = &auide_dma_setup; | 737 | hwif->dma_setup = &auide_dma_setup; |
975 | hwif->ide_dma_test_irq = &auide_dma_test_irq; | 738 | hwif->ide_dma_test_irq = &auide_dma_test_irq; |
976 | hwif->ide_dma_host_off = &auide_dma_host_off; | 739 | hwif->ide_dma_host_off = &auide_dma_host_off; |
977 | hwif->ide_dma_host_on = &auide_dma_host_on; | 740 | hwif->ide_dma_host_on = &auide_dma_host_on; |
978 | hwif->ide_dma_lostirq = &auide_dma_lostirq; | 741 | hwif->ide_dma_lostirq = &auide_dma_lostirq; |
979 | hwif->ide_dma_on = &auide_dma_on; | 742 | hwif->ide_dma_on = &auide_dma_on; |
980 | 743 | ||
981 | hwif->autodma = 1; | 744 | hwif->autodma = 1; |
982 | hwif->drives[0].autodma = hwif->autodma; | 745 | hwif->drives[0].autodma = hwif->autodma; |
983 | hwif->drives[1].autodma = hwif->autodma; | 746 | hwif->drives[1].autodma = hwif->autodma; |
984 | hwif->atapi_dma = 1; | 747 | hwif->atapi_dma = 1; |
985 | hwif->drives[0].using_dma = 1; | 748 | |
986 | hwif->drives[1].using_dma = 1; | ||
987 | #else /* !CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */ | 749 | #else /* !CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */ |
988 | hwif->autodma = 0; | 750 | hwif->autodma = 0; |
989 | hwif->channel = 0; | 751 | hwif->channel = 0; |
990 | hwif->hold = 1; | 752 | hwif->hold = 1; |
991 | hwif->select_data = 0; /* no chipset-specific code */ | 753 | hwif->select_data = 0; /* no chipset-specific code */ |
992 | hwif->config_data = 0; /* no chipset-specific code */ | 754 | hwif->config_data = 0; /* no chipset-specific code */ |
993 | 755 | ||
994 | hwif->drives[0].autodma = 0; | 756 | hwif->drives[0].autodma = 0; |
995 | hwif->drives[0].drive_data = 0; /* no drive data */ | 757 | hwif->drives[0].autotune = 1; /* 1=autotune, 2=noautotune, 0=default */ |
996 | hwif->drives[0].using_dma = 0; | ||
997 | hwif->drives[0].waiting_for_dma = 0; | ||
998 | hwif->drives[0].autotune = 1; /* 1=autotune, 2=noautotune, 0=default */ | ||
999 | /* secondary hdd not supported */ | ||
1000 | hwif->drives[1].autodma = 0; | ||
1001 | |||
1002 | hwif->drives[1].drive_data = 0; | ||
1003 | hwif->drives[1].using_dma = 0; | ||
1004 | hwif->drives[1].waiting_for_dma = 0; | ||
1005 | hwif->drives[1].autotune = 2; /* 1=autotune, 2=noautotune, 0=default */ | ||
1006 | #endif | ||
1007 | hwif->drives[0].io_32bit = 0; /* 0=16-bit, 1=32-bit, 2/3=32bit+sync */ | ||
1008 | hwif->drives[1].io_32bit = 0; /* 0=16-bit, 1=32-bit, 2/3=32bit+sync */ | ||
1009 | |||
1010 | /*Register Driver with PM Framework*/ | ||
1011 | #ifdef CONFIG_PM | ||
1012 | auide_hwif.pm.lock = SPIN_LOCK_UNLOCKED; | ||
1013 | auide_hwif.pm.stopped = 0; | ||
1014 | |||
1015 | auide_hwif.pm.dev = new_au1xxx_power_device( "ide", | ||
1016 | &au1200ide_pm_callback, | ||
1017 | NULL); | ||
1018 | if ( auide_hwif.pm.dev == NULL ) | ||
1019 | printk(KERN_INFO "Unable to create a power management \ | ||
1020 | device entry for the au1200-IDE.\n"); | ||
1021 | else | ||
1022 | printk(KERN_INFO "Power management device entry for the \ | ||
1023 | au1200-IDE loaded.\n"); | ||
1024 | #endif | 758 | #endif |
759 | hwif->drives[0].no_io_32bit = 1; | ||
1025 | 760 | ||
1026 | auide_hwif.hwif = hwif; | 761 | auide_hwif.hwif = hwif; |
1027 | hwif->hwif_data = &auide_hwif; | 762 | hwif->hwif_data = &auide_hwif; |
1028 | 763 | ||
1029 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA | 764 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_PIO_DBDMA |
1030 | auide_ddma_init(&auide_hwif); | 765 | auide_ddma_init(&auide_hwif); |
1031 | dbdma_init_done = 1; | 766 | dbdma_init_done = 1; |
1032 | #endif | 767 | #endif |
1033 | 768 | ||
1034 | probe_hwif_init(hwif); | 769 | probe_hwif_init(hwif); |
1035 | dev_set_drvdata(dev, hwif); | 770 | dev_set_drvdata(dev, hwif); |
1036 | 771 | ||
1037 | printk(KERN_INFO "Au1xxx IDE(builtin) configured for %s\n", mode ); | 772 | printk(KERN_INFO "Au1xxx IDE(builtin) configured for %s\n", mode ); |
1038 | 773 | ||
1039 | out: | 774 | out: |
1040 | return ret; | 775 | return ret; |
1041 | } | 776 | } |
1042 | 777 | ||
1043 | static int au_ide_remove(struct device *dev) | 778 | static int au_ide_remove(struct device *dev) |
@@ -1045,7 +780,7 @@ static int au_ide_remove(struct device *dev) | |||
1045 | struct platform_device *pdev = to_platform_device(dev); | 780 | struct platform_device *pdev = to_platform_device(dev); |
1046 | struct resource *res; | 781 | struct resource *res; |
1047 | ide_hwif_t *hwif = dev_get_drvdata(dev); | 782 | ide_hwif_t *hwif = dev_get_drvdata(dev); |
1048 | _auide_hwif *ahwif = &auide_hwif; | 783 | _auide_hwif *ahwif = &auide_hwif; |
1049 | 784 | ||
1050 | ide_unregister(hwif - ide_hwifs); | 785 | ide_unregister(hwif - ide_hwifs); |
1051 | 786 | ||
@@ -1069,180 +804,11 @@ static int __init au_ide_init(void) | |||
1069 | return driver_register(&au1200_ide_driver); | 804 | return driver_register(&au1200_ide_driver); |
1070 | } | 805 | } |
1071 | 806 | ||
1072 | static void __init au_ide_exit(void) | 807 | static void __exit au_ide_exit(void) |
1073 | { | 808 | { |
1074 | driver_unregister(&au1200_ide_driver); | 809 | driver_unregister(&au1200_ide_driver); |
1075 | } | 810 | } |
1076 | 811 | ||
1077 | #ifdef CONFIG_PM | ||
1078 | int au1200ide_pm_callback( au1xxx_power_dev_t *dev,\ | ||
1079 | au1xxx_request_t request, void *data) { | ||
1080 | |||
1081 | unsigned int d, err = 0; | ||
1082 | unsigned long flags; | ||
1083 | |||
1084 | spin_lock_irqsave(auide_hwif.pm.lock, flags); | ||
1085 | |||
1086 | switch (request){ | ||
1087 | case AU1XXX_PM_SLEEP: | ||
1088 | err = au1xxxide_pm_sleep(dev); | ||
1089 | break; | ||
1090 | case AU1XXX_PM_WAKEUP: | ||
1091 | d = *((unsigned int*)data); | ||
1092 | if ( d > 0 && d <= 99) { | ||
1093 | err = au1xxxide_pm_standby(dev); | ||
1094 | } | ||
1095 | else { | ||
1096 | err = au1xxxide_pm_resume(dev); | ||
1097 | } | ||
1098 | break; | ||
1099 | case AU1XXX_PM_GETSTATUS: | ||
1100 | err = au1xxxide_pm_getstatus(dev); | ||
1101 | break; | ||
1102 | case AU1XXX_PM_ACCESS: | ||
1103 | err = au1xxxide_pm_access(dev); | ||
1104 | break; | ||
1105 | case AU1XXX_PM_IDLE: | ||
1106 | err = au1xxxide_pm_idle(dev); | ||
1107 | break; | ||
1108 | case AU1XXX_PM_CLEANUP: | ||
1109 | err = au1xxxide_pm_cleanup(dev); | ||
1110 | break; | ||
1111 | default: | ||
1112 | err = -1; | ||
1113 | break; | ||
1114 | } | ||
1115 | |||
1116 | spin_unlock_irqrestore(auide_hwif.pm.lock, flags); | ||
1117 | |||
1118 | return err; | ||
1119 | } | ||
1120 | |||
1121 | static int au1xxxide_pm_standby( au1xxx_power_dev_t *dev ) { | ||
1122 | return 0; | ||
1123 | } | ||
1124 | |||
1125 | static int au1xxxide_pm_sleep( au1xxx_power_dev_t *dev ) { | ||
1126 | |||
1127 | int retval; | ||
1128 | ide_hwif_t *hwif = auide_hwif.hwif; | ||
1129 | struct request rq; | ||
1130 | struct request_pm_state rqpm; | ||
1131 | ide_task_t args; | ||
1132 | |||
1133 | if(auide_hwif.pm.stopped) | ||
1134 | return -1; | ||
1135 | |||
1136 | /* | ||
1137 | * wait until hard disc is ready | ||
1138 | */ | ||
1139 | if ( wait_for_ready(&hwif->drives[0], 35000) ) { | ||
1140 | printk("Wait for drive sleep timeout!\n"); | ||
1141 | retval = -1; | ||
1142 | } | ||
1143 | |||
1144 | /* | ||
1145 | * sequenz to tell the high level ide driver that pm is resuming | ||
1146 | */ | ||
1147 | memset(&rq, 0, sizeof(rq)); | ||
1148 | memset(&rqpm, 0, sizeof(rqpm)); | ||
1149 | memset(&args, 0, sizeof(args)); | ||
1150 | rq.flags = REQ_PM_SUSPEND; | ||
1151 | rq.special = &args; | ||
1152 | rq.pm = &rqpm; | ||
1153 | rqpm.pm_step = ide_pm_state_start_suspend; | ||
1154 | rqpm.pm_state = PMSG_SUSPEND; | ||
1155 | |||
1156 | retval = ide_do_drive_cmd(&hwif->drives[0], &rq, ide_wait); | ||
1157 | |||
1158 | if (wait_for_ready (&hwif->drives[0], 35000)) { | ||
1159 | printk("Wait for drive sleep timeout!\n"); | ||
1160 | retval = -1; | ||
1161 | } | ||
1162 | |||
1163 | /* | ||
1164 | * stop dbdma channels | ||
1165 | */ | ||
1166 | au1xxx_dbdma_reset(auide_hwif.tx_chan); | ||
1167 | au1xxx_dbdma_reset(auide_hwif.rx_chan); | ||
1168 | |||
1169 | auide_hwif.pm.stopped = 1; | ||
1170 | |||
1171 | return retval; | ||
1172 | } | ||
1173 | |||
1174 | static int au1xxxide_pm_resume( au1xxx_power_dev_t *dev ) { | ||
1175 | |||
1176 | int retval; | ||
1177 | ide_hwif_t *hwif = auide_hwif.hwif; | ||
1178 | struct request rq; | ||
1179 | struct request_pm_state rqpm; | ||
1180 | ide_task_t args; | ||
1181 | |||
1182 | if(!auide_hwif.pm.stopped) | ||
1183 | return -1; | ||
1184 | |||
1185 | /* | ||
1186 | * start dbdma channels | ||
1187 | */ | ||
1188 | au1xxx_dbdma_start(auide_hwif.tx_chan); | ||
1189 | au1xxx_dbdma_start(auide_hwif.rx_chan); | ||
1190 | |||
1191 | /* | ||
1192 | * wait until hard disc is ready | ||
1193 | */ | ||
1194 | if (wait_for_ready ( &hwif->drives[0], 35000)) { | ||
1195 | printk("Wait for drive wake up timeout!\n"); | ||
1196 | retval = -1; | ||
1197 | } | ||
1198 | |||
1199 | /* | ||
1200 | * sequenz to tell the high level ide driver that pm is resuming | ||
1201 | */ | ||
1202 | memset(&rq, 0, sizeof(rq)); | ||
1203 | memset(&rqpm, 0, sizeof(rqpm)); | ||
1204 | memset(&args, 0, sizeof(args)); | ||
1205 | rq.flags = REQ_PM_RESUME; | ||
1206 | rq.special = &args; | ||
1207 | rq.pm = &rqpm; | ||
1208 | rqpm.pm_step = ide_pm_state_start_resume; | ||
1209 | rqpm.pm_state = PMSG_ON; | ||
1210 | |||
1211 | retval = ide_do_drive_cmd(&hwif->drives[0], &rq, ide_head_wait); | ||
1212 | |||
1213 | /* | ||
1214 | * wait for hard disc | ||
1215 | */ | ||
1216 | if ( wait_for_ready(&hwif->drives[0], 35000) ) { | ||
1217 | printk("Wait for drive wake up timeout!\n"); | ||
1218 | retval = -1; | ||
1219 | } | ||
1220 | |||
1221 | auide_hwif.pm.stopped = 0; | ||
1222 | |||
1223 | return retval; | ||
1224 | } | ||
1225 | |||
1226 | static int au1xxxide_pm_getstatus( au1xxx_power_dev_t *dev ) { | ||
1227 | return dev->cur_state; | ||
1228 | } | ||
1229 | |||
1230 | static int au1xxxide_pm_access( au1xxx_power_dev_t *dev ) { | ||
1231 | if (dev->cur_state != AWAKE_STATE) | ||
1232 | return 0; | ||
1233 | else | ||
1234 | return -1; | ||
1235 | } | ||
1236 | |||
1237 | static int au1xxxide_pm_idle( au1xxx_power_dev_t *dev ) { | ||
1238 | return 0; | ||
1239 | } | ||
1240 | |||
1241 | static int au1xxxide_pm_cleanup( au1xxx_power_dev_t *dev ) { | ||
1242 | return 0; | ||
1243 | } | ||
1244 | #endif /* CONFIG_PM */ | ||
1245 | |||
1246 | MODULE_LICENSE("GPL"); | 812 | MODULE_LICENSE("GPL"); |
1247 | MODULE_DESCRIPTION("AU1200 IDE driver"); | 813 | MODULE_DESCRIPTION("AU1200 IDE driver"); |
1248 | 814 | ||
diff --git a/drivers/ide/pci/sgiioc4.c b/drivers/ide/pci/sgiioc4.c index af526b671c4e..4ee597d08797 100644 --- a/drivers/ide/pci/sgiioc4.c +++ b/drivers/ide/pci/sgiioc4.c | |||
@@ -622,12 +622,18 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev, ide_pci_device_t * d) | |||
622 | ide_hwif_t *hwif; | 622 | ide_hwif_t *hwif; |
623 | int h; | 623 | int h; |
624 | 624 | ||
625 | /* | ||
626 | * Find an empty HWIF; if none available, return -ENOMEM. | ||
627 | */ | ||
625 | for (h = 0; h < MAX_HWIFS; ++h) { | 628 | for (h = 0; h < MAX_HWIFS; ++h) { |
626 | hwif = &ide_hwifs[h]; | 629 | hwif = &ide_hwifs[h]; |
627 | /* Find an empty HWIF */ | ||
628 | if (hwif->chipset == ide_unknown) | 630 | if (hwif->chipset == ide_unknown) |
629 | break; | 631 | break; |
630 | } | 632 | } |
633 | if (h == MAX_HWIFS) { | ||
634 | printk(KERN_ERR "%s: too many IDE interfaces, no room in table\n", d->name); | ||
635 | return -ENOMEM; | ||
636 | } | ||
631 | 637 | ||
632 | /* Get the CmdBlk and CtrlBlk Base Registers */ | 638 | /* Get the CmdBlk and CtrlBlk Base Registers */ |
633 | base = pci_resource_start(dev, 0) + IOC4_CMD_OFFSET; | 639 | base = pci_resource_start(dev, 0) + IOC4_CMD_OFFSET; |
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index 7161ce0ef5aa..86fb1e0286d3 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c | |||
@@ -80,6 +80,7 @@ static struct via_isa_bridge { | |||
80 | u16 flags; | 80 | u16 flags; |
81 | } via_isa_bridges[] = { | 81 | } via_isa_bridges[] = { |
82 | { "vt6410", PCI_DEVICE_ID_VIA_6410, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, | 82 | { "vt6410", PCI_DEVICE_ID_VIA_6410, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, |
83 | { "vt8251", PCI_DEVICE_ID_VIA_8251, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, | ||
83 | { "vt8237", PCI_DEVICE_ID_VIA_8237, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, | 84 | { "vt8237", PCI_DEVICE_ID_VIA_8237, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, |
84 | { "vt8235", PCI_DEVICE_ID_VIA_8235, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, | 85 | { "vt8235", PCI_DEVICE_ID_VIA_8235, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, |
85 | { "vt8233a", PCI_DEVICE_ID_VIA_8233A, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, | 86 | { "vt8233a", PCI_DEVICE_ID_VIA_8233A, 0x00, 0x2f, VIA_UDMA_133 | VIA_BAD_AST }, |
diff --git a/drivers/ieee1394/hosts.h b/drivers/ieee1394/hosts.h index 38f42112dff0..ae9b02cc013f 100644 --- a/drivers/ieee1394/hosts.h +++ b/drivers/ieee1394/hosts.h | |||
@@ -41,6 +41,7 @@ struct hpsb_host { | |||
41 | /* this nodes state */ | 41 | /* this nodes state */ |
42 | unsigned in_bus_reset:1; | 42 | unsigned in_bus_reset:1; |
43 | unsigned is_shutdown:1; | 43 | unsigned is_shutdown:1; |
44 | unsigned resume_packet_sent:1; | ||
44 | 45 | ||
45 | /* this nodes' duties on the bus */ | 46 | /* this nodes' duties on the bus */ |
46 | unsigned is_root:1; | 47 | unsigned is_root:1; |
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 7fff5a1d2ea4..0ea37b1bccb2 100644 --- a/drivers/ieee1394/nodemgr.c +++ b/drivers/ieee1394/nodemgr.c | |||
@@ -1349,6 +1349,33 @@ static void nodemgr_update_pdrv(struct node_entry *ne) | |||
1349 | } | 1349 | } |
1350 | 1350 | ||
1351 | 1351 | ||
1352 | /* Write the BROADCAST_CHANNEL as per IEEE1394a 8.3.2.3.11 and 8.4.2.3. This | ||
1353 | * seems like an optional service but in the end it is practically mandatory | ||
1354 | * as a consequence of these clauses. | ||
1355 | * | ||
1356 | * Note that we cannot do a broadcast write to all nodes at once because some | ||
1357 | * pre-1394a devices would hang. */ | ||
1358 | static void nodemgr_irm_write_bc(struct node_entry *ne, int generation) | ||
1359 | { | ||
1360 | const u64 bc_addr = (CSR_REGISTER_BASE | CSR_BROADCAST_CHANNEL); | ||
1361 | quadlet_t bc_remote, bc_local; | ||
1362 | int ret; | ||
1363 | |||
1364 | if (!ne->host->is_irm || ne->generation != generation || | ||
1365 | ne->nodeid == ne->host->node_id) | ||
1366 | return; | ||
1367 | |||
1368 | bc_local = cpu_to_be32(ne->host->csr.broadcast_channel); | ||
1369 | |||
1370 | /* Check if the register is implemented and 1394a compliant. */ | ||
1371 | ret = hpsb_read(ne->host, ne->nodeid, generation, bc_addr, &bc_remote, | ||
1372 | sizeof(bc_remote)); | ||
1373 | if (!ret && bc_remote & cpu_to_be32(0x80000000) && | ||
1374 | bc_remote != bc_local) | ||
1375 | hpsb_node_write(ne, bc_addr, &bc_local, sizeof(bc_local)); | ||
1376 | } | ||
1377 | |||
1378 | |||
1352 | static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int generation) | 1379 | static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int generation) |
1353 | { | 1380 | { |
1354 | struct device *dev; | 1381 | struct device *dev; |
@@ -1360,6 +1387,8 @@ static void nodemgr_probe_ne(struct host_info *hi, struct node_entry *ne, int ge | |||
1360 | if (!dev) | 1387 | if (!dev) |
1361 | return; | 1388 | return; |
1362 | 1389 | ||
1390 | nodemgr_irm_write_bc(ne, generation); | ||
1391 | |||
1363 | /* If "needs_probe", then this is either a new or changed node we | 1392 | /* If "needs_probe", then this is either a new or changed node we |
1364 | * rescan totally. If the generation matches for an existing node | 1393 | * rescan totally. If the generation matches for an existing node |
1365 | * (one that existed prior to the bus reset) we send update calls | 1394 | * (one that existed prior to the bus reset) we send update calls |
@@ -1413,9 +1442,25 @@ static void nodemgr_node_probe(struct host_info *hi, int generation) | |||
1413 | return; | 1442 | return; |
1414 | } | 1443 | } |
1415 | 1444 | ||
1416 | /* Because we are a 1394a-2000 compliant IRM, we need to inform all the other | 1445 | static int nodemgr_send_resume_packet(struct hpsb_host *host) |
1417 | * nodes of the broadcast channel. (Really we're only setting the validity | 1446 | { |
1418 | * bit). Other IRM responsibilities go in here as well. */ | 1447 | struct hpsb_packet *packet; |
1448 | int ret = 1; | ||
1449 | |||
1450 | packet = hpsb_make_phypacket(host, | ||
1451 | 0x003c0000 | NODEID_TO_NODE(host->node_id) << 24); | ||
1452 | if (packet) { | ||
1453 | packet->no_waiter = 1; | ||
1454 | packet->generation = get_hpsb_generation(host); | ||
1455 | ret = hpsb_send_packet(packet); | ||
1456 | } | ||
1457 | if (ret) | ||
1458 | HPSB_WARN("fw-host%d: Failed to broadcast resume packet", | ||
1459 | host->id); | ||
1460 | return ret; | ||
1461 | } | ||
1462 | |||
1463 | /* Perform a few high-level IRM responsibilities. */ | ||
1419 | static int nodemgr_do_irm_duties(struct hpsb_host *host, int cycles) | 1464 | static int nodemgr_do_irm_duties(struct hpsb_host *host, int cycles) |
1420 | { | 1465 | { |
1421 | quadlet_t bc; | 1466 | quadlet_t bc; |
@@ -1424,13 +1469,8 @@ static int nodemgr_do_irm_duties(struct hpsb_host *host, int cycles) | |||
1424 | if (!host->is_irm || host->irm_id == (nodeid_t)-1) | 1469 | if (!host->is_irm || host->irm_id == (nodeid_t)-1) |
1425 | return 1; | 1470 | return 1; |
1426 | 1471 | ||
1427 | host->csr.broadcast_channel |= 0x40000000; /* set validity bit */ | 1472 | /* We are a 1394a-2000 compliant IRM. Set the validity bit. */ |
1428 | 1473 | host->csr.broadcast_channel |= 0x40000000; | |
1429 | bc = cpu_to_be32(host->csr.broadcast_channel); | ||
1430 | |||
1431 | hpsb_write(host, LOCAL_BUS | ALL_NODES, get_hpsb_generation(host), | ||
1432 | (CSR_REGISTER_BASE | CSR_BROADCAST_CHANNEL), | ||
1433 | &bc, sizeof(quadlet_t)); | ||
1434 | 1474 | ||
1435 | /* If there is no bus manager then we should set the root node's | 1475 | /* If there is no bus manager then we should set the root node's |
1436 | * force_root bit to promote bus stability per the 1394 | 1476 | * force_root bit to promote bus stability per the 1394 |
@@ -1463,6 +1503,13 @@ static int nodemgr_do_irm_duties(struct hpsb_host *host, int cycles) | |||
1463 | } | 1503 | } |
1464 | } | 1504 | } |
1465 | 1505 | ||
1506 | /* Some devices suspend their ports while being connected to an inactive | ||
1507 | * host adapter, i.e. if connected before the low-level driver is | ||
1508 | * loaded. They become visible either when physically unplugged and | ||
1509 | * replugged, or when receiving a resume packet. Send one once. */ | ||
1510 | if (!host->resume_packet_sent && !nodemgr_send_resume_packet(host)) | ||
1511 | host->resume_packet_sent = 1; | ||
1512 | |||
1466 | return 1; | 1513 | return 1; |
1467 | } | 1514 | } |
1468 | 1515 | ||
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c index ef7ee924ecc6..b77e2692ba3a 100644 --- a/drivers/input/misc/wistron_btns.c +++ b/drivers/input/misc/wistron_btns.c | |||
@@ -339,7 +339,7 @@ static struct dmi_system_id dmi_ids[] = { | |||
339 | }, | 339 | }, |
340 | .driver_data = keymap_acer_travelmate_240 | 340 | .driver_data = keymap_acer_travelmate_240 |
341 | }, | 341 | }, |
342 | { 0, } | 342 | { NULL, } |
343 | }; | 343 | }; |
344 | 344 | ||
345 | static int __init select_keymap(void) | 345 | static int __init select_keymap(void) |
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 4acc7fd4cd0f..4f41ec3e4332 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c | |||
@@ -42,7 +42,7 @@ static struct alps_model_info alps_model_data[] = { | |||
42 | { { 0x53, 0x02, 0x14 }, 0xf8, 0xf8, 0 }, | 42 | { { 0x53, 0x02, 0x14 }, 0xf8, 0xf8, 0 }, |
43 | { { 0x63, 0x02, 0x0a }, 0xf8, 0xf8, 0 }, | 43 | { { 0x63, 0x02, 0x0a }, 0xf8, 0xf8, 0 }, |
44 | { { 0x63, 0x02, 0x14 }, 0xf8, 0xf8, 0 }, | 44 | { { 0x63, 0x02, 0x14 }, 0xf8, 0xf8, 0 }, |
45 | { { 0x63, 0x02, 0x28 }, 0xf8, 0xf8, 0 }, | 45 | { { 0x63, 0x02, 0x28 }, 0xf8, 0xf8, ALPS_FW_BK_2 }, /* Fujitsu Siemens S6010 */ |
46 | { { 0x63, 0x02, 0x3c }, 0x8f, 0x8f, ALPS_WHEEL }, /* Toshiba Satellite S2400-103 */ | 46 | { { 0x63, 0x02, 0x3c }, 0x8f, 0x8f, ALPS_WHEEL }, /* Toshiba Satellite S2400-103 */ |
47 | { { 0x63, 0x02, 0x50 }, 0xef, 0xef, ALPS_FW_BK_1 }, /* NEC Versa L320 */ | 47 | { { 0x63, 0x02, 0x50 }, 0xef, 0xef, ALPS_FW_BK_1 }, /* NEC Versa L320 */ |
48 | { { 0x63, 0x02, 0x64 }, 0xf8, 0xf8, 0 }, | 48 | { { 0x63, 0x02, 0x64 }, 0xf8, 0xf8, 0 }, |
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index 3fc8cdd94c3d..5bb36274a5c6 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
@@ -933,7 +933,7 @@ static void do_monitor_cpu_combined(void) | |||
933 | if (state0->overtemp > 0) { | 933 | if (state0->overtemp > 0) { |
934 | state0->rpm = state0->mpu.rmaxn_exhaust_fan; | 934 | state0->rpm = state0->mpu.rmaxn_exhaust_fan; |
935 | state0->intake_rpm = intake = state0->mpu.rmaxn_intake_fan; | 935 | state0->intake_rpm = intake = state0->mpu.rmaxn_intake_fan; |
936 | pump = state0->pump_min; | 936 | pump = state0->pump_max; |
937 | goto do_set_fans; | 937 | goto do_set_fans; |
938 | } | 938 | } |
939 | 939 | ||
diff --git a/drivers/macintosh/windfarm_pm81.c b/drivers/macintosh/windfarm_pm81.c index 322c74b2687f..80ddf9776bde 100644 --- a/drivers/macintosh/windfarm_pm81.c +++ b/drivers/macintosh/windfarm_pm81.c | |||
@@ -207,7 +207,7 @@ static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = { | |||
207 | }, | 207 | }, |
208 | /* Model ID 3 */ | 208 | /* Model ID 3 */ |
209 | { | 209 | { |
210 | .model_id = 2, | 210 | .model_id = 3, |
211 | .itarget = 0x350000, | 211 | .itarget = 0x350000, |
212 | .gd = 0x08e00000, | 212 | .gd = 0x08e00000, |
213 | .gp = 0x00566666, | 213 | .gp = 0x00566666, |
@@ -219,7 +219,7 @@ static struct wf_smu_sys_fans_param wf_smu_sys_all_params[] = { | |||
219 | }, | 219 | }, |
220 | /* Model ID 5 */ | 220 | /* Model ID 5 */ |
221 | { | 221 | { |
222 | .model_id = 2, | 222 | .model_id = 5, |
223 | .itarget = 0x3a0000, | 223 | .itarget = 0x3a0000, |
224 | .gd = 0x15400000, | 224 | .gd = 0x15400000, |
225 | .gp = 0x00233333, | 225 | .gp = 0x00233333, |
diff --git a/drivers/md/md.c b/drivers/md/md.c index cd12fca73b0d..8175a2a222da 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c | |||
@@ -1729,7 +1729,7 @@ level_show(mddev_t *mddev, char *page) | |||
1729 | if (p == NULL && mddev->raid_disks == 0) | 1729 | if (p == NULL && mddev->raid_disks == 0) |
1730 | return 0; | 1730 | return 0; |
1731 | if (mddev->level >= 0) | 1731 | if (mddev->level >= 0) |
1732 | return sprintf(page, "RAID-%d\n", mddev->level); | 1732 | return sprintf(page, "raid%d\n", mddev->level); |
1733 | else | 1733 | else |
1734 | return sprintf(page, "%s\n", p->name); | 1734 | return sprintf(page, "%s\n", p->name); |
1735 | } | 1735 | } |
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 3066c587b539..229d7b204297 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
@@ -320,7 +320,6 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int | |||
320 | * this branch is our 'one mirror IO has finished' event handler: | 320 | * this branch is our 'one mirror IO has finished' event handler: |
321 | */ | 321 | */ |
322 | r1_bio->bios[mirror] = NULL; | 322 | r1_bio->bios[mirror] = NULL; |
323 | bio_put(bio); | ||
324 | if (!uptodate) { | 323 | if (!uptodate) { |
325 | md_error(r1_bio->mddev, conf->mirrors[mirror].rdev); | 324 | md_error(r1_bio->mddev, conf->mirrors[mirror].rdev); |
326 | /* an I/O failed, we can't clear the bitmap */ | 325 | /* an I/O failed, we can't clear the bitmap */ |
@@ -377,7 +376,6 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int | |||
377 | } | 376 | } |
378 | if (test_bit(R1BIO_BehindIO, &r1_bio->state)) { | 377 | if (test_bit(R1BIO_BehindIO, &r1_bio->state)) { |
379 | /* free extra copy of the data pages */ | 378 | /* free extra copy of the data pages */ |
380 | /* FIXME bio has been freed!!! */ | ||
381 | int i = bio->bi_vcnt; | 379 | int i = bio->bi_vcnt; |
382 | while (i--) | 380 | while (i--) |
383 | __free_page(bio->bi_io_vec[i].bv_page); | 381 | __free_page(bio->bi_io_vec[i].bv_page); |
@@ -391,6 +389,9 @@ static int raid1_end_write_request(struct bio *bio, unsigned int bytes_done, int | |||
391 | raid_end_bio_io(r1_bio); | 389 | raid_end_bio_io(r1_bio); |
392 | } | 390 | } |
393 | 391 | ||
392 | if (r1_bio->bios[mirror]==NULL) | ||
393 | bio_put(bio); | ||
394 | |||
394 | rdev_dec_pending(conf->mirrors[mirror].rdev, conf->mddev); | 395 | rdev_dec_pending(conf->mirrors[mirror].rdev, conf->mddev); |
395 | return 0; | 396 | return 0; |
396 | } | 397 | } |
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 36d5f8ac8265..fafc4bc045f7 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -98,7 +98,7 @@ static inline void __release_stripe(raid5_conf_t *conf, struct stripe_head *sh) | |||
98 | list_add_tail(&sh->lru, &conf->inactive_list); | 98 | list_add_tail(&sh->lru, &conf->inactive_list); |
99 | atomic_dec(&conf->active_stripes); | 99 | atomic_dec(&conf->active_stripes); |
100 | if (!conf->inactive_blocked || | 100 | if (!conf->inactive_blocked || |
101 | atomic_read(&conf->active_stripes) < (NR_STRIPES*3/4)) | 101 | atomic_read(&conf->active_stripes) < (conf->max_nr_stripes*3/4)) |
102 | wake_up(&conf->wait_for_stripe); | 102 | wake_up(&conf->wait_for_stripe); |
103 | } | 103 | } |
104 | } | 104 | } |
@@ -264,7 +264,8 @@ static struct stripe_head *get_active_stripe(raid5_conf_t *conf, sector_t sector | |||
264 | conf->inactive_blocked = 1; | 264 | conf->inactive_blocked = 1; |
265 | wait_event_lock_irq(conf->wait_for_stripe, | 265 | wait_event_lock_irq(conf->wait_for_stripe, |
266 | !list_empty(&conf->inactive_list) && | 266 | !list_empty(&conf->inactive_list) && |
267 | (atomic_read(&conf->active_stripes) < (NR_STRIPES *3/4) | 267 | (atomic_read(&conf->active_stripes) |
268 | < (conf->max_nr_stripes *3/4) | ||
268 | || !conf->inactive_blocked), | 269 | || !conf->inactive_blocked), |
269 | conf->device_lock, | 270 | conf->device_lock, |
270 | unplug_slaves(conf->mddev); | 271 | unplug_slaves(conf->mddev); |
@@ -1917,7 +1918,7 @@ static int run(mddev_t *mddev) | |||
1917 | goto abort; | 1918 | goto abort; |
1918 | } | 1919 | } |
1919 | } | 1920 | } |
1920 | memory = conf->max_nr_stripes * (sizeof(struct stripe_head) + | 1921 | memory = conf->max_nr_stripes * (sizeof(struct stripe_head) + |
1921 | conf->raid_disks * ((sizeof(struct bio) + PAGE_SIZE))) / 1024; | 1922 | conf->raid_disks * ((sizeof(struct bio) + PAGE_SIZE))) / 1024; |
1922 | if (grow_stripes(conf, conf->max_nr_stripes)) { | 1923 | if (grow_stripes(conf, conf->max_nr_stripes)) { |
1923 | printk(KERN_ERR | 1924 | printk(KERN_ERR |
diff --git a/drivers/media/common/Kconfig b/drivers/media/common/Kconfig index caebd0a1c021..6a901a0268e1 100644 --- a/drivers/media/common/Kconfig +++ b/drivers/media/common/Kconfig | |||
@@ -1,12 +1,12 @@ | |||
1 | config VIDEO_SAA7146 | 1 | config VIDEO_SAA7146 |
2 | tristate | 2 | tristate |
3 | select I2C | 3 | select I2C |
4 | 4 | ||
5 | config VIDEO_SAA7146_VV | 5 | config VIDEO_SAA7146_VV |
6 | tristate | 6 | tristate |
7 | select VIDEO_BUF | 7 | select VIDEO_BUF |
8 | select VIDEO_VIDEOBUF | 8 | select VIDEO_VIDEOBUF |
9 | select VIDEO_SAA7146 | 9 | select VIDEO_SAA7146 |
10 | 10 | ||
11 | config VIDEO_VIDEOBUF | 11 | config VIDEO_VIDEOBUF |
12 | tristate | 12 | tristate |
diff --git a/drivers/media/common/Makefile b/drivers/media/common/Makefile index 97b4341255ea..bd458cb9b4ea 100644 --- a/drivers/media/common/Makefile +++ b/drivers/media/common/Makefile | |||
@@ -1,5 +1,5 @@ | |||
1 | saa7146-objs := saa7146_i2c.o saa7146_core.o | 1 | saa7146-objs := saa7146_i2c.o saa7146_core.o |
2 | saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o | 2 | saa7146_vv-objs := saa7146_vv_ksyms.o saa7146_fops.o saa7146_video.o saa7146_hlp.o saa7146_vbi.o |
3 | 3 | ||
4 | obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o | 4 | obj-$(CONFIG_VIDEO_SAA7146) += saa7146.o |
5 | obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o | 5 | obj-$(CONFIG_VIDEO_SAA7146_VV) += saa7146_vv.o |
diff --git a/drivers/media/common/ir-common.c b/drivers/media/common/ir-common.c index 7972c73bc14e..97fa3fc571c4 100644 --- a/drivers/media/common/ir-common.c +++ b/drivers/media/common/ir-common.c | |||
@@ -313,6 +313,7 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir, | |||
313 | if (ir_codes) | 313 | if (ir_codes) |
314 | memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes)); | 314 | memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes)); |
315 | 315 | ||
316 | |||
316 | dev->keycode = ir->ir_codes; | 317 | dev->keycode = ir->ir_codes; |
317 | dev->keycodesize = sizeof(IR_KEYTAB_TYPE); | 318 | dev->keycodesize = sizeof(IR_KEYTAB_TYPE); |
318 | dev->keycodemax = IR_KEYTAB_SIZE; | 319 | dev->keycodemax = IR_KEYTAB_SIZE; |
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c index 206cc2f61f26..2899d34e5f7e 100644 --- a/drivers/media/common/saa7146_core.c +++ b/drivers/media/common/saa7146_core.c | |||
@@ -174,8 +174,8 @@ void saa7146_pgtable_free(struct pci_dev *pci, struct saa7146_pgtable *pt) | |||
174 | 174 | ||
175 | int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt) | 175 | int saa7146_pgtable_alloc(struct pci_dev *pci, struct saa7146_pgtable *pt) |
176 | { | 176 | { |
177 | u32 *cpu; | 177 | u32 *cpu; |
178 | dma_addr_t dma_addr; | 178 | dma_addr_t dma_addr; |
179 | 179 | ||
180 | cpu = pci_alloc_consistent(pci, PAGE_SIZE, &dma_addr); | 180 | cpu = pci_alloc_consistent(pci, PAGE_SIZE, &dma_addr); |
181 | if (NULL == cpu) { | 181 | if (NULL == cpu) { |
@@ -405,7 +405,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent | |||
405 | 405 | ||
406 | pci_set_drvdata(pci, dev); | 406 | pci_set_drvdata(pci, dev); |
407 | 407 | ||
408 | init_MUTEX(&dev->lock); | 408 | init_MUTEX(&dev->lock); |
409 | spin_lock_init(&dev->int_slock); | 409 | spin_lock_init(&dev->int_slock); |
410 | spin_lock_init(&dev->slock); | 410 | spin_lock_init(&dev->slock); |
411 | 411 | ||
diff --git a/drivers/media/common/saa7146_fops.c b/drivers/media/common/saa7146_fops.c index 37888989ea2e..09ec964dec5c 100644 --- a/drivers/media/common/saa7146_fops.c +++ b/drivers/media/common/saa7146_fops.c | |||
@@ -1,6 +1,6 @@ | |||
1 | #include <media/saa7146_vv.h> | 1 | #include <media/saa7146_vv.h> |
2 | 2 | ||
3 | #define BOARD_CAN_DO_VBI(dev) (dev->revision != 0 && dev->vv_data->vbi_minor != -1) | 3 | #define BOARD_CAN_DO_VBI(dev) (dev->revision != 0 && dev->vv_data->vbi_minor != -1) |
4 | 4 | ||
5 | /****************************************************************************/ | 5 | /****************************************************************************/ |
6 | /* resource management functions, shamelessly stolen from saa7134 driver */ | 6 | /* resource management functions, shamelessly stolen from saa7134 driver */ |
@@ -102,9 +102,9 @@ void saa7146_buffer_finish(struct saa7146_dev *dev, | |||
102 | /* finish current buffer */ | 102 | /* finish current buffer */ |
103 | if (NULL == q->curr) { | 103 | if (NULL == q->curr) { |
104 | DEB_D(("aiii. no current buffer\n")); | 104 | DEB_D(("aiii. no current buffer\n")); |
105 | return; | 105 | return; |
106 | } | 106 | } |
107 | 107 | ||
108 | q->curr->vb.state = state; | 108 | q->curr->vb.state = state; |
109 | do_gettimeofday(&q->curr->vb.ts); | 109 | do_gettimeofday(&q->curr->vb.ts); |
110 | wake_up(&q->curr->vb.done); | 110 | wake_up(&q->curr->vb.done); |
@@ -143,13 +143,13 @@ void saa7146_buffer_next(struct saa7146_dev *dev, | |||
143 | // fixme: fix this for vflip != 0 | 143 | // fixme: fix this for vflip != 0 |
144 | 144 | ||
145 | saa7146_write(dev, PROT_ADDR1, 0); | 145 | saa7146_write(dev, PROT_ADDR1, 0); |
146 | saa7146_write(dev, MC2, (MASK_02|MASK_18)); | 146 | saa7146_write(dev, MC2, (MASK_02|MASK_18)); |
147 | 147 | ||
148 | /* write the address of the rps-program */ | 148 | /* write the address of the rps-program */ |
149 | saa7146_write(dev, RPS_ADDR0, dev->d_rps0.dma_handle); | 149 | saa7146_write(dev, RPS_ADDR0, dev->d_rps0.dma_handle); |
150 | /* turn on rps */ | 150 | /* turn on rps */ |
151 | saa7146_write(dev, MC1, (MASK_12 | MASK_28)); | 151 | saa7146_write(dev, MC1, (MASK_12 | MASK_28)); |
152 | 152 | ||
153 | /* | 153 | /* |
154 | printk("vdma%d.base_even: 0x%08x\n", 1,saa7146_read(dev,BASE_EVEN1)); | 154 | printk("vdma%d.base_even: 0x%08x\n", 1,saa7146_read(dev,BASE_EVEN1)); |
155 | printk("vdma%d.base_odd: 0x%08x\n", 1,saa7146_read(dev,BASE_ODD1)); | 155 | printk("vdma%d.base_odd: 0x%08x\n", 1,saa7146_read(dev,BASE_ODD1)); |
@@ -246,7 +246,7 @@ static int fops_open(struct inode *inode, struct file *file) | |||
246 | goto out; | 246 | goto out; |
247 | } | 247 | } |
248 | memset(fh,0,sizeof(*fh)); | 248 | memset(fh,0,sizeof(*fh)); |
249 | 249 | ||
250 | file->private_data = fh; | 250 | file->private_data = fh; |
251 | fh->dev = dev; | 251 | fh->dev = dev; |
252 | fh->type = type; | 252 | fh->type = type; |
@@ -275,7 +275,7 @@ out: | |||
275 | file->private_data = NULL; | 275 | file->private_data = NULL; |
276 | } | 276 | } |
277 | up(&saa7146_devices_lock); | 277 | up(&saa7146_devices_lock); |
278 | return result; | 278 | return result; |
279 | } | 279 | } |
280 | 280 | ||
281 | static int fops_release(struct inode *inode, struct file *file) | 281 | static int fops_release(struct inode *inode, struct file *file) |
@@ -405,7 +405,7 @@ static struct file_operations video_fops = | |||
405 | static void vv_callback(struct saa7146_dev *dev, unsigned long status) | 405 | static void vv_callback(struct saa7146_dev *dev, unsigned long status) |
406 | { | 406 | { |
407 | u32 isr = status; | 407 | u32 isr = status; |
408 | 408 | ||
409 | DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u32)status)); | 409 | DEB_INT(("dev:%p, isr:0x%08x\n",dev,(u32)status)); |
410 | 410 | ||
411 | if (0 != (isr & (MASK_27))) { | 411 | if (0 != (isr & (MASK_27))) { |
@@ -454,11 +454,11 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv) | |||
454 | handle different devices that might need different | 454 | handle different devices that might need different |
455 | configuration data) */ | 455 | configuration data) */ |
456 | dev->ext_vv_data = ext_vv; | 456 | dev->ext_vv_data = ext_vv; |
457 | 457 | ||
458 | vv->video_minor = -1; | 458 | vv->video_minor = -1; |
459 | vv->vbi_minor = -1; | 459 | vv->vbi_minor = -1; |
460 | 460 | ||
461 | vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle); | 461 | vv->d_clipping.cpu_addr = pci_alloc_consistent(dev->pci, SAA7146_CLIPPING_MEM, &vv->d_clipping.dma_handle); |
462 | if( NULL == vv->d_clipping.cpu_addr ) { | 462 | if( NULL == vv->d_clipping.cpu_addr ) { |
463 | ERR(("out of memory. aborting.\n")); | 463 | ERR(("out of memory. aborting.\n")); |
464 | kfree(vv); | 464 | kfree(vv); |
@@ -468,7 +468,7 @@ int saa7146_vv_init(struct saa7146_dev* dev, struct saa7146_ext_vv *ext_vv) | |||
468 | 468 | ||
469 | saa7146_video_uops.init(dev,vv); | 469 | saa7146_video_uops.init(dev,vv); |
470 | saa7146_vbi_uops.init(dev,vv); | 470 | saa7146_vbi_uops.init(dev,vv); |
471 | 471 | ||
472 | dev->vv_data = vv; | 472 | dev->vv_data = vv; |
473 | dev->vv_callback = &vv_callback; | 473 | dev->vv_callback = &vv_callback; |
474 | 474 | ||
@@ -480,12 +480,12 @@ int saa7146_vv_release(struct saa7146_dev* dev) | |||
480 | struct saa7146_vv *vv = dev->vv_data; | 480 | struct saa7146_vv *vv = dev->vv_data; |
481 | 481 | ||
482 | DEB_EE(("dev:%p\n",dev)); | 482 | DEB_EE(("dev:%p\n",dev)); |
483 | 483 | ||
484 | pci_free_consistent(dev->pci, SAA7146_RPS_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle); | 484 | pci_free_consistent(dev->pci, SAA7146_RPS_MEM, vv->d_clipping.cpu_addr, vv->d_clipping.dma_handle); |
485 | kfree(vv); | 485 | kfree(vv); |
486 | dev->vv_data = NULL; | 486 | dev->vv_data = NULL; |
487 | dev->vv_callback = NULL; | 487 | dev->vv_callback = NULL; |
488 | 488 | ||
489 | return 0; | 489 | return 0; |
490 | } | 490 | } |
491 | 491 | ||
@@ -498,7 +498,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev, | |||
498 | DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type)); | 498 | DEB_EE(("dev:%p, name:'%s', type:%d\n",dev,name,type)); |
499 | 499 | ||
500 | // released by vfd->release | 500 | // released by vfd->release |
501 | vfd = video_device_alloc(); | 501 | vfd = video_device_alloc(); |
502 | if (vfd == NULL) | 502 | if (vfd == NULL) |
503 | return -ENOMEM; | 503 | return -ENOMEM; |
504 | 504 | ||
@@ -530,7 +530,7 @@ int saa7146_register_device(struct video_device **vid, struct saa7146_dev* dev, | |||
530 | int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev) | 530 | int saa7146_unregister_device(struct video_device **vid, struct saa7146_dev* dev) |
531 | { | 531 | { |
532 | struct saa7146_vv *vv = dev->vv_data; | 532 | struct saa7146_vv *vv = dev->vv_data; |
533 | 533 | ||
534 | DEB_EE(("dev:%p\n",dev)); | 534 | DEB_EE(("dev:%p\n",dev)); |
535 | 535 | ||
536 | if( VFL_TYPE_GRABBER == (*vid)->type ) { | 536 | if( VFL_TYPE_GRABBER == (*vid)->type ) { |
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c index fec6beab8c28..8aabdd8fb3c5 100644 --- a/drivers/media/common/saa7146_i2c.c +++ b/drivers/media/common/saa7146_i2c.c | |||
@@ -276,8 +276,8 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in | |||
276 | int i = 0, count = 0; | 276 | int i = 0, count = 0; |
277 | u32* buffer = dev->d_i2c.cpu_addr; | 277 | u32* buffer = dev->d_i2c.cpu_addr; |
278 | int err = 0; | 278 | int err = 0; |
279 | int address_err = 0; | 279 | int address_err = 0; |
280 | int short_delay = 0; | 280 | int short_delay = 0; |
281 | 281 | ||
282 | if (down_interruptible (&dev->i2c_lock)) | 282 | if (down_interruptible (&dev->i2c_lock)) |
283 | return -ERESTARTSYS; | 283 | return -ERESTARTSYS; |
@@ -325,7 +325,7 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in | |||
325 | if( 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags)) { | 325 | if( 0 != (SAA7146_USE_I2C_IRQ & dev->ext->flags)) { |
326 | goto out; | 326 | goto out; |
327 | } | 327 | } |
328 | address_err++; | 328 | address_err++; |
329 | } | 329 | } |
330 | DEB_I2C(("error while sending message(s). starting again.\n")); | 330 | DEB_I2C(("error while sending message(s). starting again.\n")); |
331 | break; | 331 | break; |
@@ -336,14 +336,14 @@ int saa7146_i2c_transfer(struct saa7146_dev *dev, const struct i2c_msg *msgs, in | |||
336 | break; | 336 | break; |
337 | } | 337 | } |
338 | 338 | ||
339 | /* delay a bit before retrying */ | 339 | /* delay a bit before retrying */ |
340 | msleep(10); | 340 | msleep(10); |
341 | 341 | ||
342 | } while (err != num && retries--); | 342 | } while (err != num && retries--); |
343 | 343 | ||
344 | /* if every retry had an address error, exit right away */ | 344 | /* if every retry had an address error, exit right away */ |
345 | if (address_err == retries) { | 345 | if (address_err == retries) { |
346 | goto out; | 346 | goto out; |
347 | } | 347 | } |
348 | 348 | ||
349 | /* if any things had to be read, get the results */ | 349 | /* if any things had to be read, get the results */ |
diff --git a/drivers/media/common/saa7146_vbi.c b/drivers/media/common/saa7146_vbi.c index cb86a97fda1f..063986ec16b5 100644 --- a/drivers/media/common/saa7146_vbi.c +++ b/drivers/media/common/saa7146_vbi.c | |||
@@ -6,8 +6,8 @@ static int vbi_workaround(struct saa7146_dev *dev) | |||
6 | { | 6 | { |
7 | struct saa7146_vv *vv = dev->vv_data; | 7 | struct saa7146_vv *vv = dev->vv_data; |
8 | 8 | ||
9 | u32 *cpu; | 9 | u32 *cpu; |
10 | dma_addr_t dma_addr; | 10 | dma_addr_t dma_addr; |
11 | 11 | ||
12 | int count = 0; | 12 | int count = 0; |
13 | int i; | 13 | int i; |
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c index 8dd4d15ca36d..1d961023b837 100644 --- a/drivers/media/common/saa7146_video.c +++ b/drivers/media/common/saa7146_video.c | |||
@@ -150,23 +150,23 @@ static int try_win(struct saa7146_dev *dev, struct v4l2_window *win) | |||
150 | maxh = vv->standard->v_max_out; | 150 | maxh = vv->standard->v_max_out; |
151 | 151 | ||
152 | if (V4L2_FIELD_ANY == field) { | 152 | if (V4L2_FIELD_ANY == field) { |
153 | field = (win->w.height > maxh/2) | 153 | field = (win->w.height > maxh/2) |
154 | ? V4L2_FIELD_INTERLACED | 154 | ? V4L2_FIELD_INTERLACED |
155 | : V4L2_FIELD_TOP; | 155 | : V4L2_FIELD_TOP; |
156 | } | 156 | } |
157 | switch (field) { | 157 | switch (field) { |
158 | case V4L2_FIELD_TOP: | 158 | case V4L2_FIELD_TOP: |
159 | case V4L2_FIELD_BOTTOM: | 159 | case V4L2_FIELD_BOTTOM: |
160 | case V4L2_FIELD_ALTERNATE: | 160 | case V4L2_FIELD_ALTERNATE: |
161 | maxh = maxh / 2; | 161 | maxh = maxh / 2; |
162 | break; | 162 | break; |
163 | case V4L2_FIELD_INTERLACED: | 163 | case V4L2_FIELD_INTERLACED: |
164 | break; | 164 | break; |
165 | default: { | 165 | default: { |
166 | DEB_D(("no known field mode '%d'.\n",field)); | 166 | DEB_D(("no known field mode '%d'.\n",field)); |
167 | return -EINVAL; | 167 | return -EINVAL; |
168 | } | ||
168 | } | 169 | } |
169 | } | ||
170 | 170 | ||
171 | win->field = field; | 171 | win->field = field; |
172 | if (win->w.width > maxw) | 172 | if (win->w.width > maxw) |
@@ -887,7 +887,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int | |||
887 | 887 | ||
888 | DEB_EE(("VIDIOC_QUERYCAP\n")); | 888 | DEB_EE(("VIDIOC_QUERYCAP\n")); |
889 | 889 | ||
890 | strcpy(cap->driver, "saa7146 v4l2"); | 890 | strcpy(cap->driver, "saa7146 v4l2"); |
891 | strlcpy(cap->card, dev->ext->name, sizeof(cap->card)); | 891 | strlcpy(cap->card, dev->ext->name, sizeof(cap->card)); |
892 | sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); | 892 | sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); |
893 | cap->version = SAA7146_VERSION_CODE; | 893 | cap->version = SAA7146_VERSION_CODE; |
@@ -1011,19 +1011,19 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int | |||
1011 | err = set_control(fh,arg); | 1011 | err = set_control(fh,arg); |
1012 | return err; | 1012 | return err; |
1013 | } | 1013 | } |
1014 | case VIDIOC_G_PARM: | 1014 | case VIDIOC_G_PARM: |
1015 | { | 1015 | { |
1016 | struct v4l2_streamparm *parm = arg; | 1016 | struct v4l2_streamparm *parm = arg; |
1017 | if( parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ) { | 1017 | if( parm->type != V4L2_BUF_TYPE_VIDEO_CAPTURE ) { |
1018 | return -EINVAL; | 1018 | return -EINVAL; |
1019 | } | 1019 | } |
1020 | memset(&parm->parm.capture,0,sizeof(struct v4l2_captureparm)); | 1020 | memset(&parm->parm.capture,0,sizeof(struct v4l2_captureparm)); |
1021 | parm->parm.capture.readbuffers = 1; | 1021 | parm->parm.capture.readbuffers = 1; |
1022 | // fixme: only for PAL! | 1022 | // fixme: only for PAL! |
1023 | parm->parm.capture.timeperframe.numerator = 1; | 1023 | parm->parm.capture.timeperframe.numerator = 1; |
1024 | parm->parm.capture.timeperframe.denominator = 25; | 1024 | parm->parm.capture.timeperframe.denominator = 25; |
1025 | return 0; | 1025 | return 0; |
1026 | } | 1026 | } |
1027 | case VIDIOC_G_FMT: | 1027 | case VIDIOC_G_FMT: |
1028 | { | 1028 | { |
1029 | struct v4l2_format *f = arg; | 1029 | struct v4l2_format *f = arg; |
@@ -1383,7 +1383,7 @@ static struct videobuf_queue_ops video_qops = { | |||
1383 | 1383 | ||
1384 | static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv) | 1384 | static void video_init(struct saa7146_dev *dev, struct saa7146_vv *vv) |
1385 | { | 1385 | { |
1386 | INIT_LIST_HEAD(&vv->video_q.queue); | 1386 | INIT_LIST_HEAD(&vv->video_q.queue); |
1387 | 1387 | ||
1388 | init_timer(&vv->video_q.timeout); | 1388 | init_timer(&vv->video_q.timeout); |
1389 | vv->video_q.timeout.function = saa7146_buffer_timeout; | 1389 | vv->video_q.timeout.function = saa7146_buffer_timeout; |
diff --git a/drivers/media/dvb/b2c2/flexcop-common.h b/drivers/media/dvb/b2c2/flexcop-common.h index a94912ac1872..344a3c898460 100644 --- a/drivers/media/dvb/b2c2/flexcop-common.h +++ b/drivers/media/dvb/b2c2/flexcop-common.h | |||
@@ -132,7 +132,7 @@ int flexcop_eeprom_check_mac_addr(struct flexcop_device *fc, int extended); | |||
132 | * I2C-channel of the flexcop. | 132 | * I2C-channel of the flexcop. |
133 | */ | 133 | */ |
134 | int flexcop_i2c_request(struct flexcop_device*, flexcop_access_op_t, | 134 | int flexcop_i2c_request(struct flexcop_device*, flexcop_access_op_t, |
135 | flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len); | 135 | flexcop_i2c_port_t, u8 chipaddr, u8 addr, u8 *buf, u16 len); |
136 | 136 | ||
137 | /* from flexcop-sram.c */ | 137 | /* from flexcop-sram.c */ |
138 | int flexcop_sram_set_dest(struct flexcop_device *fc, flexcop_sram_dest_t dest, flexcop_sram_dest_target_t target); | 138 | int flexcop_sram_set_dest(struct flexcop_device *fc, flexcop_sram_dest_t dest, flexcop_sram_dest_target_t target); |
diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c index a35330315f65..21a9045b3ef6 100644 --- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c +++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c | |||
@@ -298,7 +298,7 @@ static int flexcop_fe_request_firmware(struct dvb_frontend* fe, const struct fir | |||
298 | } | 298 | } |
299 | 299 | ||
300 | static int lgdt3303_pll_set(struct dvb_frontend* fe, | 300 | static int lgdt3303_pll_set(struct dvb_frontend* fe, |
301 | struct dvb_frontend_parameters* params) | 301 | struct dvb_frontend_parameters* params) |
302 | { | 302 | { |
303 | struct flexcop_device *fc = fe->dvb->priv; | 303 | struct flexcop_device *fc = fe->dvb->priv; |
304 | u8 buf[4]; | 304 | u8 buf[4]; |
@@ -332,7 +332,7 @@ static int lgdt3303_pll_set(struct dvb_frontend* fe, | |||
332 | return -EREMOTEIO; | 332 | return -EREMOTEIO; |
333 | } | 333 | } |
334 | 334 | ||
335 | return 0; | 335 | return 0; |
336 | } | 336 | } |
337 | 337 | ||
338 | static struct lgdt330x_config air2pc_atsc_hd5000_config = { | 338 | static struct lgdt330x_config air2pc_atsc_hd5000_config = { |
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c index e6541aff3996..2239651969c8 100644 --- a/drivers/media/dvb/bt8xx/dst_ca.c +++ b/drivers/media/dvb/bt8xx/dst_ca.c | |||
@@ -406,7 +406,7 @@ static int ca_send_message(struct dst_state *state, struct ca_msg *p_ca_message, | |||
406 | } | 406 | } |
407 | dprintk(verbose, DST_CA_DEBUG, 1, " "); | 407 | dprintk(verbose, DST_CA_DEBUG, 1, " "); |
408 | 408 | ||
409 | if (copy_from_user(p_ca_message, (void *)arg, sizeof (struct ca_msg))) { | 409 | if (copy_from_user(p_ca_message, arg, sizeof (struct ca_msg))) { |
410 | result = -EFAULT; | 410 | result = -EFAULT; |
411 | goto free_mem_and_exit; | 411 | goto free_mem_and_exit; |
412 | } | 412 | } |
@@ -579,7 +579,7 @@ static int dst_ca_release(struct inode *inode, struct file *file) | |||
579 | return 0; | 579 | return 0; |
580 | } | 580 | } |
581 | 581 | ||
582 | static int dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset) | 582 | static ssize_t dst_ca_read(struct file *file, char __user *buffer, size_t length, loff_t *offset) |
583 | { | 583 | { |
584 | int bytes_read = 0; | 584 | int bytes_read = 0; |
585 | 585 | ||
@@ -588,7 +588,7 @@ static int dst_ca_read(struct file *file, char __user *buffer, size_t length, lo | |||
588 | return bytes_read; | 588 | return bytes_read; |
589 | } | 589 | } |
590 | 590 | ||
591 | static int dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset) | 591 | static ssize_t dst_ca_write(struct file *file, const char __user *buffer, size_t length, loff_t *offset) |
592 | { | 592 | { |
593 | dprintk(verbose, DST_CA_DEBUG, 1, " Device write."); | 593 | dprintk(verbose, DST_CA_DEBUG, 1, " Device write."); |
594 | 594 | ||
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 2e398090cf63..77977e9c013e 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c | |||
@@ -556,9 +556,9 @@ static int tdvs_tua6034_pll_set(struct dvb_frontend* fe, struct dvb_frontend_par | |||
556 | dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n", | 556 | dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n", |
557 | __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]); | 557 | __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]); |
558 | if ((err = i2c_transfer(card->i2c_adapter, &msg, 1)) != 1) { | 558 | if ((err = i2c_transfer(card->i2c_adapter, &msg, 1)) != 1) { |
559 | printk(KERN_WARNING "dvb-bt8xx: %s error " | 559 | printk(KERN_WARNING "dvb-bt8xx: %s error " |
560 | "(addr %02x <- %02x, err = %i)\n", | 560 | "(addr %02x <- %02x, err = %i)\n", |
561 | __FUNCTION__, buf[0], buf[1], err); | 561 | __FUNCTION__, buf[0], buf[1], err); |
562 | if (err < 0) | 562 | if (err < 0) |
563 | return err; | 563 | return err; |
564 | else | 564 | else |
diff --git a/drivers/media/dvb/dvb-core/demux.h b/drivers/media/dvb/dvb-core/demux.h index 7d7b0067f228..9f025825b2d2 100644 --- a/drivers/media/dvb/dvb-core/demux.h +++ b/drivers/media/dvb/dvb-core/demux.h | |||
@@ -86,25 +86,25 @@ enum dmx_success { | |||
86 | 86 | ||
87 | enum dmx_ts_pes | 87 | enum dmx_ts_pes |
88 | { /* also send packets to decoder (if it exists) */ | 88 | { /* also send packets to decoder (if it exists) */ |
89 | DMX_TS_PES_AUDIO0, | 89 | DMX_TS_PES_AUDIO0, |
90 | DMX_TS_PES_VIDEO0, | 90 | DMX_TS_PES_VIDEO0, |
91 | DMX_TS_PES_TELETEXT0, | 91 | DMX_TS_PES_TELETEXT0, |
92 | DMX_TS_PES_SUBTITLE0, | 92 | DMX_TS_PES_SUBTITLE0, |
93 | DMX_TS_PES_PCR0, | 93 | DMX_TS_PES_PCR0, |
94 | 94 | ||
95 | DMX_TS_PES_AUDIO1, | 95 | DMX_TS_PES_AUDIO1, |
96 | DMX_TS_PES_VIDEO1, | 96 | DMX_TS_PES_VIDEO1, |
97 | DMX_TS_PES_TELETEXT1, | 97 | DMX_TS_PES_TELETEXT1, |
98 | DMX_TS_PES_SUBTITLE1, | 98 | DMX_TS_PES_SUBTITLE1, |
99 | DMX_TS_PES_PCR1, | 99 | DMX_TS_PES_PCR1, |
100 | 100 | ||
101 | DMX_TS_PES_AUDIO2, | 101 | DMX_TS_PES_AUDIO2, |
102 | DMX_TS_PES_VIDEO2, | 102 | DMX_TS_PES_VIDEO2, |
103 | DMX_TS_PES_TELETEXT2, | 103 | DMX_TS_PES_TELETEXT2, |
104 | DMX_TS_PES_SUBTITLE2, | 104 | DMX_TS_PES_SUBTITLE2, |
105 | DMX_TS_PES_PCR2, | 105 | DMX_TS_PES_PCR2, |
106 | 106 | ||
107 | DMX_TS_PES_AUDIO3, | 107 | DMX_TS_PES_AUDIO3, |
108 | DMX_TS_PES_VIDEO3, | 108 | DMX_TS_PES_VIDEO3, |
109 | DMX_TS_PES_TELETEXT3, | 109 | DMX_TS_PES_TELETEXT3, |
110 | DMX_TS_PES_SUBTITLE3, | 110 | DMX_TS_PES_SUBTITLE3, |
@@ -121,17 +121,17 @@ enum dmx_ts_pes | |||
121 | 121 | ||
122 | 122 | ||
123 | struct dmx_ts_feed { | 123 | struct dmx_ts_feed { |
124 | int is_filtering; /* Set to non-zero when filtering in progress */ | 124 | int is_filtering; /* Set to non-zero when filtering in progress */ |
125 | struct dmx_demux *parent; /* Back-pointer */ | 125 | struct dmx_demux *parent; /* Back-pointer */ |
126 | void *priv; /* Pointer to private data of the API client */ | 126 | void *priv; /* Pointer to private data of the API client */ |
127 | int (*set) (struct dmx_ts_feed *feed, | 127 | int (*set) (struct dmx_ts_feed *feed, |
128 | u16 pid, | 128 | u16 pid, |
129 | int type, | 129 | int type, |
130 | enum dmx_ts_pes pes_type, | 130 | enum dmx_ts_pes pes_type, |
131 | size_t circular_buffer_size, | 131 | size_t circular_buffer_size, |
132 | struct timespec timeout); | 132 | struct timespec timeout); |
133 | int (*start_filtering) (struct dmx_ts_feed* feed); | 133 | int (*start_filtering) (struct dmx_ts_feed* feed); |
134 | int (*stop_filtering) (struct dmx_ts_feed* feed); | 134 | int (*stop_filtering) (struct dmx_ts_feed* feed); |
135 | }; | 135 | }; |
136 | 136 | ||
137 | /*--------------------------------------------------------------------------*/ | 137 | /*--------------------------------------------------------------------------*/ |
@@ -139,35 +139,35 @@ struct dmx_ts_feed { | |||
139 | /*--------------------------------------------------------------------------*/ | 139 | /*--------------------------------------------------------------------------*/ |
140 | 140 | ||
141 | struct dmx_section_filter { | 141 | struct dmx_section_filter { |
142 | u8 filter_value [DMX_MAX_FILTER_SIZE]; | 142 | u8 filter_value [DMX_MAX_FILTER_SIZE]; |
143 | u8 filter_mask [DMX_MAX_FILTER_SIZE]; | 143 | u8 filter_mask [DMX_MAX_FILTER_SIZE]; |
144 | u8 filter_mode [DMX_MAX_FILTER_SIZE]; | 144 | u8 filter_mode [DMX_MAX_FILTER_SIZE]; |
145 | struct dmx_section_feed* parent; /* Back-pointer */ | 145 | struct dmx_section_feed* parent; /* Back-pointer */ |
146 | void* priv; /* Pointer to private data of the API client */ | 146 | void* priv; /* Pointer to private data of the API client */ |
147 | }; | 147 | }; |
148 | 148 | ||
149 | struct dmx_section_feed { | 149 | struct dmx_section_feed { |
150 | int is_filtering; /* Set to non-zero when filtering in progress */ | 150 | int is_filtering; /* Set to non-zero when filtering in progress */ |
151 | struct dmx_demux* parent; /* Back-pointer */ | 151 | struct dmx_demux* parent; /* Back-pointer */ |
152 | void* priv; /* Pointer to private data of the API client */ | 152 | void* priv; /* Pointer to private data of the API client */ |
153 | 153 | ||
154 | int check_crc; | 154 | int check_crc; |
155 | u32 crc_val; | 155 | u32 crc_val; |
156 | 156 | ||
157 | u8 *secbuf; | 157 | u8 *secbuf; |
158 | u8 secbuf_base[DMX_MAX_SECFEED_SIZE]; | 158 | u8 secbuf_base[DMX_MAX_SECFEED_SIZE]; |
159 | u16 secbufp, seclen, tsfeedp; | 159 | u16 secbufp, seclen, tsfeedp; |
160 | 160 | ||
161 | int (*set) (struct dmx_section_feed* feed, | 161 | int (*set) (struct dmx_section_feed* feed, |
162 | u16 pid, | 162 | u16 pid, |
163 | size_t circular_buffer_size, | 163 | size_t circular_buffer_size, |
164 | int check_crc); | 164 | int check_crc); |
165 | int (*allocate_filter) (struct dmx_section_feed* feed, | 165 | int (*allocate_filter) (struct dmx_section_feed* feed, |
166 | struct dmx_section_filter** filter); | 166 | struct dmx_section_filter** filter); |
167 | int (*release_filter) (struct dmx_section_feed* feed, | 167 | int (*release_filter) (struct dmx_section_feed* feed, |
168 | struct dmx_section_filter* filter); | 168 | struct dmx_section_filter* filter); |
169 | int (*start_filtering) (struct dmx_section_feed* feed); | 169 | int (*start_filtering) (struct dmx_section_feed* feed); |
170 | int (*stop_filtering) (struct dmx_section_feed* feed); | 170 | int (*stop_filtering) (struct dmx_section_feed* feed); |
171 | }; | 171 | }; |
172 | 172 | ||
173 | /*--------------------------------------------------------------------------*/ | 173 | /*--------------------------------------------------------------------------*/ |
@@ -205,10 +205,10 @@ enum dmx_frontend_source { | |||
205 | }; | 205 | }; |
206 | 206 | ||
207 | struct dmx_frontend { | 207 | struct dmx_frontend { |
208 | struct list_head connectivity_list; /* List of front-ends that can | 208 | struct list_head connectivity_list; /* List of front-ends that can |
209 | be connected to a particular | 209 | be connected to a particular |
210 | demux */ | 210 | demux */ |
211 | enum dmx_frontend_source source; | 211 | enum dmx_frontend_source source; |
212 | }; | 212 | }; |
213 | 213 | ||
214 | /*--------------------------------------------------------------------------*/ | 214 | /*--------------------------------------------------------------------------*/ |
@@ -240,38 +240,38 @@ struct dmx_frontend { | |||
240 | #define DMX_FE_ENTRY(list) list_entry(list, struct dmx_frontend, connectivity_list) | 240 | #define DMX_FE_ENTRY(list) list_entry(list, struct dmx_frontend, connectivity_list) |
241 | 241 | ||
242 | struct dmx_demux { | 242 | struct dmx_demux { |
243 | u32 capabilities; /* Bitfield of capability flags */ | 243 | u32 capabilities; /* Bitfield of capability flags */ |
244 | struct dmx_frontend* frontend; /* Front-end connected to the demux */ | 244 | struct dmx_frontend* frontend; /* Front-end connected to the demux */ |
245 | void* priv; /* Pointer to private data of the API client */ | 245 | void* priv; /* Pointer to private data of the API client */ |
246 | int (*open) (struct dmx_demux* demux); | 246 | int (*open) (struct dmx_demux* demux); |
247 | int (*close) (struct dmx_demux* demux); | 247 | int (*close) (struct dmx_demux* demux); |
248 | int (*write) (struct dmx_demux* demux, const char* buf, size_t count); | 248 | int (*write) (struct dmx_demux* demux, const char* buf, size_t count); |
249 | int (*allocate_ts_feed) (struct dmx_demux* demux, | 249 | int (*allocate_ts_feed) (struct dmx_demux* demux, |
250 | struct dmx_ts_feed** feed, | 250 | struct dmx_ts_feed** feed, |
251 | dmx_ts_cb callback); | 251 | dmx_ts_cb callback); |
252 | int (*release_ts_feed) (struct dmx_demux* demux, | 252 | int (*release_ts_feed) (struct dmx_demux* demux, |
253 | struct dmx_ts_feed* feed); | 253 | struct dmx_ts_feed* feed); |
254 | int (*allocate_section_feed) (struct dmx_demux* demux, | 254 | int (*allocate_section_feed) (struct dmx_demux* demux, |
255 | struct dmx_section_feed** feed, | 255 | struct dmx_section_feed** feed, |
256 | dmx_section_cb callback); | 256 | dmx_section_cb callback); |
257 | int (*release_section_feed) (struct dmx_demux* demux, | 257 | int (*release_section_feed) (struct dmx_demux* demux, |
258 | struct dmx_section_feed* feed); | 258 | struct dmx_section_feed* feed); |
259 | int (*add_frontend) (struct dmx_demux* demux, | 259 | int (*add_frontend) (struct dmx_demux* demux, |
260 | struct dmx_frontend* frontend); | 260 | struct dmx_frontend* frontend); |
261 | int (*remove_frontend) (struct dmx_demux* demux, | 261 | int (*remove_frontend) (struct dmx_demux* demux, |
262 | struct dmx_frontend* frontend); | 262 | struct dmx_frontend* frontend); |
263 | struct list_head* (*get_frontends) (struct dmx_demux* demux); | 263 | struct list_head* (*get_frontends) (struct dmx_demux* demux); |
264 | int (*connect_frontend) (struct dmx_demux* demux, | 264 | int (*connect_frontend) (struct dmx_demux* demux, |
265 | struct dmx_frontend* frontend); | 265 | struct dmx_frontend* frontend); |
266 | int (*disconnect_frontend) (struct dmx_demux* demux); | 266 | int (*disconnect_frontend) (struct dmx_demux* demux); |
267 | 267 | ||
268 | int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids); | 268 | int (*get_pes_pids) (struct dmx_demux* demux, u16 *pids); |
269 | 269 | ||
270 | int (*get_caps) (struct dmx_demux* demux, struct dmx_caps *caps); | 270 | int (*get_caps) (struct dmx_demux* demux, struct dmx_caps *caps); |
271 | 271 | ||
272 | int (*set_source) (struct dmx_demux* demux, const dmx_source_t *src); | 272 | int (*set_source) (struct dmx_demux* demux, const dmx_source_t *src); |
273 | 273 | ||
274 | int (*get_stc) (struct dmx_demux* demux, unsigned int num, | 274 | int (*get_stc) (struct dmx_demux* demux, unsigned int num, |
275 | u64 *stc, unsigned int *base); | 275 | u64 *stc, unsigned int *base); |
276 | }; | 276 | }; |
277 | 277 | ||
diff --git a/drivers/media/dvb/dvb-core/dmxdev.c b/drivers/media/dvb/dvb-core/dmxdev.c index 8028c3a5e287..7b8373ad121b 100644 --- a/drivers/media/dvb/dvb-core/dmxdev.c +++ b/drivers/media/dvb/dvb-core/dmxdev.c | |||
@@ -947,7 +947,7 @@ static int dvb_demux_do_ioctl(struct inode *inode, struct file *file, | |||
947 | 947 | ||
948 | case DMX_GET_STC: | 948 | case DMX_GET_STC: |
949 | if (!dmxdev->demux->get_stc) { | 949 | if (!dmxdev->demux->get_stc) { |
950 | ret=-EINVAL; | 950 | ret=-EINVAL; |
951 | break; | 951 | break; |
952 | } | 952 | } |
953 | ret = dmxdev->demux->get_stc(dmxdev->demux, | 953 | ret = dmxdev->demux->get_stc(dmxdev->demux, |
diff --git a/drivers/media/dvb/dvb-core/dmxdev.h b/drivers/media/dvb/dvb-core/dmxdev.h index 395a9cd75012..fd72920c2199 100644 --- a/drivers/media/dvb/dvb-core/dmxdev.h +++ b/drivers/media/dvb/dvb-core/dmxdev.h | |||
@@ -53,51 +53,51 @@ enum dmxdev_state { | |||
53 | }; | 53 | }; |
54 | 54 | ||
55 | struct dmxdev_buffer { | 55 | struct dmxdev_buffer { |
56 | u8 *data; | 56 | u8 *data; |
57 | int size; | 57 | int size; |
58 | int pread; | 58 | int pread; |
59 | int pwrite; | 59 | int pwrite; |
60 | wait_queue_head_t queue; | 60 | wait_queue_head_t queue; |
61 | int error; | 61 | int error; |
62 | }; | 62 | }; |
63 | 63 | ||
64 | struct dmxdev_filter { | 64 | struct dmxdev_filter { |
65 | struct dvb_device *dvbdev; | 65 | struct dvb_device *dvbdev; |
66 | 66 | ||
67 | union { | 67 | union { |
68 | struct dmx_section_filter *sec; | 68 | struct dmx_section_filter *sec; |
69 | } filter; | 69 | } filter; |
70 | 70 | ||
71 | union { | 71 | union { |
72 | struct dmx_ts_feed *ts; | 72 | struct dmx_ts_feed *ts; |
73 | struct dmx_section_feed *sec; | 73 | struct dmx_section_feed *sec; |
74 | } feed; | 74 | } feed; |
75 | 75 | ||
76 | union { | 76 | union { |
77 | struct dmx_sct_filter_params sec; | 77 | struct dmx_sct_filter_params sec; |
78 | struct dmx_pes_filter_params pes; | 78 | struct dmx_pes_filter_params pes; |
79 | } params; | 79 | } params; |
80 | 80 | ||
81 | int type; | 81 | int type; |
82 | enum dmxdev_state state; | 82 | enum dmxdev_state state; |
83 | struct dmxdev *dev; | 83 | struct dmxdev *dev; |
84 | struct dmxdev_buffer buffer; | 84 | struct dmxdev_buffer buffer; |
85 | 85 | ||
86 | struct semaphore mutex; | 86 | struct semaphore mutex; |
87 | 87 | ||
88 | /* only for sections */ | 88 | /* only for sections */ |
89 | struct timer_list timer; | 89 | struct timer_list timer; |
90 | int todo; | 90 | int todo; |
91 | u8 secheader[3]; | 91 | u8 secheader[3]; |
92 | 92 | ||
93 | u16 pid; | 93 | u16 pid; |
94 | }; | 94 | }; |
95 | 95 | ||
96 | 96 | ||
97 | struct dmxdev_dvr { | 97 | struct dmxdev_dvr { |
98 | int state; | 98 | int state; |
99 | struct dmxdev *dev; | 99 | struct dmxdev *dev; |
100 | struct dmxdev_buffer buffer; | 100 | struct dmxdev_buffer buffer; |
101 | }; | 101 | }; |
102 | 102 | ||
103 | 103 | ||
@@ -105,16 +105,16 @@ struct dmxdev { | |||
105 | struct dvb_device *dvbdev; | 105 | struct dvb_device *dvbdev; |
106 | struct dvb_device *dvr_dvbdev; | 106 | struct dvb_device *dvr_dvbdev; |
107 | 107 | ||
108 | struct dmxdev_filter *filter; | 108 | struct dmxdev_filter *filter; |
109 | struct dmxdev_dvr *dvr; | 109 | struct dmxdev_dvr *dvr; |
110 | struct dmx_demux *demux; | 110 | struct dmx_demux *demux; |
111 | 111 | ||
112 | int filternum; | 112 | int filternum; |
113 | int capabilities; | 113 | int capabilities; |
114 | #define DMXDEV_CAP_DUPLEX 1 | 114 | #define DMXDEV_CAP_DUPLEX 1 |
115 | struct dmx_frontend *dvr_orig_fe; | 115 | struct dmx_frontend *dvr_orig_fe; |
116 | 116 | ||
117 | struct dmxdev_buffer dvr_buffer; | 117 | struct dmxdev_buffer dvr_buffer; |
118 | #define DVR_BUFFER_SIZE (10*188*1024) | 118 | #define DVR_BUFFER_SIZE (10*188*1024) |
119 | 119 | ||
120 | struct semaphore mutex; | 120 | struct semaphore mutex; |
diff --git a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c index cb2e7d6ba283..5956c35d34ac 100644 --- a/drivers/media/dvb/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb/dvb-core/dvb_ca_en50221.c | |||
@@ -498,7 +498,7 @@ static int dvb_ca_en50221_parse_attributes(struct dvb_ca_private *ca, int slot) | |||
498 | /* process the CFTABLE_ENTRY tuples, and any after those */ | 498 | /* process the CFTABLE_ENTRY tuples, and any after those */ |
499 | while ((!end_chain) && (address < 0x1000)) { | 499 | while ((!end_chain) && (address < 0x1000)) { |
500 | if ((status = dvb_ca_en50221_read_tuple(ca, slot, &address, &tupleType, | 500 | if ((status = dvb_ca_en50221_read_tuple(ca, slot, &address, &tupleType, |
501 | &tupleLength, tuple)) < 0) | 501 | &tupleLength, tuple)) < 0) |
502 | return status; | 502 | return status; |
503 | switch (tupleType) { | 503 | switch (tupleType) { |
504 | case 0x1B: // CISTPL_CFTABLE_ENTRY | 504 | case 0x1B: // CISTPL_CFTABLE_ENTRY |
diff --git a/drivers/media/dvb/dvb-core/dvb_filter.c b/drivers/media/dvb/dvb-core/dvb_filter.c index bd5143906084..c49fd0bd7181 100644 --- a/drivers/media/dvb/dvb-core/dvb_filter.c +++ b/drivers/media/dvb/dvb-core/dvb_filter.c | |||
@@ -72,12 +72,12 @@ static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, in | |||
72 | u8 pct; | 72 | u8 pct; |
73 | 73 | ||
74 | if (pr) printk( "Pic header: "); | 74 | if (pr) printk( "Pic header: "); |
75 | pic->temporal_reference[field] = (( headr[0] << 2 ) | | 75 | pic->temporal_reference[field] = (( headr[0] << 2 ) | |
76 | (headr[1] & 0x03) )& 0x03ff; | 76 | (headr[1] & 0x03) )& 0x03ff; |
77 | if (pr) printk( " temp ref: 0x%04x", pic->temporal_reference[field]); | 77 | if (pr) printk( " temp ref: 0x%04x", pic->temporal_reference[field]); |
78 | 78 | ||
79 | pct = ( headr[1] >> 2 ) & 0x07; | 79 | pct = ( headr[1] >> 2 ) & 0x07; |
80 | pic->picture_coding_type[field] = pct; | 80 | pic->picture_coding_type[field] = pct; |
81 | if (pr) { | 81 | if (pr) { |
82 | switch(pct){ | 82 | switch(pct){ |
83 | case I_FRAME: | 83 | case I_FRAME: |
@@ -93,17 +93,17 @@ static int read_picture_header(u8 *headr, struct mpg_picture *pic, int field, in | |||
93 | } | 93 | } |
94 | 94 | ||
95 | 95 | ||
96 | pic->vinfo.vbv_delay = (( headr[1] >> 5 ) | ( headr[2] << 3) | | 96 | pic->vinfo.vbv_delay = (( headr[1] >> 5 ) | ( headr[2] << 3) | |
97 | ( (headr[3] & 0x1F) << 11) ) & 0xffff; | 97 | ( (headr[3] & 0x1F) << 11) ) & 0xffff; |
98 | 98 | ||
99 | if (pr) printk( " vbv delay: 0x%04x", pic->vinfo.vbv_delay); | 99 | if (pr) printk( " vbv delay: 0x%04x", pic->vinfo.vbv_delay); |
100 | 100 | ||
101 | pic->picture_header_parameter = ( headr[3] & 0xe0 ) | | 101 | pic->picture_header_parameter = ( headr[3] & 0xe0 ) | |
102 | ((headr[4] & 0x80) >> 3); | 102 | ((headr[4] & 0x80) >> 3); |
103 | 103 | ||
104 | if ( pct == B_FRAME ){ | 104 | if ( pct == B_FRAME ){ |
105 | pic->picture_header_parameter |= ( headr[4] >> 3 ) & 0x0f; | 105 | pic->picture_header_parameter |= ( headr[4] >> 3 ) & 0x0f; |
106 | } | 106 | } |
107 | if (pr) printk( " pic head param: 0x%x", | 107 | if (pr) printk( " pic head param: 0x%x", |
108 | pic->picture_header_parameter); | 108 | pic->picture_header_parameter); |
109 | 109 | ||
@@ -124,18 +124,18 @@ static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr) | |||
124 | ((headr[0]<<4)& 0x30)| ((headr[1]>>4)& 0x0F), | 124 | ((headr[0]<<4)& 0x30)| ((headr[1]>>4)& 0x0F), |
125 | ((headr[1]<<3)& 0x38)| ((headr[2]>>5)& 0x0F)); | 125 | ((headr[1]<<3)& 0x38)| ((headr[2]>>5)& 0x0F)); |
126 | 126 | ||
127 | if ( ( headr[3] & 0x40 ) != 0 ){ | 127 | if ( ( headr[3] & 0x40 ) != 0 ){ |
128 | pic->closed_gop = 1; | 128 | pic->closed_gop = 1; |
129 | } else { | 129 | } else { |
130 | pic->closed_gop = 0; | 130 | pic->closed_gop = 0; |
131 | } | 131 | } |
132 | if (pr) printk("closed: %d", pic->closed_gop); | 132 | if (pr) printk("closed: %d", pic->closed_gop); |
133 | 133 | ||
134 | if ( ( headr[3] & 0x20 ) != 0 ){ | 134 | if ( ( headr[3] & 0x20 ) != 0 ){ |
135 | pic->broken_link = 1; | 135 | pic->broken_link = 1; |
136 | } else { | 136 | } else { |
137 | pic->broken_link = 0; | 137 | pic->broken_link = 0; |
138 | } | 138 | } |
139 | if (pr) printk(" broken: %d\n", pic->broken_link); | 139 | if (pr) printk(" broken: %d\n", pic->broken_link); |
140 | 140 | ||
141 | return 0; | 141 | return 0; |
@@ -146,7 +146,7 @@ static int read_gop_header(u8 *headr, struct mpg_picture *pic, int pr) | |||
146 | /* needs 8 byte input */ | 146 | /* needs 8 byte input */ |
147 | static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr) | 147 | static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr) |
148 | { | 148 | { |
149 | int sw; | 149 | int sw; |
150 | int form = -1; | 150 | int form = -1; |
151 | 151 | ||
152 | if (pr) printk("Reading sequence header\n"); | 152 | if (pr) printk("Reading sequence header\n"); |
@@ -154,9 +154,9 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr) | |||
154 | vi->horizontal_size = ((headr[1] &0xF0) >> 4) | (headr[0] << 4); | 154 | vi->horizontal_size = ((headr[1] &0xF0) >> 4) | (headr[0] << 4); |
155 | vi->vertical_size = ((headr[1] &0x0F) << 8) | (headr[2]); | 155 | vi->vertical_size = ((headr[1] &0x0F) << 8) | (headr[2]); |
156 | 156 | ||
157 | sw = (int)((headr[3]&0xF0) >> 4) ; | 157 | sw = (int)((headr[3]&0xF0) >> 4) ; |
158 | 158 | ||
159 | switch( sw ){ | 159 | switch( sw ){ |
160 | case 1: | 160 | case 1: |
161 | if (pr) | 161 | if (pr) |
162 | printk("Videostream: ASPECT: 1:1"); | 162 | printk("Videostream: ASPECT: 1:1"); |
@@ -165,84 +165,84 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr) | |||
165 | case 2: | 165 | case 2: |
166 | if (pr) | 166 | if (pr) |
167 | printk("Videostream: ASPECT: 4:3"); | 167 | printk("Videostream: ASPECT: 4:3"); |
168 | vi->aspect_ratio = 133; | 168 | vi->aspect_ratio = 133; |
169 | break; | 169 | break; |
170 | case 3: | 170 | case 3: |
171 | if (pr) | 171 | if (pr) |
172 | printk("Videostream: ASPECT: 16:9"); | 172 | printk("Videostream: ASPECT: 16:9"); |
173 | vi->aspect_ratio = 177; | 173 | vi->aspect_ratio = 177; |
174 | break; | 174 | break; |
175 | case 4: | 175 | case 4: |
176 | if (pr) | 176 | if (pr) |
177 | printk("Videostream: ASPECT: 2.21:1"); | 177 | printk("Videostream: ASPECT: 2.21:1"); |
178 | vi->aspect_ratio = 221; | 178 | vi->aspect_ratio = 221; |
179 | break; | 179 | break; |
180 | 180 | ||
181 | case 5 ... 15: | 181 | case 5 ... 15: |
182 | if (pr) | 182 | if (pr) |
183 | printk("Videostream: ASPECT: reserved"); | 183 | printk("Videostream: ASPECT: reserved"); |
184 | vi->aspect_ratio = 0; | 184 | vi->aspect_ratio = 0; |
185 | break; | 185 | break; |
186 | 186 | ||
187 | default: | 187 | default: |
188 | vi->aspect_ratio = 0; | 188 | vi->aspect_ratio = 0; |
189 | return -1; | 189 | return -1; |
190 | } | 190 | } |
191 | 191 | ||
192 | if (pr) | 192 | if (pr) |
193 | printk(" Size = %dx%d",vi->horizontal_size,vi->vertical_size); | 193 | printk(" Size = %dx%d",vi->horizontal_size,vi->vertical_size); |
194 | 194 | ||
195 | sw = (int)(headr[3]&0x0F); | 195 | sw = (int)(headr[3]&0x0F); |
196 | 196 | ||
197 | switch ( sw ) { | 197 | switch ( sw ) { |
198 | case 1: | 198 | case 1: |
199 | if (pr) | 199 | if (pr) |
200 | printk(" FRate: 23.976 fps"); | 200 | printk(" FRate: 23.976 fps"); |
201 | vi->framerate = 23976; | 201 | vi->framerate = 23976; |
202 | form = -1; | 202 | form = -1; |
203 | break; | 203 | break; |
204 | case 2: | 204 | case 2: |
205 | if (pr) | 205 | if (pr) |
206 | printk(" FRate: 24 fps"); | 206 | printk(" FRate: 24 fps"); |
207 | vi->framerate = 24000; | 207 | vi->framerate = 24000; |
208 | form = -1; | 208 | form = -1; |
209 | break; | 209 | break; |
210 | case 3: | 210 | case 3: |
211 | if (pr) | 211 | if (pr) |
212 | printk(" FRate: 25 fps"); | 212 | printk(" FRate: 25 fps"); |
213 | vi->framerate = 25000; | 213 | vi->framerate = 25000; |
214 | form = VIDEO_MODE_PAL; | 214 | form = VIDEO_MODE_PAL; |
215 | break; | 215 | break; |
216 | case 4: | 216 | case 4: |
217 | if (pr) | 217 | if (pr) |
218 | printk(" FRate: 29.97 fps"); | 218 | printk(" FRate: 29.97 fps"); |
219 | vi->framerate = 29970; | 219 | vi->framerate = 29970; |
220 | form = VIDEO_MODE_NTSC; | 220 | form = VIDEO_MODE_NTSC; |
221 | break; | 221 | break; |
222 | case 5: | 222 | case 5: |
223 | if (pr) | 223 | if (pr) |
224 | printk(" FRate: 30 fps"); | 224 | printk(" FRate: 30 fps"); |
225 | vi->framerate = 30000; | 225 | vi->framerate = 30000; |
226 | form = VIDEO_MODE_NTSC; | 226 | form = VIDEO_MODE_NTSC; |
227 | break; | 227 | break; |
228 | case 6: | 228 | case 6: |
229 | if (pr) | 229 | if (pr) |
230 | printk(" FRate: 50 fps"); | 230 | printk(" FRate: 50 fps"); |
231 | vi->framerate = 50000; | 231 | vi->framerate = 50000; |
232 | form = VIDEO_MODE_PAL; | 232 | form = VIDEO_MODE_PAL; |
233 | break; | 233 | break; |
234 | case 7: | 234 | case 7: |
235 | if (pr) | 235 | if (pr) |
236 | printk(" FRate: 60 fps"); | 236 | printk(" FRate: 60 fps"); |
237 | vi->framerate = 60000; | 237 | vi->framerate = 60000; |
238 | form = VIDEO_MODE_NTSC; | 238 | form = VIDEO_MODE_NTSC; |
239 | break; | 239 | break; |
240 | } | 240 | } |
241 | 241 | ||
242 | vi->bit_rate = (headr[4] << 10) | (headr[5] << 2) | (headr[6] & 0x03); | 242 | vi->bit_rate = (headr[4] << 10) | (headr[5] << 2) | (headr[6] & 0x03); |
243 | 243 | ||
244 | vi->vbv_buffer_size | 244 | vi->vbv_buffer_size |
245 | = (( headr[6] & 0xF8) >> 3 ) | (( headr[7] & 0x1F )<< 5); | 245 | = (( headr[6] & 0xF8) >> 3 ) | (( headr[7] & 0x1F )<< 5); |
246 | 246 | ||
247 | if (pr){ | 247 | if (pr){ |
248 | printk(" BRate: %d Mbit/s",4*(vi->bit_rate)/10000); | 248 | printk(" BRate: %d Mbit/s",4*(vi->bit_rate)/10000); |
@@ -250,7 +250,7 @@ static int read_sequence_header(u8 *headr, struct dvb_video_info *vi, int pr) | |||
250 | printk("\n"); | 250 | printk("\n"); |
251 | } | 251 | } |
252 | 252 | ||
253 | vi->video_format = form; | 253 | vi->video_format = form; |
254 | 254 | ||
255 | return 0; | 255 | return 0; |
256 | } | 256 | } |
@@ -308,7 +308,7 @@ static int get_ainfo(u8 *mbuf, int count, struct dvb_audio_info *ai, int pr) | |||
308 | if (!found) return -1; | 308 | if (!found) return -1; |
309 | 309 | ||
310 | if (c+3 >= count) return -1; | 310 | if (c+3 >= count) return -1; |
311 | headr = mbuf+c; | 311 | headr = mbuf+c; |
312 | 312 | ||
313 | ai->layer = (headr[1] & 0x06) >> 1; | 313 | ai->layer = (headr[1] & 0x06) >> 1; |
314 | 314 | ||
@@ -368,7 +368,7 @@ int dvb_filter_get_ac3info(u8 *mbuf, int count, struct dvb_audio_info *ai, int p | |||
368 | if (c+5 >= count) return -1; | 368 | if (c+5 >= count) return -1; |
369 | 369 | ||
370 | ai->layer = 0; // 0 for AC3 | 370 | ai->layer = 0; // 0 for AC3 |
371 | headr = mbuf+c+2; | 371 | headr = mbuf+c+2; |
372 | 372 | ||
373 | frame = (headr[2]&0x3f); | 373 | frame = (headr[2]&0x3f); |
374 | ai->bit_rate = ac3_bitrates[frame >> 1]*1000; | 374 | ai->bit_rate = ac3_bitrates[frame >> 1]*1000; |
@@ -396,159 +396,159 @@ EXPORT_SYMBOL(dvb_filter_get_ac3info); | |||
396 | #if 0 | 396 | #if 0 |
397 | static u8 *skip_pes_header(u8 **bufp) | 397 | static u8 *skip_pes_header(u8 **bufp) |
398 | { | 398 | { |
399 | u8 *inbuf = *bufp; | 399 | u8 *inbuf = *bufp; |
400 | u8 *buf = inbuf; | 400 | u8 *buf = inbuf; |
401 | u8 *pts = NULL; | 401 | u8 *pts = NULL; |
402 | int skip = 0; | 402 | int skip = 0; |
403 | 403 | ||
404 | static const int mpeg1_skip_table[16] = { | 404 | static const int mpeg1_skip_table[16] = { |
405 | 1, 0xffff, 5, 10, 0xffff, 0xffff, 0xffff, 0xffff, | 405 | 1, 0xffff, 5, 10, 0xffff, 0xffff, 0xffff, 0xffff, |
406 | 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff | 406 | 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff |
407 | }; | 407 | }; |
408 | 408 | ||
409 | 409 | ||
410 | if ((inbuf[6] & 0xc0) == 0x80){ /* mpeg2 */ | 410 | if ((inbuf[6] & 0xc0) == 0x80){ /* mpeg2 */ |
411 | if (buf[7] & PTS_ONLY) | 411 | if (buf[7] & PTS_ONLY) |
412 | pts = buf+9; | 412 | pts = buf+9; |
413 | else pts = NULL; | 413 | else pts = NULL; |
414 | buf = inbuf + 9 + inbuf[8]; | 414 | buf = inbuf + 9 + inbuf[8]; |
415 | } else { /* mpeg1 */ | 415 | } else { /* mpeg1 */ |
416 | for (buf = inbuf + 6; *buf == 0xff; buf++) | 416 | for (buf = inbuf + 6; *buf == 0xff; buf++) |
417 | if (buf == inbuf + 6 + 16) { | 417 | if (buf == inbuf + 6 + 16) { |
418 | break; | 418 | break; |
419 | } | 419 | } |
420 | if ((*buf & 0xc0) == 0x40) | 420 | if ((*buf & 0xc0) == 0x40) |
421 | buf += 2; | 421 | buf += 2; |
422 | skip = mpeg1_skip_table [*buf >> 4]; | 422 | skip = mpeg1_skip_table [*buf >> 4]; |
423 | if (skip == 5 || skip == 10) pts = buf; | 423 | if (skip == 5 || skip == 10) pts = buf; |
424 | else pts = NULL; | 424 | else pts = NULL; |
425 | 425 | ||
426 | buf += mpeg1_skip_table [*buf >> 4]; | 426 | buf += mpeg1_skip_table [*buf >> 4]; |
427 | } | 427 | } |
428 | 428 | ||
429 | *bufp = buf; | 429 | *bufp = buf; |
430 | return pts; | 430 | return pts; |
431 | } | 431 | } |
432 | #endif | 432 | #endif |
433 | 433 | ||
434 | #if 0 | 434 | #if 0 |
435 | static void initialize_quant_matrix( u32 *matrix ) | 435 | static void initialize_quant_matrix( u32 *matrix ) |
436 | { | 436 | { |
437 | int i; | 437 | int i; |
438 | 438 | ||
439 | matrix[0] = 0x08101013; | 439 | matrix[0] = 0x08101013; |
440 | matrix[1] = 0x10131616; | 440 | matrix[1] = 0x10131616; |
441 | matrix[2] = 0x16161616; | 441 | matrix[2] = 0x16161616; |
442 | matrix[3] = 0x1a181a1b; | 442 | matrix[3] = 0x1a181a1b; |
443 | matrix[4] = 0x1b1b1a1a; | 443 | matrix[4] = 0x1b1b1a1a; |
444 | matrix[5] = 0x1a1a1b1b; | 444 | matrix[5] = 0x1a1a1b1b; |
445 | matrix[6] = 0x1b1d1d1d; | 445 | matrix[6] = 0x1b1d1d1d; |
446 | matrix[7] = 0x2222221d; | 446 | matrix[7] = 0x2222221d; |
447 | matrix[8] = 0x1d1d1b1b; | 447 | matrix[8] = 0x1d1d1b1b; |
448 | matrix[9] = 0x1d1d2020; | 448 | matrix[9] = 0x1d1d2020; |
449 | matrix[10] = 0x22222526; | 449 | matrix[10] = 0x22222526; |
450 | matrix[11] = 0x25232322; | 450 | matrix[11] = 0x25232322; |
451 | matrix[12] = 0x23262628; | 451 | matrix[12] = 0x23262628; |
452 | matrix[13] = 0x28283030; | 452 | matrix[13] = 0x28283030; |
453 | matrix[14] = 0x2e2e3838; | 453 | matrix[14] = 0x2e2e3838; |
454 | matrix[15] = 0x3a454553; | 454 | matrix[15] = 0x3a454553; |
455 | 455 | ||
456 | for ( i = 16 ; i < 32 ; i++ ) | 456 | for ( i = 16 ; i < 32 ; i++ ) |
457 | matrix[i] = 0x10101010; | 457 | matrix[i] = 0x10101010; |
458 | } | 458 | } |
459 | #endif | 459 | #endif |
460 | 460 | ||
461 | #if 0 | 461 | #if 0 |
462 | static void initialize_mpg_picture(struct mpg_picture *pic) | 462 | static void initialize_mpg_picture(struct mpg_picture *pic) |
463 | { | 463 | { |
464 | int i; | 464 | int i; |
465 | 465 | ||
466 | /* set MPEG1 */ | 466 | /* set MPEG1 */ |
467 | pic->mpeg1_flag = 1; | 467 | pic->mpeg1_flag = 1; |
468 | pic->profile_and_level = 0x4A ; /* MP@LL */ | 468 | pic->profile_and_level = 0x4A ; /* MP@LL */ |
469 | pic->progressive_sequence = 1; | 469 | pic->progressive_sequence = 1; |
470 | pic->low_delay = 0; | 470 | pic->low_delay = 0; |
471 | 471 | ||
472 | pic->sequence_display_extension_flag = 0; | 472 | pic->sequence_display_extension_flag = 0; |
473 | for ( i = 0 ; i < 4 ; i++ ){ | 473 | for ( i = 0 ; i < 4 ; i++ ){ |
474 | pic->frame_centre_horizontal_offset[i] = 0; | 474 | pic->frame_centre_horizontal_offset[i] = 0; |
475 | pic->frame_centre_vertical_offset[i] = 0; | 475 | pic->frame_centre_vertical_offset[i] = 0; |
476 | } | 476 | } |
477 | pic->last_frame_centre_horizontal_offset = 0; | 477 | pic->last_frame_centre_horizontal_offset = 0; |
478 | pic->last_frame_centre_vertical_offset = 0; | 478 | pic->last_frame_centre_vertical_offset = 0; |
479 | 479 | ||
480 | pic->picture_display_extension_flag[0] = 0; | 480 | pic->picture_display_extension_flag[0] = 0; |
481 | pic->picture_display_extension_flag[1] = 0; | 481 | pic->picture_display_extension_flag[1] = 0; |
482 | pic->sequence_header_flag = 0; | 482 | pic->sequence_header_flag = 0; |
483 | pic->gop_flag = 0; | 483 | pic->gop_flag = 0; |
484 | pic->sequence_end_flag = 0; | 484 | pic->sequence_end_flag = 0; |
485 | } | 485 | } |
486 | #endif | 486 | #endif |
487 | 487 | ||
488 | #if 0 | 488 | #if 0 |
489 | static void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic ) | 489 | static void mpg_set_picture_parameter( int32_t field_type, struct mpg_picture *pic ) |
490 | { | 490 | { |
491 | int16_t last_h_offset; | 491 | int16_t last_h_offset; |
492 | int16_t last_v_offset; | 492 | int16_t last_v_offset; |
493 | 493 | ||
494 | int16_t *p_h_offset; | 494 | int16_t *p_h_offset; |
495 | int16_t *p_v_offset; | 495 | int16_t *p_v_offset; |
496 | 496 | ||
497 | if ( pic->mpeg1_flag ){ | 497 | if ( pic->mpeg1_flag ){ |
498 | pic->picture_structure[field_type] = VIDEO_FRAME_PICTURE; | 498 | pic->picture_structure[field_type] = VIDEO_FRAME_PICTURE; |
499 | pic->top_field_first = 0; | 499 | pic->top_field_first = 0; |
500 | pic->repeat_first_field = 0; | 500 | pic->repeat_first_field = 0; |
501 | pic->progressive_frame = 1; | 501 | pic->progressive_frame = 1; |
502 | pic->picture_coding_parameter = 0x000010; | 502 | pic->picture_coding_parameter = 0x000010; |
503 | } | 503 | } |
504 | 504 | ||
505 | /* Reset flag */ | 505 | /* Reset flag */ |
506 | pic->picture_display_extension_flag[field_type] = 0; | 506 | pic->picture_display_extension_flag[field_type] = 0; |
507 | 507 | ||
508 | last_h_offset = pic->last_frame_centre_horizontal_offset; | 508 | last_h_offset = pic->last_frame_centre_horizontal_offset; |
509 | last_v_offset = pic->last_frame_centre_vertical_offset; | 509 | last_v_offset = pic->last_frame_centre_vertical_offset; |
510 | if ( field_type == FIRST_FIELD ){ | 510 | if ( field_type == FIRST_FIELD ){ |
511 | p_h_offset = pic->frame_centre_horizontal_offset; | 511 | p_h_offset = pic->frame_centre_horizontal_offset; |
512 | p_v_offset = pic->frame_centre_vertical_offset; | 512 | p_v_offset = pic->frame_centre_vertical_offset; |
513 | *p_h_offset = last_h_offset; | 513 | *p_h_offset = last_h_offset; |
514 | *(p_h_offset + 1) = last_h_offset; | 514 | *(p_h_offset + 1) = last_h_offset; |
515 | *(p_h_offset + 2) = last_h_offset; | 515 | *(p_h_offset + 2) = last_h_offset; |
516 | *p_v_offset = last_v_offset; | 516 | *p_v_offset = last_v_offset; |
517 | *(p_v_offset + 1) = last_v_offset; | 517 | *(p_v_offset + 1) = last_v_offset; |
518 | *(p_v_offset + 2) = last_v_offset; | 518 | *(p_v_offset + 2) = last_v_offset; |
519 | } else { | 519 | } else { |
520 | pic->frame_centre_horizontal_offset[3] = last_h_offset; | 520 | pic->frame_centre_horizontal_offset[3] = last_h_offset; |
521 | pic->frame_centre_vertical_offset[3] = last_v_offset; | 521 | pic->frame_centre_vertical_offset[3] = last_v_offset; |
522 | } | 522 | } |
523 | } | 523 | } |
524 | #endif | 524 | #endif |
525 | 525 | ||
526 | #if 0 | 526 | #if 0 |
527 | static void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type) | 527 | static void init_mpg_picture( struct mpg_picture *pic, int chan, int32_t field_type) |
528 | { | 528 | { |
529 | pic->picture_header = 0; | 529 | pic->picture_header = 0; |
530 | pic->sequence_header_data | 530 | pic->sequence_header_data |
531 | = ( INIT_HORIZONTAL_SIZE << 20 ) | 531 | = ( INIT_HORIZONTAL_SIZE << 20 ) |
532 | | ( INIT_VERTICAL_SIZE << 8 ) | 532 | | ( INIT_VERTICAL_SIZE << 8 ) |
533 | | ( INIT_ASPECT_RATIO << 4 ) | 533 | | ( INIT_ASPECT_RATIO << 4 ) |
534 | | ( INIT_FRAME_RATE ); | 534 | | ( INIT_FRAME_RATE ); |
535 | pic->mpeg1_flag = 0; | 535 | pic->mpeg1_flag = 0; |
536 | pic->vinfo.horizontal_size | 536 | pic->vinfo.horizontal_size |
537 | = INIT_DISP_HORIZONTAL_SIZE; | 537 | = INIT_DISP_HORIZONTAL_SIZE; |
538 | pic->vinfo.vertical_size | 538 | pic->vinfo.vertical_size |
539 | = INIT_DISP_VERTICAL_SIZE; | 539 | = INIT_DISP_VERTICAL_SIZE; |
540 | pic->picture_display_extension_flag[field_type] | 540 | pic->picture_display_extension_flag[field_type] |
541 | = 0; | 541 | = 0; |
542 | pic->pts_flag[field_type] = 0; | 542 | pic->pts_flag[field_type] = 0; |
543 | 543 | ||
544 | pic->sequence_gop_header = 0; | 544 | pic->sequence_gop_header = 0; |
545 | pic->picture_header = 0; | 545 | pic->picture_header = 0; |
546 | pic->sequence_header_flag = 0; | 546 | pic->sequence_header_flag = 0; |
547 | pic->gop_flag = 0; | 547 | pic->gop_flag = 0; |
548 | pic->sequence_end_flag = 0; | 548 | pic->sequence_end_flag = 0; |
549 | pic->sequence_display_extension_flag = 0; | 549 | pic->sequence_display_extension_flag = 0; |
550 | pic->last_frame_centre_horizontal_offset = 0; | 550 | pic->last_frame_centre_horizontal_offset = 0; |
551 | pic->last_frame_centre_vertical_offset = 0; | 551 | pic->last_frame_centre_vertical_offset = 0; |
552 | pic->channel = chan; | 552 | pic->channel = chan; |
553 | } | 553 | } |
554 | #endif | 554 | #endif |
@@ -588,11 +588,11 @@ int dvb_filter_pes2ts(struct dvb_filter_pes2ts *p2ts, unsigned char *pes, | |||
588 | buf[1]&=~0x40; | 588 | buf[1]&=~0x40; |
589 | } | 589 | } |
590 | if (!len) | 590 | if (!len) |
591 | return 0; | 591 | return 0; |
592 | buf[3]=0x30|((p2ts->cc++)&0x0f); | 592 | buf[3]=0x30|((p2ts->cc++)&0x0f); |
593 | rest=183-len; | 593 | rest=183-len; |
594 | if (rest) { | 594 | if (rest) { |
595 | buf[5]=0x00; | 595 | buf[5]=0x00; |
596 | if (rest-1) | 596 | if (rest-1) |
597 | memset(buf+6, 0xff, rest-1); | 597 | memset(buf+6, 0xff, rest-1); |
598 | } | 598 | } |
diff --git a/drivers/media/dvb/dvb-core/dvb_filter.h b/drivers/media/dvb/dvb-core/dvb_filter.h index b0848f7836b7..375e3be184b1 100644 --- a/drivers/media/dvb/dvb-core/dvb_filter.h +++ b/drivers/media/dvb/dvb-core/dvb_filter.h | |||
@@ -29,8 +29,8 @@ typedef int (dvb_filter_pes2ts_cb_t) (void *, unsigned char *); | |||
29 | 29 | ||
30 | struct dvb_filter_pes2ts { | 30 | struct dvb_filter_pes2ts { |
31 | unsigned char buf[188]; | 31 | unsigned char buf[188]; |
32 | unsigned char cc; | 32 | unsigned char cc; |
33 | dvb_filter_pes2ts_cb_t *cb; | 33 | dvb_filter_pes2ts_cb_t *cb; |
34 | void *priv; | 34 | void *priv; |
35 | }; | 35 | }; |
36 | 36 | ||
@@ -162,7 +162,7 @@ struct dvb_video_info { | |||
162 | u32 bit_rate; | 162 | u32 bit_rate; |
163 | u32 comp_bit_rate; | 163 | u32 comp_bit_rate; |
164 | u32 vbv_buffer_size; | 164 | u32 vbv_buffer_size; |
165 | s16 vbv_delay; | 165 | s16 vbv_delay; |
166 | u32 CSPF; | 166 | u32 CSPF; |
167 | u32 off; | 167 | u32 off; |
168 | }; | 168 | }; |
@@ -173,60 +173,60 @@ struct dvb_video_info { | |||
173 | #define VIDEO_FRAME_PICTURE 0x03 | 173 | #define VIDEO_FRAME_PICTURE 0x03 |
174 | 174 | ||
175 | struct mpg_picture { | 175 | struct mpg_picture { |
176 | int channel; | 176 | int channel; |
177 | struct dvb_video_info vinfo; | 177 | struct dvb_video_info vinfo; |
178 | u32 *sequence_gop_header; | 178 | u32 *sequence_gop_header; |
179 | u32 *picture_header; | 179 | u32 *picture_header; |
180 | s32 time_code; | 180 | s32 time_code; |
181 | int low_delay; | 181 | int low_delay; |
182 | int closed_gop; | 182 | int closed_gop; |
183 | int broken_link; | 183 | int broken_link; |
184 | int sequence_header_flag; | 184 | int sequence_header_flag; |
185 | int gop_flag; | 185 | int gop_flag; |
186 | int sequence_end_flag; | 186 | int sequence_end_flag; |
187 | 187 | ||
188 | u8 profile_and_level; | 188 | u8 profile_and_level; |
189 | s32 picture_coding_parameter; | 189 | s32 picture_coding_parameter; |
190 | u32 matrix[32]; | 190 | u32 matrix[32]; |
191 | s8 matrix_change_flag; | 191 | s8 matrix_change_flag; |
192 | 192 | ||
193 | u8 picture_header_parameter; | 193 | u8 picture_header_parameter; |
194 | /* bit 0 - 2: bwd f code | 194 | /* bit 0 - 2: bwd f code |
195 | bit 3 : fpb vector | 195 | bit 3 : fpb vector |
196 | bit 4 - 6: fwd f code | 196 | bit 4 - 6: fwd f code |
197 | bit 7 : fpf vector */ | 197 | bit 7 : fpf vector */ |
198 | 198 | ||
199 | int mpeg1_flag; | 199 | int mpeg1_flag; |
200 | int progressive_sequence; | 200 | int progressive_sequence; |
201 | int sequence_display_extension_flag; | 201 | int sequence_display_extension_flag; |
202 | u32 sequence_header_data; | 202 | u32 sequence_header_data; |
203 | s16 last_frame_centre_horizontal_offset; | 203 | s16 last_frame_centre_horizontal_offset; |
204 | s16 last_frame_centre_vertical_offset; | 204 | s16 last_frame_centre_vertical_offset; |
205 | 205 | ||
206 | u32 pts[2]; /* [0] 1st field, [1] 2nd field */ | 206 | u32 pts[2]; /* [0] 1st field, [1] 2nd field */ |
207 | int top_field_first; | 207 | int top_field_first; |
208 | int repeat_first_field; | 208 | int repeat_first_field; |
209 | int progressive_frame; | 209 | int progressive_frame; |
210 | int bank; | 210 | int bank; |
211 | int forward_bank; | 211 | int forward_bank; |
212 | int backward_bank; | 212 | int backward_bank; |
213 | int compress; | 213 | int compress; |
214 | s16 frame_centre_horizontal_offset[OFF_SIZE]; | 214 | s16 frame_centre_horizontal_offset[OFF_SIZE]; |
215 | /* [0-2] 1st field, [3] 2nd field */ | 215 | /* [0-2] 1st field, [3] 2nd field */ |
216 | s16 frame_centre_vertical_offset[OFF_SIZE]; | 216 | s16 frame_centre_vertical_offset[OFF_SIZE]; |
217 | /* [0-2] 1st field, [3] 2nd field */ | 217 | /* [0-2] 1st field, [3] 2nd field */ |
218 | s16 temporal_reference[2]; | 218 | s16 temporal_reference[2]; |
219 | /* [0] 1st field, [1] 2nd field */ | 219 | /* [0] 1st field, [1] 2nd field */ |
220 | 220 | ||
221 | s8 picture_coding_type[2]; | 221 | s8 picture_coding_type[2]; |
222 | /* [0] 1st field, [1] 2nd field */ | 222 | /* [0] 1st field, [1] 2nd field */ |
223 | s8 picture_structure[2]; | 223 | s8 picture_structure[2]; |
224 | /* [0] 1st field, [1] 2nd field */ | 224 | /* [0] 1st field, [1] 2nd field */ |
225 | s8 picture_display_extension_flag[2]; | 225 | s8 picture_display_extension_flag[2]; |
226 | /* [0] 1st field, [1] 2nd field */ | 226 | /* [0] 1st field, [1] 2nd field */ |
227 | /* picture_display_extenion() 0:no 1:exit*/ | 227 | /* picture_display_extenion() 0:no 1:exit*/ |
228 | s8 pts_flag[2]; | 228 | s8 pts_flag[2]; |
229 | /* [0] 1st field, [1] 2nd field */ | 229 | /* [0] 1st field, [1] 2nd field */ |
230 | }; | 230 | }; |
231 | 231 | ||
232 | struct dvb_audio_info { | 232 | struct dvb_audio_info { |
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c index 6ffa6b216363..95ea5095e07e 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb/dvb-core/dvb_frontend.c | |||
@@ -372,10 +372,10 @@ static int dvb_frontend_thread(void *data) | |||
372 | 372 | ||
373 | snprintf (name, sizeof(name), "kdvb-fe-%i", fe->dvb->num); | 373 | snprintf (name, sizeof(name), "kdvb-fe-%i", fe->dvb->num); |
374 | 374 | ||
375 | lock_kernel(); | 375 | lock_kernel(); |
376 | daemonize(name); | 376 | daemonize(name); |
377 | sigfillset(¤t->blocked); | 377 | sigfillset(¤t->blocked); |
378 | unlock_kernel(); | 378 | unlock_kernel(); |
379 | 379 | ||
380 | fepriv->status = 0; | 380 | fepriv->status = 0; |
381 | dvb_frontend_init(fe); | 381 | dvb_frontend_init(fe); |
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h index 348c9b0b988a..1e0840d02f1f 100644 --- a/drivers/media/dvb/dvb-core/dvb_frontend.h +++ b/drivers/media/dvb/dvb-core/dvb_frontend.h | |||
@@ -41,10 +41,10 @@ | |||
41 | #include "dvbdev.h" | 41 | #include "dvbdev.h" |
42 | 42 | ||
43 | struct dvb_frontend_tune_settings { | 43 | struct dvb_frontend_tune_settings { |
44 | int min_delay_ms; | 44 | int min_delay_ms; |
45 | int step_size; | 45 | int step_size; |
46 | int max_drift; | 46 | int max_drift; |
47 | struct dvb_frontend_parameters parameters; | 47 | struct dvb_frontend_parameters parameters; |
48 | }; | 48 | }; |
49 | 49 | ||
50 | struct dvb_frontend; | 50 | struct dvb_frontend; |
diff --git a/drivers/media/dvb/dvb-core/dvb_net.c b/drivers/media/dvb/dvb-core/dvb_net.c index df536bd2e103..86bba81e851e 100644 --- a/drivers/media/dvb/dvb-core/dvb_net.c +++ b/drivers/media/dvb/dvb-core/dvb_net.c | |||
@@ -713,7 +713,7 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len, | |||
713 | if (buffer1_len > 32768) | 713 | if (buffer1_len > 32768) |
714 | printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len); | 714 | printk(KERN_WARNING "length > 32k: %zu.\n", buffer1_len); |
715 | /* printk("TS callback: %u bytes, %u TS cells @ %p.\n", | 715 | /* printk("TS callback: %u bytes, %u TS cells @ %p.\n", |
716 | buffer1_len, buffer1_len / TS_SZ, buffer1); */ | 716 | buffer1_len, buffer1_len / TS_SZ, buffer1); */ |
717 | dvb_net_ule(dev, buffer1, buffer1_len); | 717 | dvb_net_ule(dev, buffer1, buffer1_len); |
718 | return 0; | 718 | return 0; |
719 | } | 719 | } |
@@ -721,8 +721,8 @@ static int dvb_net_ts_callback(const u8 *buffer1, size_t buffer1_len, | |||
721 | 721 | ||
722 | static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len) | 722 | static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len) |
723 | { | 723 | { |
724 | u8 *eth; | 724 | u8 *eth; |
725 | struct sk_buff *skb; | 725 | struct sk_buff *skb; |
726 | struct net_device_stats *stats = &(((struct dvb_net_priv *) dev->priv)->stats); | 726 | struct net_device_stats *stats = &(((struct dvb_net_priv *) dev->priv)->stats); |
727 | int snap = 0; | 727 | int snap = 0; |
728 | 728 | ||
@@ -754,7 +754,7 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len) | |||
754 | return; | 754 | return; |
755 | } | 755 | } |
756 | snap = 8; | 756 | snap = 8; |
757 | } | 757 | } |
758 | if (pkt[7]) { | 758 | if (pkt[7]) { |
759 | /* FIXME: assemble datagram from multiple sections */ | 759 | /* FIXME: assemble datagram from multiple sections */ |
760 | stats->rx_errors++; | 760 | stats->rx_errors++; |
@@ -778,14 +778,14 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len) | |||
778 | memcpy(eth + 14, pkt + 12 + snap, pkt_len - 12 - 4 - snap); | 778 | memcpy(eth + 14, pkt + 12 + snap, pkt_len - 12 - 4 - snap); |
779 | 779 | ||
780 | /* create ethernet header: */ | 780 | /* create ethernet header: */ |
781 | eth[0]=pkt[0x0b]; | 781 | eth[0]=pkt[0x0b]; |
782 | eth[1]=pkt[0x0a]; | 782 | eth[1]=pkt[0x0a]; |
783 | eth[2]=pkt[0x09]; | 783 | eth[2]=pkt[0x09]; |
784 | eth[3]=pkt[0x08]; | 784 | eth[3]=pkt[0x08]; |
785 | eth[4]=pkt[0x04]; | 785 | eth[4]=pkt[0x04]; |
786 | eth[5]=pkt[0x03]; | 786 | eth[5]=pkt[0x03]; |
787 | 787 | ||
788 | eth[6]=eth[7]=eth[8]=eth[9]=eth[10]=eth[11]=0; | 788 | eth[6]=eth[7]=eth[8]=eth[9]=eth[10]=eth[11]=0; |
789 | 789 | ||
790 | if (snap) { | 790 | if (snap) { |
791 | eth[12] = pkt[18]; | 791 | eth[12] = pkt[18]; |
@@ -807,7 +807,7 @@ static void dvb_net_sec(struct net_device *dev, u8 *pkt, int pkt_len) | |||
807 | 807 | ||
808 | stats->rx_packets++; | 808 | stats->rx_packets++; |
809 | stats->rx_bytes+=skb->len; | 809 | stats->rx_bytes+=skb->len; |
810 | netif_rx(skb); | 810 | netif_rx(skb); |
811 | } | 811 | } |
812 | 812 | ||
813 | static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len, | 813 | static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len, |
@@ -815,7 +815,7 @@ static int dvb_net_sec_callback(const u8 *buffer1, size_t buffer1_len, | |||
815 | struct dmx_section_filter *filter, | 815 | struct dmx_section_filter *filter, |
816 | enum dmx_success success) | 816 | enum dmx_success success) |
817 | { | 817 | { |
818 | struct net_device *dev = filter->priv; | 818 | struct net_device *dev = filter->priv; |
819 | 819 | ||
820 | /** | 820 | /** |
821 | * we rely on the DVB API definition where exactly one complete | 821 | * we rely on the DVB API definition where exactly one complete |
@@ -885,8 +885,8 @@ static int dvb_net_feed_start(struct net_device *dev) | |||
885 | { | 885 | { |
886 | int ret = 0, i; | 886 | int ret = 0, i; |
887 | struct dvb_net_priv *priv = dev->priv; | 887 | struct dvb_net_priv *priv = dev->priv; |
888 | struct dmx_demux *demux = priv->demux; | 888 | struct dmx_demux *demux = priv->demux; |
889 | unsigned char *mac = (unsigned char *) dev->dev_addr; | 889 | unsigned char *mac = (unsigned char *) dev->dev_addr; |
890 | 890 | ||
891 | dprintk("%s: rx_mode %i\n", __FUNCTION__, priv->rx_mode); | 891 | dprintk("%s: rx_mode %i\n", __FUNCTION__, priv->rx_mode); |
892 | down(&priv->mutex); | 892 | down(&priv->mutex); |
@@ -1129,12 +1129,12 @@ static int dvb_net_stop(struct net_device *dev) | |||
1129 | struct dvb_net_priv *priv = dev->priv; | 1129 | struct dvb_net_priv *priv = dev->priv; |
1130 | 1130 | ||
1131 | priv->in_use--; | 1131 | priv->in_use--; |
1132 | return dvb_net_feed_stop(dev); | 1132 | return dvb_net_feed_stop(dev); |
1133 | } | 1133 | } |
1134 | 1134 | ||
1135 | static struct net_device_stats * dvb_net_get_stats(struct net_device *dev) | 1135 | static struct net_device_stats * dvb_net_get_stats(struct net_device *dev) |
1136 | { | 1136 | { |
1137 | return &((struct dvb_net_priv*) dev->priv)->stats; | 1137 | return &((struct dvb_net_priv*) dev->priv)->stats; |
1138 | } | 1138 | } |
1139 | 1139 | ||
1140 | static void dvb_net_setup(struct net_device *dev) | 1140 | static void dvb_net_setup(struct net_device *dev) |
@@ -1360,10 +1360,10 @@ static struct file_operations dvb_net_fops = { | |||
1360 | }; | 1360 | }; |
1361 | 1361 | ||
1362 | static struct dvb_device dvbdev_net = { | 1362 | static struct dvb_device dvbdev_net = { |
1363 | .priv = NULL, | 1363 | .priv = NULL, |
1364 | .users = 1, | 1364 | .users = 1, |
1365 | .writers = 1, | 1365 | .writers = 1, |
1366 | .fops = &dvb_net_fops, | 1366 | .fops = &dvb_net_fops, |
1367 | }; | 1367 | }; |
1368 | 1368 | ||
1369 | 1369 | ||
diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c index fb6d94a69d71..283c6e9339a4 100644 --- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.c +++ b/drivers/media/dvb/dvb-core/dvb_ringbuffer.c | |||
@@ -42,216 +42,216 @@ | |||
42 | 42 | ||
43 | void dvb_ringbuffer_init(struct dvb_ringbuffer *rbuf, void *data, size_t len) | 43 | void dvb_ringbuffer_init(struct dvb_ringbuffer *rbuf, void *data, size_t len) |
44 | { | 44 | { |
45 | rbuf->pread=rbuf->pwrite=0; | 45 | rbuf->pread=rbuf->pwrite=0; |
46 | rbuf->data=data; | 46 | rbuf->data=data; |
47 | rbuf->size=len; | 47 | rbuf->size=len; |
48 | 48 | ||
49 | init_waitqueue_head(&rbuf->queue); | 49 | init_waitqueue_head(&rbuf->queue); |
50 | 50 | ||
51 | spin_lock_init(&(rbuf->lock)); | 51 | spin_lock_init(&(rbuf->lock)); |
52 | } | 52 | } |
53 | 53 | ||
54 | 54 | ||
55 | 55 | ||
56 | int dvb_ringbuffer_empty(struct dvb_ringbuffer *rbuf) | 56 | int dvb_ringbuffer_empty(struct dvb_ringbuffer *rbuf) |
57 | { | 57 | { |
58 | return (rbuf->pread==rbuf->pwrite); | 58 | return (rbuf->pread==rbuf->pwrite); |
59 | } | 59 | } |
60 | 60 | ||
61 | 61 | ||
62 | 62 | ||
63 | ssize_t dvb_ringbuffer_free(struct dvb_ringbuffer *rbuf) | 63 | ssize_t dvb_ringbuffer_free(struct dvb_ringbuffer *rbuf) |
64 | { | 64 | { |
65 | ssize_t free; | 65 | ssize_t free; |
66 | 66 | ||
67 | free = rbuf->pread - rbuf->pwrite; | 67 | free = rbuf->pread - rbuf->pwrite; |
68 | if (free <= 0) | 68 | if (free <= 0) |
69 | free += rbuf->size; | 69 | free += rbuf->size; |
70 | return free-1; | 70 | return free-1; |
71 | } | 71 | } |
72 | 72 | ||
73 | 73 | ||
74 | 74 | ||
75 | ssize_t dvb_ringbuffer_avail(struct dvb_ringbuffer *rbuf) | 75 | ssize_t dvb_ringbuffer_avail(struct dvb_ringbuffer *rbuf) |
76 | { | 76 | { |
77 | ssize_t avail; | 77 | ssize_t avail; |
78 | 78 | ||
79 | avail = rbuf->pwrite - rbuf->pread; | 79 | avail = rbuf->pwrite - rbuf->pread; |
80 | if (avail < 0) | 80 | if (avail < 0) |
81 | avail += rbuf->size; | 81 | avail += rbuf->size; |
82 | return avail; | 82 | return avail; |
83 | } | 83 | } |
84 | 84 | ||
85 | 85 | ||
86 | 86 | ||
87 | void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf) | 87 | void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf) |
88 | { | 88 | { |
89 | rbuf->pread = rbuf->pwrite; | 89 | rbuf->pread = rbuf->pwrite; |
90 | } | 90 | } |
91 | 91 | ||
92 | 92 | ||
93 | 93 | ||
94 | void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf) | 94 | void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf) |
95 | { | 95 | { |
96 | unsigned long flags; | 96 | unsigned long flags; |
97 | 97 | ||
98 | spin_lock_irqsave(&rbuf->lock, flags); | 98 | spin_lock_irqsave(&rbuf->lock, flags); |
99 | dvb_ringbuffer_flush(rbuf); | 99 | dvb_ringbuffer_flush(rbuf); |
100 | spin_unlock_irqrestore(&rbuf->lock, flags); | 100 | spin_unlock_irqrestore(&rbuf->lock, flags); |
101 | 101 | ||
102 | wake_up(&rbuf->queue); | 102 | wake_up(&rbuf->queue); |
103 | } | 103 | } |
104 | 104 | ||
105 | 105 | ||
106 | 106 | ||
107 | ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, size_t len, int usermem) | 107 | ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, size_t len, int usermem) |
108 | { | 108 | { |
109 | size_t todo = len; | 109 | size_t todo = len; |
110 | size_t split; | 110 | size_t split; |
111 | 111 | ||
112 | split = (rbuf->pread + len > rbuf->size) ? rbuf->size - rbuf->pread : 0; | 112 | split = (rbuf->pread + len > rbuf->size) ? rbuf->size - rbuf->pread : 0; |
113 | if (split > 0) { | 113 | if (split > 0) { |
114 | if (!usermem) | 114 | if (!usermem) |
115 | memcpy(buf, rbuf->data+rbuf->pread, split); | 115 | memcpy(buf, rbuf->data+rbuf->pread, split); |
116 | else | 116 | else |
117 | if (copy_to_user(buf, rbuf->data+rbuf->pread, split)) | 117 | if (copy_to_user(buf, rbuf->data+rbuf->pread, split)) |
118 | return -EFAULT; | 118 | return -EFAULT; |
119 | buf += split; | 119 | buf += split; |
120 | todo -= split; | 120 | todo -= split; |
121 | rbuf->pread = 0; | 121 | rbuf->pread = 0; |
122 | } | 122 | } |
123 | if (!usermem) | 123 | if (!usermem) |
124 | memcpy(buf, rbuf->data+rbuf->pread, todo); | 124 | memcpy(buf, rbuf->data+rbuf->pread, todo); |
125 | else | 125 | else |
126 | if (copy_to_user(buf, rbuf->data+rbuf->pread, todo)) | 126 | if (copy_to_user(buf, rbuf->data+rbuf->pread, todo)) |
127 | return -EFAULT; | 127 | return -EFAULT; |
128 | 128 | ||
129 | rbuf->pread = (rbuf->pread + todo) % rbuf->size; | 129 | rbuf->pread = (rbuf->pread + todo) % rbuf->size; |
130 | 130 | ||
131 | return len; | 131 | return len; |
132 | } | 132 | } |
133 | 133 | ||
134 | 134 | ||
135 | 135 | ||
136 | ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf, size_t len) | 136 | ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf, size_t len) |
137 | { | 137 | { |
138 | size_t todo = len; | 138 | size_t todo = len; |
139 | size_t split; | 139 | size_t split; |
140 | 140 | ||
141 | split = (rbuf->pwrite + len > rbuf->size) ? rbuf->size - rbuf->pwrite : 0; | 141 | split = (rbuf->pwrite + len > rbuf->size) ? rbuf->size - rbuf->pwrite : 0; |
142 | 142 | ||
143 | if (split > 0) { | 143 | if (split > 0) { |
144 | memcpy(rbuf->data+rbuf->pwrite, buf, split); | 144 | memcpy(rbuf->data+rbuf->pwrite, buf, split); |
145 | buf += split; | 145 | buf += split; |
146 | todo -= split; | 146 | todo -= split; |
147 | rbuf->pwrite = 0; | 147 | rbuf->pwrite = 0; |
148 | } | 148 | } |
149 | memcpy(rbuf->data+rbuf->pwrite, buf, todo); | 149 | memcpy(rbuf->data+rbuf->pwrite, buf, todo); |
150 | rbuf->pwrite = (rbuf->pwrite + todo) % rbuf->size; | 150 | rbuf->pwrite = (rbuf->pwrite + todo) % rbuf->size; |
151 | 151 | ||
152 | return len; | 152 | return len; |
153 | } | 153 | } |
154 | 154 | ||
155 | ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, size_t len) | 155 | ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, size_t len) |
156 | { | 156 | { |
157 | int status; | 157 | int status; |
158 | ssize_t oldpwrite = rbuf->pwrite; | 158 | ssize_t oldpwrite = rbuf->pwrite; |
159 | 159 | ||
160 | DVB_RINGBUFFER_WRITE_BYTE(rbuf, len >> 8); | 160 | DVB_RINGBUFFER_WRITE_BYTE(rbuf, len >> 8); |
161 | DVB_RINGBUFFER_WRITE_BYTE(rbuf, len & 0xff); | 161 | DVB_RINGBUFFER_WRITE_BYTE(rbuf, len & 0xff); |
162 | DVB_RINGBUFFER_WRITE_BYTE(rbuf, PKT_READY); | 162 | DVB_RINGBUFFER_WRITE_BYTE(rbuf, PKT_READY); |
163 | status = dvb_ringbuffer_write(rbuf, buf, len); | 163 | status = dvb_ringbuffer_write(rbuf, buf, len); |
164 | 164 | ||
165 | if (status < 0) rbuf->pwrite = oldpwrite; | 165 | if (status < 0) rbuf->pwrite = oldpwrite; |
166 | return status; | 166 | return status; |
167 | } | 167 | } |
168 | 168 | ||
169 | ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx, | 169 | ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx, |
170 | int offset, u8* buf, size_t len, int usermem) | 170 | int offset, u8* buf, size_t len, int usermem) |
171 | { | 171 | { |
172 | size_t todo; | 172 | size_t todo; |
173 | size_t split; | 173 | size_t split; |
174 | size_t pktlen; | 174 | size_t pktlen; |
175 | 175 | ||
176 | pktlen = rbuf->data[idx] << 8; | 176 | pktlen = rbuf->data[idx] << 8; |
177 | pktlen |= rbuf->data[(idx + 1) % rbuf->size]; | 177 | pktlen |= rbuf->data[(idx + 1) % rbuf->size]; |
178 | if (offset > pktlen) return -EINVAL; | 178 | if (offset > pktlen) return -EINVAL; |
179 | if ((offset + len) > pktlen) len = pktlen - offset; | 179 | if ((offset + len) > pktlen) len = pktlen - offset; |
180 | 180 | ||
181 | idx = (idx + DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size; | 181 | idx = (idx + DVB_RINGBUFFER_PKTHDRSIZE + offset) % rbuf->size; |
182 | todo = len; | 182 | todo = len; |
183 | split = ((idx + len) > rbuf->size) ? rbuf->size - idx : 0; | 183 | split = ((idx + len) > rbuf->size) ? rbuf->size - idx : 0; |
184 | if (split > 0) { | 184 | if (split > 0) { |
185 | if (!usermem) | 185 | if (!usermem) |
186 | memcpy(buf, rbuf->data+idx, split); | 186 | memcpy(buf, rbuf->data+idx, split); |
187 | else | 187 | else |
188 | if (copy_to_user(buf, rbuf->data+idx, split)) | 188 | if (copy_to_user(buf, rbuf->data+idx, split)) |
189 | return -EFAULT; | 189 | return -EFAULT; |
190 | buf += split; | 190 | buf += split; |
191 | todo -= split; | 191 | todo -= split; |
192 | idx = 0; | 192 | idx = 0; |
193 | } | 193 | } |
194 | if (!usermem) | 194 | if (!usermem) |
195 | memcpy(buf, rbuf->data+idx, todo); | 195 | memcpy(buf, rbuf->data+idx, todo); |
196 | else | 196 | else |
197 | if (copy_to_user(buf, rbuf->data+idx, todo)) | 197 | if (copy_to_user(buf, rbuf->data+idx, todo)) |
198 | return -EFAULT; | 198 | return -EFAULT; |
199 | 199 | ||
200 | return len; | 200 | return len; |
201 | } | 201 | } |
202 | 202 | ||
203 | void dvb_ringbuffer_pkt_dispose(struct dvb_ringbuffer *rbuf, size_t idx) | 203 | void dvb_ringbuffer_pkt_dispose(struct dvb_ringbuffer *rbuf, size_t idx) |
204 | { | 204 | { |
205 | size_t pktlen; | 205 | size_t pktlen; |
206 | 206 | ||
207 | rbuf->data[(idx + 2) % rbuf->size] = PKT_DISPOSED; | 207 | rbuf->data[(idx + 2) % rbuf->size] = PKT_DISPOSED; |
208 | 208 | ||
209 | // clean up disposed packets | 209 | // clean up disposed packets |
210 | while(dvb_ringbuffer_avail(rbuf) > DVB_RINGBUFFER_PKTHDRSIZE) { | 210 | while(dvb_ringbuffer_avail(rbuf) > DVB_RINGBUFFER_PKTHDRSIZE) { |
211 | if (DVB_RINGBUFFER_PEEK(rbuf, 2) == PKT_DISPOSED) { | 211 | if (DVB_RINGBUFFER_PEEK(rbuf, 2) == PKT_DISPOSED) { |
212 | pktlen = DVB_RINGBUFFER_PEEK(rbuf, 0) << 8; | 212 | pktlen = DVB_RINGBUFFER_PEEK(rbuf, 0) << 8; |
213 | pktlen |= DVB_RINGBUFFER_PEEK(rbuf, 1); | 213 | pktlen |= DVB_RINGBUFFER_PEEK(rbuf, 1); |
214 | DVB_RINGBUFFER_SKIP(rbuf, pktlen + DVB_RINGBUFFER_PKTHDRSIZE); | 214 | DVB_RINGBUFFER_SKIP(rbuf, pktlen + DVB_RINGBUFFER_PKTHDRSIZE); |
215 | } else { | 215 | } else { |
216 | // first packet is not disposed, so we stop cleaning now | 216 | // first packet is not disposed, so we stop cleaning now |
217 | break; | 217 | break; |
218 | } | 218 | } |
219 | } | 219 | } |
220 | } | 220 | } |
221 | 221 | ||
222 | ssize_t dvb_ringbuffer_pkt_next(struct dvb_ringbuffer *rbuf, size_t idx, size_t* pktlen) | 222 | ssize_t dvb_ringbuffer_pkt_next(struct dvb_ringbuffer *rbuf, size_t idx, size_t* pktlen) |
223 | { | 223 | { |
224 | int consumed; | 224 | int consumed; |
225 | int curpktlen; | 225 | int curpktlen; |
226 | int curpktstatus; | 226 | int curpktstatus; |
227 | 227 | ||
228 | if (idx == -1) { | 228 | if (idx == -1) { |
229 | idx = rbuf->pread; | 229 | idx = rbuf->pread; |
230 | } else { | 230 | } else { |
231 | curpktlen = rbuf->data[idx] << 8; | 231 | curpktlen = rbuf->data[idx] << 8; |
232 | curpktlen |= rbuf->data[(idx + 1) % rbuf->size]; | 232 | curpktlen |= rbuf->data[(idx + 1) % rbuf->size]; |
233 | idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size; | 233 | idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size; |
234 | } | 234 | } |
235 | 235 | ||
236 | consumed = (idx - rbuf->pread) % rbuf->size; | 236 | consumed = (idx - rbuf->pread) % rbuf->size; |
237 | 237 | ||
238 | while((dvb_ringbuffer_avail(rbuf) - consumed) > DVB_RINGBUFFER_PKTHDRSIZE) { | 238 | while((dvb_ringbuffer_avail(rbuf) - consumed) > DVB_RINGBUFFER_PKTHDRSIZE) { |
239 | 239 | ||
240 | curpktlen = rbuf->data[idx] << 8; | 240 | curpktlen = rbuf->data[idx] << 8; |
241 | curpktlen |= rbuf->data[(idx + 1) % rbuf->size]; | 241 | curpktlen |= rbuf->data[(idx + 1) % rbuf->size]; |
242 | curpktstatus = rbuf->data[(idx + 2) % rbuf->size]; | 242 | curpktstatus = rbuf->data[(idx + 2) % rbuf->size]; |
243 | 243 | ||
244 | if (curpktstatus == PKT_READY) { | 244 | if (curpktstatus == PKT_READY) { |
245 | *pktlen = curpktlen; | 245 | *pktlen = curpktlen; |
246 | return idx; | 246 | return idx; |
247 | } | 247 | } |
248 | 248 | ||
249 | consumed += curpktlen + DVB_RINGBUFFER_PKTHDRSIZE; | 249 | consumed += curpktlen + DVB_RINGBUFFER_PKTHDRSIZE; |
250 | idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size; | 250 | idx = (idx + curpktlen + DVB_RINGBUFFER_PKTHDRSIZE) % rbuf->size; |
251 | } | 251 | } |
252 | 252 | ||
253 | // no packets available | 253 | // no packets available |
254 | return -1; | 254 | return -1; |
255 | } | 255 | } |
256 | 256 | ||
257 | 257 | ||
diff --git a/drivers/media/dvb/dvb-core/dvb_ringbuffer.h b/drivers/media/dvb/dvb-core/dvb_ringbuffer.h index d18e9c4ba9ea..fa476f662f82 100644 --- a/drivers/media/dvb/dvb-core/dvb_ringbuffer.h +++ b/drivers/media/dvb/dvb-core/dvb_ringbuffer.h | |||
@@ -31,13 +31,13 @@ | |||
31 | #include <linux/wait.h> | 31 | #include <linux/wait.h> |
32 | 32 | ||
33 | struct dvb_ringbuffer { | 33 | struct dvb_ringbuffer { |
34 | u8 *data; | 34 | u8 *data; |
35 | ssize_t size; | 35 | ssize_t size; |
36 | ssize_t pread; | 36 | ssize_t pread; |
37 | ssize_t pwrite; | 37 | ssize_t pwrite; |
38 | 38 | ||
39 | wait_queue_head_t queue; | 39 | wait_queue_head_t queue; |
40 | spinlock_t lock; | 40 | spinlock_t lock; |
41 | }; | 41 | }; |
42 | 42 | ||
43 | #define DVB_RINGBUFFER_PKTHDRSIZE 3 | 43 | #define DVB_RINGBUFFER_PKTHDRSIZE 3 |
@@ -106,7 +106,7 @@ extern void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf); | |||
106 | ** returns number of bytes transferred or -EFAULT | 106 | ** returns number of bytes transferred or -EFAULT |
107 | */ | 107 | */ |
108 | extern ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, | 108 | extern ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, |
109 | size_t len, int usermem); | 109 | size_t len, int usermem); |
110 | 110 | ||
111 | 111 | ||
112 | /* write routines & macros */ | 112 | /* write routines & macros */ |
@@ -121,7 +121,7 @@ extern ssize_t dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf, u8 *buf, | |||
121 | ** returns number of bytes transferred or -EFAULT | 121 | ** returns number of bytes transferred or -EFAULT |
122 | */ | 122 | */ |
123 | extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf, | 123 | extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf, |
124 | size_t len); | 124 | size_t len); |
125 | 125 | ||
126 | 126 | ||
127 | /** | 127 | /** |
@@ -133,7 +133,7 @@ extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf, | |||
133 | * returns Number of bytes written, or -EFAULT, -ENOMEM, -EVINAL. | 133 | * returns Number of bytes written, or -EFAULT, -ENOMEM, -EVINAL. |
134 | */ | 134 | */ |
135 | extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, | 135 | extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, |
136 | size_t len); | 136 | size_t len); |
137 | 137 | ||
138 | /** | 138 | /** |
139 | * Read from a packet in the ringbuffer. Note: unlike dvb_ringbuffer_read(), this | 139 | * Read from a packet in the ringbuffer. Note: unlike dvb_ringbuffer_read(), this |
@@ -149,7 +149,7 @@ extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8* buf, | |||
149 | * returns Number of bytes read, or -EFAULT. | 149 | * returns Number of bytes read, or -EFAULT. |
150 | */ | 150 | */ |
151 | extern ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx, | 151 | extern ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx, |
152 | int offset, u8* buf, size_t len, int usermem); | 152 | int offset, u8* buf, size_t len, int usermem); |
153 | 153 | ||
154 | /** | 154 | /** |
155 | * Dispose of a packet in the ring buffer. | 155 | * Dispose of a packet in the ring buffer. |
diff --git a/drivers/media/dvb/dvb-core/dvbdev.c b/drivers/media/dvb/dvb-core/dvbdev.c index 477b4fa56430..a4aee8665854 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.c +++ b/drivers/media/dvb/dvb-core/dvbdev.c | |||
@@ -47,7 +47,7 @@ static LIST_HEAD(dvb_adapter_list); | |||
47 | static DECLARE_MUTEX(dvbdev_register_lock); | 47 | static DECLARE_MUTEX(dvbdev_register_lock); |
48 | 48 | ||
49 | static const char * const dnames[] = { | 49 | static const char * const dnames[] = { |
50 | "video", "audio", "sec", "frontend", "demux", "dvr", "ca", | 50 | "video", "audio", "sec", "frontend", "demux", "dvr", "ca", |
51 | "net", "osd" | 51 | "net", "osd" |
52 | }; | 52 | }; |
53 | 53 | ||
@@ -90,15 +90,15 @@ static int dvb_device_open(struct inode *inode, struct file *file) | |||
90 | 90 | ||
91 | file->private_data = dvbdev; | 91 | file->private_data = dvbdev; |
92 | old_fops = file->f_op; | 92 | old_fops = file->f_op; |
93 | file->f_op = fops_get(dvbdev->fops); | 93 | file->f_op = fops_get(dvbdev->fops); |
94 | if(file->f_op->open) | 94 | if(file->f_op->open) |
95 | err = file->f_op->open(inode,file); | 95 | err = file->f_op->open(inode,file); |
96 | if (err) { | 96 | if (err) { |
97 | fops_put(file->f_op); | 97 | fops_put(file->f_op); |
98 | file->f_op = fops_get(old_fops); | 98 | file->f_op = fops_get(old_fops); |
99 | } | 99 | } |
100 | fops_put(old_fops); | 100 | fops_put(old_fops); |
101 | return err; | 101 | return err; |
102 | } | 102 | } |
103 | return -ENODEV; | 103 | return -ENODEV; |
104 | } | 104 | } |
@@ -117,21 +117,21 @@ static struct cdev dvb_device_cdev = { | |||
117 | 117 | ||
118 | int dvb_generic_open(struct inode *inode, struct file *file) | 118 | int dvb_generic_open(struct inode *inode, struct file *file) |
119 | { | 119 | { |
120 | struct dvb_device *dvbdev = file->private_data; | 120 | struct dvb_device *dvbdev = file->private_data; |
121 | 121 | ||
122 | if (!dvbdev) | 122 | if (!dvbdev) |
123 | return -ENODEV; | 123 | return -ENODEV; |
124 | 124 | ||
125 | if (!dvbdev->users) | 125 | if (!dvbdev->users) |
126 | return -EBUSY; | 126 | return -EBUSY; |
127 | 127 | ||
128 | if ((file->f_flags & O_ACCMODE) == O_RDONLY) { | 128 | if ((file->f_flags & O_ACCMODE) == O_RDONLY) { |
129 | if (!dvbdev->readers) | 129 | if (!dvbdev->readers) |
130 | return -EBUSY; | 130 | return -EBUSY; |
131 | dvbdev->readers--; | 131 | dvbdev->readers--; |
132 | } else { | 132 | } else { |
133 | if (!dvbdev->writers) | 133 | if (!dvbdev->writers) |
134 | return -EBUSY; | 134 | return -EBUSY; |
135 | dvbdev->writers--; | 135 | dvbdev->writers--; |
136 | } | 136 | } |
137 | 137 | ||
@@ -143,10 +143,10 @@ EXPORT_SYMBOL(dvb_generic_open); | |||
143 | 143 | ||
144 | int dvb_generic_release(struct inode *inode, struct file *file) | 144 | int dvb_generic_release(struct inode *inode, struct file *file) |
145 | { | 145 | { |
146 | struct dvb_device *dvbdev = file->private_data; | 146 | struct dvb_device *dvbdev = file->private_data; |
147 | 147 | ||
148 | if (!dvbdev) | 148 | if (!dvbdev) |
149 | return -ENODEV; | 149 | return -ENODEV; |
150 | 150 | ||
151 | if ((file->f_flags & O_ACCMODE) == O_RDONLY) { | 151 | if ((file->f_flags & O_ACCMODE) == O_RDONLY) { |
152 | dvbdev->readers++; | 152 | dvbdev->readers++; |
@@ -163,10 +163,10 @@ EXPORT_SYMBOL(dvb_generic_release); | |||
163 | int dvb_generic_ioctl(struct inode *inode, struct file *file, | 163 | int dvb_generic_ioctl(struct inode *inode, struct file *file, |
164 | unsigned int cmd, unsigned long arg) | 164 | unsigned int cmd, unsigned long arg) |
165 | { | 165 | { |
166 | struct dvb_device *dvbdev = file->private_data; | 166 | struct dvb_device *dvbdev = file->private_data; |
167 | 167 | ||
168 | if (!dvbdev) | 168 | if (!dvbdev) |
169 | return -ENODEV; | 169 | return -ENODEV; |
170 | 170 | ||
171 | if (!dvbdev->kernel_ioctl) | 171 | if (!dvbdev->kernel_ioctl) |
172 | return -EINVAL; | 172 | return -EINVAL; |
@@ -334,63 +334,63 @@ EXPORT_SYMBOL(dvb_unregister_adapter); | |||
334 | to the v4l "videodev.o" module, which is unnecessary for some | 334 | to the v4l "videodev.o" module, which is unnecessary for some |
335 | cards (ie. the budget dvb-cards don't need the v4l module...) */ | 335 | cards (ie. the budget dvb-cards don't need the v4l module...) */ |
336 | int dvb_usercopy(struct inode *inode, struct file *file, | 336 | int dvb_usercopy(struct inode *inode, struct file *file, |
337 | unsigned int cmd, unsigned long arg, | 337 | unsigned int cmd, unsigned long arg, |
338 | int (*func)(struct inode *inode, struct file *file, | 338 | int (*func)(struct inode *inode, struct file *file, |
339 | unsigned int cmd, void *arg)) | 339 | unsigned int cmd, void *arg)) |
340 | { | 340 | { |
341 | char sbuf[128]; | 341 | char sbuf[128]; |
342 | void *mbuf = NULL; | 342 | void *mbuf = NULL; |
343 | void *parg = NULL; | 343 | void *parg = NULL; |
344 | int err = -EINVAL; | 344 | int err = -EINVAL; |
345 | 345 | ||
346 | /* Copy arguments into temp kernel buffer */ | 346 | /* Copy arguments into temp kernel buffer */ |
347 | switch (_IOC_DIR(cmd)) { | 347 | switch (_IOC_DIR(cmd)) { |
348 | case _IOC_NONE: | 348 | case _IOC_NONE: |
349 | /* | 349 | /* |
350 | * For this command, the pointer is actually an integer | 350 | * For this command, the pointer is actually an integer |
351 | * argument. | 351 | * argument. |
352 | */ | 352 | */ |
353 | parg = (void *) arg; | 353 | parg = (void *) arg; |
354 | break; | 354 | break; |
355 | case _IOC_READ: /* some v4l ioctls are marked wrong ... */ | 355 | case _IOC_READ: /* some v4l ioctls are marked wrong ... */ |
356 | case _IOC_WRITE: | 356 | case _IOC_WRITE: |
357 | case (_IOC_WRITE | _IOC_READ): | 357 | case (_IOC_WRITE | _IOC_READ): |
358 | if (_IOC_SIZE(cmd) <= sizeof(sbuf)) { | 358 | if (_IOC_SIZE(cmd) <= sizeof(sbuf)) { |
359 | parg = sbuf; | 359 | parg = sbuf; |
360 | } else { | 360 | } else { |
361 | /* too big to allocate from stack */ | 361 | /* too big to allocate from stack */ |
362 | mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL); | 362 | mbuf = kmalloc(_IOC_SIZE(cmd),GFP_KERNEL); |
363 | if (NULL == mbuf) | 363 | if (NULL == mbuf) |
364 | return -ENOMEM; | 364 | return -ENOMEM; |
365 | parg = mbuf; | 365 | parg = mbuf; |
366 | } | 366 | } |
367 | 367 | ||
368 | err = -EFAULT; | 368 | err = -EFAULT; |
369 | if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd))) | 369 | if (copy_from_user(parg, (void __user *)arg, _IOC_SIZE(cmd))) |
370 | goto out; | 370 | goto out; |
371 | break; | 371 | break; |
372 | } | 372 | } |
373 | 373 | ||
374 | /* call driver */ | 374 | /* call driver */ |
375 | if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD) | 375 | if ((err = func(inode, file, cmd, parg)) == -ENOIOCTLCMD) |
376 | err = -EINVAL; | 376 | err = -EINVAL; |
377 | 377 | ||
378 | if (err < 0) | 378 | if (err < 0) |
379 | goto out; | 379 | goto out; |
380 | 380 | ||
381 | /* Copy results into user buffer */ | 381 | /* Copy results into user buffer */ |
382 | switch (_IOC_DIR(cmd)) | 382 | switch (_IOC_DIR(cmd)) |
383 | { | 383 | { |
384 | case _IOC_READ: | 384 | case _IOC_READ: |
385 | case (_IOC_WRITE | _IOC_READ): | 385 | case (_IOC_WRITE | _IOC_READ): |
386 | if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd))) | 386 | if (copy_to_user((void __user *)arg, parg, _IOC_SIZE(cmd))) |
387 | err = -EFAULT; | 387 | err = -EFAULT; |
388 | break; | 388 | break; |
389 | } | 389 | } |
390 | 390 | ||
391 | out: | 391 | out: |
392 | kfree(mbuf); | 392 | kfree(mbuf); |
393 | return err; | 393 | return err; |
394 | } | 394 | } |
395 | 395 | ||
396 | static int __init init_dvbdev(void) | 396 | static int __init init_dvbdev(void) |
@@ -427,10 +427,10 @@ error: | |||
427 | 427 | ||
428 | static void __exit exit_dvbdev(void) | 428 | static void __exit exit_dvbdev(void) |
429 | { | 429 | { |
430 | devfs_remove("dvb"); | 430 | devfs_remove("dvb"); |
431 | class_destroy(dvb_class); | 431 | class_destroy(dvb_class); |
432 | cdev_del(&dvb_device_cdev); | 432 | cdev_del(&dvb_device_cdev); |
433 | unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS); | 433 | unregister_chrdev_region(MKDEV(DVB_MAJOR, 0), MAX_DVB_MINORS); |
434 | } | 434 | } |
435 | 435 | ||
436 | module_init(init_dvbdev); | 436 | module_init(init_dvbdev); |
diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h index a251867f30f1..0cc6e4a0e27c 100644 --- a/drivers/media/dvb/dvb-core/dvbdev.h +++ b/drivers/media/dvb/dvb-core/dvbdev.h | |||
@@ -68,8 +68,8 @@ struct dvb_device { | |||
68 | int writers; | 68 | int writers; |
69 | int users; | 69 | int users; |
70 | 70 | ||
71 | /* don't really need those !? -- FIXME: use video_usercopy */ | 71 | /* don't really need those !? -- FIXME: use video_usercopy */ |
72 | int (*kernel_ioctl)(struct inode *inode, struct file *file, | 72 | int (*kernel_ioctl)(struct inode *inode, struct file *file, |
73 | unsigned int cmd, void *arg); | 73 | unsigned int cmd, void *arg); |
74 | 74 | ||
75 | void *priv; | 75 | void *priv; |
@@ -97,7 +97,7 @@ we simply define out own dvb_usercopy(), which will hopefully become | |||
97 | generic_usercopy() someday... */ | 97 | generic_usercopy() someday... */ |
98 | 98 | ||
99 | extern int dvb_usercopy(struct inode *inode, struct file *file, | 99 | extern int dvb_usercopy(struct inode *inode, struct file *file, |
100 | unsigned int cmd, unsigned long arg, | 100 | unsigned int cmd, unsigned long arg, |
101 | int (*func)(struct inode *inode, struct file *file, | 101 | int (*func)(struct inode *inode, struct file *file, |
102 | unsigned int cmd, void *arg)); | 102 | unsigned int cmd, void *arg)); |
103 | 103 | ||
diff --git a/drivers/media/dvb/dvb-usb/vp702x-fe.c b/drivers/media/dvb/dvb-usb/vp702x-fe.c index f20d8dbd0be8..104b5d016c7b 100644 --- a/drivers/media/dvb/dvb-usb/vp702x-fe.c +++ b/drivers/media/dvb/dvb-usb/vp702x-fe.c | |||
@@ -190,7 +190,7 @@ static int vp702x_fe_get_frontend(struct dvb_frontend* fe, | |||
190 | } | 190 | } |
191 | 191 | ||
192 | static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe, | 192 | static int vp702x_fe_send_diseqc_msg (struct dvb_frontend* fe, |
193 | struct dvb_diseqc_master_cmd *m) | 193 | struct dvb_diseqc_master_cmd *m) |
194 | { | 194 | { |
195 | struct vp702x_fe_state *st = fe->demodulator_priv; | 195 | struct vp702x_fe_state *st = fe->demodulator_priv; |
196 | u8 cmd[8],ibuf[10]; | 196 | u8 cmd[8],ibuf[10]; |
diff --git a/drivers/media/dvb/dvb-usb/vp7045-fe.c b/drivers/media/dvb/dvb-usb/vp7045-fe.c index 2746edfeccba..83f1de1e7e57 100644 --- a/drivers/media/dvb/dvb-usb/vp7045-fe.c +++ b/drivers/media/dvb/dvb-usb/vp7045-fe.c | |||
@@ -58,7 +58,7 @@ static int vp7045_fe_read_ber(struct dvb_frontend* fe, u32 *ber) | |||
58 | struct vp7045_fe_state *state = fe->demodulator_priv; | 58 | struct vp7045_fe_state *state = fe->demodulator_priv; |
59 | *ber = (vp7045_read_reg(state->d, 0x0D) << 16) | | 59 | *ber = (vp7045_read_reg(state->d, 0x0D) << 16) | |
60 | (vp7045_read_reg(state->d, 0x0E) << 8) | | 60 | (vp7045_read_reg(state->d, 0x0E) << 8) | |
61 | vp7045_read_reg(state->d, 0x0F); | 61 | vp7045_read_reg(state->d, 0x0F); |
62 | return 0; | 62 | return 0; |
63 | } | 63 | } |
64 | 64 | ||
diff --git a/drivers/media/dvb/frontends/at76c651.c b/drivers/media/dvb/frontends/at76c651.c index 72a2b5455b0b..8e0f4b3a1417 100644 --- a/drivers/media/dvb/frontends/at76c651.c +++ b/drivers/media/dvb/frontends/at76c651.c | |||
@@ -361,9 +361,9 @@ static int at76c651_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) | |||
361 | 361 | ||
362 | static int at76c651_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *fesettings) | 362 | static int at76c651_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings *fesettings) |
363 | { | 363 | { |
364 | fesettings->min_delay_ms = 50; | 364 | fesettings->min_delay_ms = 50; |
365 | fesettings->step_size = 0; | 365 | fesettings->step_size = 0; |
366 | fesettings->max_drift = 0; | 366 | fesettings->max_drift = 0; |
367 | return 0; | 367 | return 0; |
368 | } | 368 | } |
369 | 369 | ||
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c index f6d4ee78bdd4..8ceb9a33c7af 100644 --- a/drivers/media/dvb/frontends/bcm3510.c +++ b/drivers/media/dvb/frontends/bcm3510.c | |||
@@ -69,7 +69,7 @@ MODULE_PARM_DESC(debug, "set debugging level (1=info,2=i2c (|-able))."); | |||
69 | #define dbufout(b,l,m) {\ | 69 | #define dbufout(b,l,m) {\ |
70 | int i; \ | 70 | int i; \ |
71 | for (i = 0; i < l; i++) \ | 71 | for (i = 0; i < l; i++) \ |
72 | m("%02x ",b[i]); \ | 72 | m("%02x ",b[i]); \ |
73 | } | 73 | } |
74 | #define deb_info(args...) dprintk(0x01,args) | 74 | #define deb_info(args...) dprintk(0x01,args) |
75 | #define deb_i2c(args...) dprintk(0x02,args) | 75 | #define deb_i2c(args...) dprintk(0x02,args) |
@@ -827,7 +827,7 @@ static struct dvb_frontend_ops bcm3510_ops = { | |||
827 | .type = FE_ATSC, | 827 | .type = FE_ATSC, |
828 | .frequency_min = 54000000, | 828 | .frequency_min = 54000000, |
829 | .frequency_max = 803000000, | 829 | .frequency_max = 803000000, |
830 | /* stepsize is just a guess */ | 830 | /* stepsize is just a guess */ |
831 | .frequency_stepsize = 0, | 831 | .frequency_stepsize = 0, |
832 | .caps = | 832 | .caps = |
833 | FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | | 833 | FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | |
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c index 0c2ed4438618..755f774f6b7d 100644 --- a/drivers/media/dvb/frontends/cx22700.c +++ b/drivers/media/dvb/frontends/cx22700.c | |||
@@ -355,10 +355,10 @@ static int cx22700_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
355 | 355 | ||
356 | static int cx22700_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings) | 356 | static int cx22700_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings) |
357 | { | 357 | { |
358 | fesettings->min_delay_ms = 150; | 358 | fesettings->min_delay_ms = 150; |
359 | fesettings->step_size = 166667; | 359 | fesettings->step_size = 166667; |
360 | fesettings->max_drift = 166667*2; | 360 | fesettings->max_drift = 166667*2; |
361 | return 0; | 361 | return 0; |
362 | } | 362 | } |
363 | 363 | ||
364 | static void cx22700_release(struct dvb_frontend* fe) | 364 | static void cx22700_release(struct dvb_frontend* fe) |
@@ -407,7 +407,7 @@ static struct dvb_frontend_ops cx22700_ops = { | |||
407 | .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | | 407 | .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | |
408 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO | | 408 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO | |
409 | FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | | 409 | FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | |
410 | FE_CAN_RECOVER | 410 | FE_CAN_RECOVER |
411 | }, | 411 | }, |
412 | 412 | ||
413 | .release = cx22700_release, | 413 | .release = cx22700_release, |
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c index d9a8ede14b45..5de0e6d350b1 100644 --- a/drivers/media/dvb/frontends/cx22702.c +++ b/drivers/media/dvb/frontends/cx22702.c | |||
@@ -2,7 +2,7 @@ | |||
2 | Conexant 22702 DVB OFDM demodulator driver | 2 | Conexant 22702 DVB OFDM demodulator driver |
3 | 3 | ||
4 | based on: | 4 | based on: |
5 | Alps TDMB7 DVB OFDM demodulator driver | 5 | Alps TDMB7 DVB OFDM demodulator driver |
6 | 6 | ||
7 | Copyright (C) 2001-2002 Convergence Integrated Media GmbH | 7 | Copyright (C) 2001-2002 Convergence Integrated Media GmbH |
8 | Holger Waechtler <holger@convergence.de> | 8 | Holger Waechtler <holger@convergence.de> |
diff --git a/drivers/media/dvb/frontends/cx22702.h b/drivers/media/dvb/frontends/cx22702.h index 1f250885d2ce..5633976a58f1 100644 --- a/drivers/media/dvb/frontends/cx22702.h +++ b/drivers/media/dvb/frontends/cx22702.h | |||
@@ -2,7 +2,7 @@ | |||
2 | Conexant 22702 DVB OFDM demodulator driver | 2 | Conexant 22702 DVB OFDM demodulator driver |
3 | 3 | ||
4 | based on: | 4 | based on: |
5 | Alps TDMB7 DVB OFDM demodulator driver | 5 | Alps TDMB7 DVB OFDM demodulator driver |
6 | 6 | ||
7 | Copyright (C) 2001-2002 Convergence Integrated Media GmbH | 7 | Copyright (C) 2001-2002 Convergence Integrated Media GmbH |
8 | Holger Waechtler <holger@convergence.de> | 8 | Holger Waechtler <holger@convergence.de> |
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c index 654d7dc879d9..0c4db80ec332 100644 --- a/drivers/media/dvb/frontends/cx24110.c +++ b/drivers/media/dvb/frontends/cx24110.c | |||
@@ -55,81 +55,81 @@ static int debug; | |||
55 | } while (0) | 55 | } while (0) |
56 | 56 | ||
57 | static struct {u8 reg; u8 data;} cx24110_regdata[]= | 57 | static struct {u8 reg; u8 data;} cx24110_regdata[]= |
58 | /* Comments beginning with @ denote this value should | 58 | /* Comments beginning with @ denote this value should |
59 | be the default */ | 59 | be the default */ |
60 | {{0x09,0x01}, /* SoftResetAll */ | 60 | {{0x09,0x01}, /* SoftResetAll */ |
61 | {0x09,0x00}, /* release reset */ | 61 | {0x09,0x00}, /* release reset */ |
62 | {0x01,0xe8}, /* MSB of code rate 27.5MS/s */ | 62 | {0x01,0xe8}, /* MSB of code rate 27.5MS/s */ |
63 | {0x02,0x17}, /* middle byte " */ | 63 | {0x02,0x17}, /* middle byte " */ |
64 | {0x03,0x29}, /* LSB " */ | 64 | {0x03,0x29}, /* LSB " */ |
65 | {0x05,0x03}, /* @ DVB mode, standard code rate 3/4 */ | 65 | {0x05,0x03}, /* @ DVB mode, standard code rate 3/4 */ |
66 | {0x06,0xa5}, /* @ PLL 60MHz */ | 66 | {0x06,0xa5}, /* @ PLL 60MHz */ |
67 | {0x07,0x01}, /* @ Fclk, i.e. sampling clock, 60MHz */ | 67 | {0x07,0x01}, /* @ Fclk, i.e. sampling clock, 60MHz */ |
68 | {0x0a,0x00}, /* @ partial chip disables, do not set */ | 68 | {0x0a,0x00}, /* @ partial chip disables, do not set */ |
69 | {0x0b,0x01}, /* set output clock in gapped mode, start signal low | 69 | {0x0b,0x01}, /* set output clock in gapped mode, start signal low |
70 | active for first byte */ | 70 | active for first byte */ |
71 | {0x0c,0x11}, /* no parity bytes, large hold time, serial data out */ | 71 | {0x0c,0x11}, /* no parity bytes, large hold time, serial data out */ |
72 | {0x0d,0x6f}, /* @ RS Sync/Unsync thresholds */ | 72 | {0x0d,0x6f}, /* @ RS Sync/Unsync thresholds */ |
73 | {0x10,0x40}, /* chip doc is misleading here: write bit 6 as 1 | 73 | {0x10,0x40}, /* chip doc is misleading here: write bit 6 as 1 |
74 | to avoid starting the BER counter. Reset the | 74 | to avoid starting the BER counter. Reset the |
75 | CRC test bit. Finite counting selected */ | 75 | CRC test bit. Finite counting selected */ |
76 | {0x15,0xff}, /* @ size of the limited time window for RS BER | 76 | {0x15,0xff}, /* @ size of the limited time window for RS BER |
77 | estimation. It is <value>*256 RS blocks, this | 77 | estimation. It is <value>*256 RS blocks, this |
78 | gives approx. 2.6 sec at 27.5MS/s, rate 3/4 */ | 78 | gives approx. 2.6 sec at 27.5MS/s, rate 3/4 */ |
79 | {0x16,0x00}, /* @ enable all RS output ports */ | 79 | {0x16,0x00}, /* @ enable all RS output ports */ |
80 | {0x17,0x04}, /* @ time window allowed for the RS to sync */ | 80 | {0x17,0x04}, /* @ time window allowed for the RS to sync */ |
81 | {0x18,0xae}, /* @ allow all standard DVB code rates to be scanned | 81 | {0x18,0xae}, /* @ allow all standard DVB code rates to be scanned |
82 | for automatically */ | 82 | for automatically */ |
83 | /* leave the current code rate and normalization | 83 | /* leave the current code rate and normalization |
84 | registers as they are after reset... */ | 84 | registers as they are after reset... */ |
85 | {0x21,0x10}, /* @ during AutoAcq, search each viterbi setting | 85 | {0x21,0x10}, /* @ during AutoAcq, search each viterbi setting |
86 | only once */ | 86 | only once */ |
87 | {0x23,0x18}, /* @ size of the limited time window for Viterbi BER | 87 | {0x23,0x18}, /* @ size of the limited time window for Viterbi BER |
88 | estimation. It is <value>*65536 channel bits, i.e. | 88 | estimation. It is <value>*65536 channel bits, i.e. |
89 | approx. 38ms at 27.5MS/s, rate 3/4 */ | 89 | approx. 38ms at 27.5MS/s, rate 3/4 */ |
90 | {0x24,0x24}, /* do not trigger Viterbi CRC test. Finite count window */ | 90 | {0x24,0x24}, /* do not trigger Viterbi CRC test. Finite count window */ |
91 | /* leave front-end AGC parameters at default values */ | 91 | /* leave front-end AGC parameters at default values */ |
92 | /* leave decimation AGC parameters at default values */ | 92 | /* leave decimation AGC parameters at default values */ |
93 | {0x35,0x40}, /* disable all interrupts. They are not connected anyway */ | 93 | {0x35,0x40}, /* disable all interrupts. They are not connected anyway */ |
94 | {0x36,0xff}, /* clear all interrupt pending flags */ | 94 | {0x36,0xff}, /* clear all interrupt pending flags */ |
95 | {0x37,0x00}, /* @ fully enable AutoAcqq state machine */ | 95 | {0x37,0x00}, /* @ fully enable AutoAcqq state machine */ |
96 | {0x38,0x07}, /* @ enable fade recovery, but not autostart AutoAcq */ | 96 | {0x38,0x07}, /* @ enable fade recovery, but not autostart AutoAcq */ |
97 | /* leave the equalizer parameters on their default values */ | 97 | /* leave the equalizer parameters on their default values */ |
98 | /* leave the final AGC parameters on their default values */ | 98 | /* leave the final AGC parameters on their default values */ |
99 | {0x41,0x00}, /* @ MSB of front-end derotator frequency */ | 99 | {0x41,0x00}, /* @ MSB of front-end derotator frequency */ |
100 | {0x42,0x00}, /* @ middle bytes " */ | 100 | {0x42,0x00}, /* @ middle bytes " */ |
101 | {0x43,0x00}, /* @ LSB " */ | 101 | {0x43,0x00}, /* @ LSB " */ |
102 | /* leave the carrier tracking loop parameters on default */ | 102 | /* leave the carrier tracking loop parameters on default */ |
103 | /* leave the bit timing loop parameters at gefault */ | 103 | /* leave the bit timing loop parameters at gefault */ |
104 | {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */ | 104 | {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */ |
105 | /* the cx24108 data sheet for symbol rates above 15MS/s */ | 105 | /* the cx24108 data sheet for symbol rates above 15MS/s */ |
106 | {0x57,0x00}, /* @ Filter sigma delta enabled, positive */ | 106 | {0x57,0x00}, /* @ Filter sigma delta enabled, positive */ |
107 | {0x61,0x95}, /* GPIO pins 1-4 have special function */ | 107 | {0x61,0x95}, /* GPIO pins 1-4 have special function */ |
108 | {0x62,0x05}, /* GPIO pin 5 has special function, pin 6 is GPIO */ | 108 | {0x62,0x05}, /* GPIO pin 5 has special function, pin 6 is GPIO */ |
109 | {0x63,0x00}, /* All GPIO pins use CMOS output characteristics */ | 109 | {0x63,0x00}, /* All GPIO pins use CMOS output characteristics */ |
110 | {0x64,0x20}, /* GPIO 6 is input, all others are outputs */ | 110 | {0x64,0x20}, /* GPIO 6 is input, all others are outputs */ |
111 | {0x6d,0x30}, /* tuner auto mode clock freq 62kHz */ | 111 | {0x6d,0x30}, /* tuner auto mode clock freq 62kHz */ |
112 | {0x70,0x15}, /* use auto mode, tuner word is 21 bits long */ | 112 | {0x70,0x15}, /* use auto mode, tuner word is 21 bits long */ |
113 | {0x73,0x00}, /* @ disable several demod bypasses */ | 113 | {0x73,0x00}, /* @ disable several demod bypasses */ |
114 | {0x74,0x00}, /* @ " */ | 114 | {0x74,0x00}, /* @ " */ |
115 | {0x75,0x00} /* @ " */ | 115 | {0x75,0x00} /* @ " */ |
116 | /* the remaining registers are for SEC */ | 116 | /* the remaining registers are for SEC */ |
117 | }; | 117 | }; |
118 | 118 | ||
119 | 119 | ||
120 | static int cx24110_writereg (struct cx24110_state* state, int reg, int data) | 120 | static int cx24110_writereg (struct cx24110_state* state, int reg, int data) |
121 | { | 121 | { |
122 | u8 buf [] = { reg, data }; | 122 | u8 buf [] = { reg, data }; |
123 | struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 }; | 123 | struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 }; |
124 | int err; | 124 | int err; |
125 | 125 | ||
126 | if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) { | 126 | if ((err = i2c_transfer(state->i2c, &msg, 1)) != 1) { |
127 | dprintk ("%s: writereg error (err == %i, reg == 0x%02x," | 127 | dprintk ("%s: writereg error (err == %i, reg == 0x%02x," |
128 | " data == 0x%02x)\n", __FUNCTION__, err, reg, data); | 128 | " data == 0x%02x)\n", __FUNCTION__, err, reg, data); |
129 | return -EREMOTEIO; | 129 | return -EREMOTEIO; |
130 | } | 130 | } |
131 | 131 | ||
132 | return 0; | 132 | return 0; |
133 | } | 133 | } |
134 | 134 | ||
135 | static int cx24110_readreg (struct cx24110_state* state, u8 reg) | 135 | static int cx24110_readreg (struct cx24110_state* state, u8 reg) |
@@ -153,27 +153,27 @@ static int cx24110_set_inversion (struct cx24110_state* state, fe_spectral_inver | |||
153 | 153 | ||
154 | switch (inversion) { | 154 | switch (inversion) { |
155 | case INVERSION_OFF: | 155 | case INVERSION_OFF: |
156 | cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1); | 156 | cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1); |
157 | /* AcqSpectrInvDis on. No idea why someone should want this */ | 157 | /* AcqSpectrInvDis on. No idea why someone should want this */ |
158 | cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)&0xf7); | 158 | cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)&0xf7); |
159 | /* Initial value 0 at start of acq */ | 159 | /* Initial value 0 at start of acq */ |
160 | cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)&0xef); | 160 | cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)&0xef); |
161 | /* current value 0 */ | 161 | /* current value 0 */ |
162 | /* The cx24110 manual tells us this reg is read-only. | 162 | /* The cx24110 manual tells us this reg is read-only. |
163 | But what the heck... set it ayways */ | 163 | But what the heck... set it ayways */ |
164 | break; | 164 | break; |
165 | case INVERSION_ON: | 165 | case INVERSION_ON: |
166 | cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1); | 166 | cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x1); |
167 | /* AcqSpectrInvDis on. No idea why someone should want this */ | 167 | /* AcqSpectrInvDis on. No idea why someone should want this */ |
168 | cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)|0x08); | 168 | cx24110_writereg(state,0x5,cx24110_readreg(state,0x5)|0x08); |
169 | /* Initial value 1 at start of acq */ | 169 | /* Initial value 1 at start of acq */ |
170 | cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)|0x10); | 170 | cx24110_writereg(state,0x22,cx24110_readreg(state,0x22)|0x10); |
171 | /* current value 1 */ | 171 | /* current value 1 */ |
172 | break; | 172 | break; |
173 | case INVERSION_AUTO: | 173 | case INVERSION_AUTO: |
174 | cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xfe); | 174 | cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xfe); |
175 | /* AcqSpectrInvDis off. Leave initial & current states as is */ | 175 | /* AcqSpectrInvDis off. Leave initial & current states as is */ |
176 | break; | 176 | break; |
177 | default: | 177 | default: |
178 | return -EINVAL; | 178 | return -EINVAL; |
179 | } | 179 | } |
@@ -185,18 +185,18 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec) | |||
185 | { | 185 | { |
186 | /* fixme (low): error handling */ | 186 | /* fixme (low): error handling */ |
187 | 187 | ||
188 | static const int rate[]={-1,1,2,3,5,7,-1}; | 188 | static const int rate[]={-1,1,2,3,5,7,-1}; |
189 | static const int g1[]={-1,0x01,0x02,0x05,0x15,0x45,-1}; | 189 | static const int g1[]={-1,0x01,0x02,0x05,0x15,0x45,-1}; |
190 | static const int g2[]={-1,0x01,0x03,0x06,0x1a,0x7a,-1}; | 190 | static const int g2[]={-1,0x01,0x03,0x06,0x1a,0x7a,-1}; |
191 | 191 | ||
192 | /* Well, the AutoAcq engine of the cx24106 and 24110 automatically | 192 | /* Well, the AutoAcq engine of the cx24106 and 24110 automatically |
193 | searches all enabled viterbi rates, and can handle non-standard | 193 | searches all enabled viterbi rates, and can handle non-standard |
194 | rates as well. */ | 194 | rates as well. */ |
195 | 195 | ||
196 | if (fec>FEC_AUTO) | 196 | if (fec>FEC_AUTO) |
197 | fec=FEC_AUTO; | 197 | fec=FEC_AUTO; |
198 | 198 | ||
199 | if (fec==FEC_AUTO) { /* (re-)establish AutoAcq behaviour */ | 199 | if (fec==FEC_AUTO) { /* (re-)establish AutoAcq behaviour */ |
200 | cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xdf); | 200 | cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)&0xdf); |
201 | /* clear AcqVitDis bit */ | 201 | /* clear AcqVitDis bit */ |
202 | cx24110_writereg(state,0x18,0xae); | 202 | cx24110_writereg(state,0x18,0xae); |
@@ -208,7 +208,7 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec) | |||
208 | cx24110_writereg(state,0x1a,0x05); cx24110_writereg(state,0x1b,0x06); | 208 | cx24110_writereg(state,0x1a,0x05); cx24110_writereg(state,0x1b,0x06); |
209 | /* set the puncture registers for code rate 3/4 */ | 209 | /* set the puncture registers for code rate 3/4 */ |
210 | return 0; | 210 | return 0; |
211 | } else { | 211 | } else { |
212 | cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x20); | 212 | cx24110_writereg(state,0x37,cx24110_readreg(state,0x37)|0x20); |
213 | /* set AcqVitDis bit */ | 213 | /* set AcqVitDis bit */ |
214 | if(rate[fec]>0) { | 214 | if(rate[fec]>0) { |
@@ -219,10 +219,10 @@ static int cx24110_set_fec (struct cx24110_state* state, fe_code_rate_t fec) | |||
219 | cx24110_writereg(state,0x1a,g1[fec]); | 219 | cx24110_writereg(state,0x1a,g1[fec]); |
220 | cx24110_writereg(state,0x1b,g2[fec]); | 220 | cx24110_writereg(state,0x1b,g2[fec]); |
221 | /* not sure if this is the right way: I always used AutoAcq mode */ | 221 | /* not sure if this is the right way: I always used AutoAcq mode */ |
222 | } else | 222 | } else |
223 | return -EOPNOTSUPP; | 223 | return -EOPNOTSUPP; |
224 | /* fixme (low): which is the correct return code? */ | 224 | /* fixme (low): which is the correct return code? */ |
225 | }; | 225 | }; |
226 | return 0; | 226 | return 0; |
227 | } | 227 | } |
228 | 228 | ||
@@ -245,72 +245,72 @@ static fe_code_rate_t cx24110_get_fec (struct cx24110_state* state) | |||
245 | static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate) | 245 | static int cx24110_set_symbolrate (struct cx24110_state* state, u32 srate) |
246 | { | 246 | { |
247 | /* fixme (low): add error handling */ | 247 | /* fixme (low): add error handling */ |
248 | u32 ratio; | 248 | u32 ratio; |
249 | u32 tmp, fclk, BDRI; | 249 | u32 tmp, fclk, BDRI; |
250 | 250 | ||
251 | static const u32 bands[]={5000000UL,15000000UL,90999000UL/2}; | 251 | static const u32 bands[]={5000000UL,15000000UL,90999000UL/2}; |
252 | int i; | 252 | int i; |
253 | 253 | ||
254 | dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate); | 254 | dprintk("cx24110 debug: entering %s(%d)\n",__FUNCTION__,srate); |
255 | if (srate>90999000UL/2) | 255 | if (srate>90999000UL/2) |
256 | srate=90999000UL/2; | 256 | srate=90999000UL/2; |
257 | if (srate<500000) | 257 | if (srate<500000) |
258 | srate=500000; | 258 | srate=500000; |
259 | 259 | ||
260 | for(i=0;(i<sizeof(bands)/sizeof(bands[0]))&&(srate>bands[i]);i++) | 260 | for(i=0;(i<sizeof(bands)/sizeof(bands[0]))&&(srate>bands[i]);i++) |
261 | ; | 261 | ; |
262 | /* first, check which sample rate is appropriate: 45, 60 80 or 90 MHz, | 262 | /* first, check which sample rate is appropriate: 45, 60 80 or 90 MHz, |
263 | and set the PLL accordingly (R07[1:0] Fclk, R06[7:4] PLLmult, | 263 | and set the PLL accordingly (R07[1:0] Fclk, R06[7:4] PLLmult, |
264 | R06[3:0] PLLphaseDetGain */ | 264 | R06[3:0] PLLphaseDetGain */ |
265 | tmp=cx24110_readreg(state,0x07)&0xfc; | 265 | tmp=cx24110_readreg(state,0x07)&0xfc; |
266 | if(srate<90999000UL/4) { /* sample rate 45MHz*/ | 266 | if(srate<90999000UL/4) { /* sample rate 45MHz*/ |
267 | cx24110_writereg(state,0x07,tmp); | 267 | cx24110_writereg(state,0x07,tmp); |
268 | cx24110_writereg(state,0x06,0x78); | 268 | cx24110_writereg(state,0x06,0x78); |
269 | fclk=90999000UL/2; | 269 | fclk=90999000UL/2; |
270 | } else if(srate<60666000UL/2) { /* sample rate 60MHz */ | 270 | } else if(srate<60666000UL/2) { /* sample rate 60MHz */ |
271 | cx24110_writereg(state,0x07,tmp|0x1); | 271 | cx24110_writereg(state,0x07,tmp|0x1); |
272 | cx24110_writereg(state,0x06,0xa5); | 272 | cx24110_writereg(state,0x06,0xa5); |
273 | fclk=60666000UL; | 273 | fclk=60666000UL; |
274 | } else if(srate<80888000UL/2) { /* sample rate 80MHz */ | 274 | } else if(srate<80888000UL/2) { /* sample rate 80MHz */ |
275 | cx24110_writereg(state,0x07,tmp|0x2); | 275 | cx24110_writereg(state,0x07,tmp|0x2); |
276 | cx24110_writereg(state,0x06,0x87); | 276 | cx24110_writereg(state,0x06,0x87); |
277 | fclk=80888000UL; | 277 | fclk=80888000UL; |
278 | } else { /* sample rate 90MHz */ | 278 | } else { /* sample rate 90MHz */ |
279 | cx24110_writereg(state,0x07,tmp|0x3); | 279 | cx24110_writereg(state,0x07,tmp|0x3); |
280 | cx24110_writereg(state,0x06,0x78); | 280 | cx24110_writereg(state,0x06,0x78); |
281 | fclk=90999000UL; | 281 | fclk=90999000UL; |
282 | }; | 282 | }; |
283 | dprintk("cx24110 debug: fclk %d Hz\n",fclk); | 283 | dprintk("cx24110 debug: fclk %d Hz\n",fclk); |
284 | /* we need to divide two integers with approx. 27 bits in 32 bit | 284 | /* we need to divide two integers with approx. 27 bits in 32 bit |
285 | arithmetic giving a 25 bit result */ | 285 | arithmetic giving a 25 bit result */ |
286 | /* the maximum dividend is 90999000/2, 0x02b6446c, this number is | 286 | /* the maximum dividend is 90999000/2, 0x02b6446c, this number is |
287 | also the most complex divisor. Hence, the dividend has, | 287 | also the most complex divisor. Hence, the dividend has, |
288 | assuming 32bit unsigned arithmetic, 6 clear bits on top, the | 288 | assuming 32bit unsigned arithmetic, 6 clear bits on top, the |
289 | divisor 2 unused bits at the bottom. Also, the quotient is | 289 | divisor 2 unused bits at the bottom. Also, the quotient is |
290 | always less than 1/2. Borrowed from VES1893.c, of course */ | 290 | always less than 1/2. Borrowed from VES1893.c, of course */ |
291 | 291 | ||
292 | tmp=srate<<6; | 292 | tmp=srate<<6; |
293 | BDRI=fclk>>2; | 293 | BDRI=fclk>>2; |
294 | ratio=(tmp/BDRI); | 294 | ratio=(tmp/BDRI); |
295 | 295 | ||
296 | tmp=(tmp%BDRI)<<8; | 296 | tmp=(tmp%BDRI)<<8; |
297 | ratio=(ratio<<8)+(tmp/BDRI); | 297 | ratio=(ratio<<8)+(tmp/BDRI); |
298 | 298 | ||
299 | tmp=(tmp%BDRI)<<8; | 299 | tmp=(tmp%BDRI)<<8; |
300 | ratio=(ratio<<8)+(tmp/BDRI); | 300 | ratio=(ratio<<8)+(tmp/BDRI); |
301 | 301 | ||
302 | tmp=(tmp%BDRI)<<1; | 302 | tmp=(tmp%BDRI)<<1; |
303 | ratio=(ratio<<1)+(tmp/BDRI); | 303 | ratio=(ratio<<1)+(tmp/BDRI); |
304 | 304 | ||
305 | dprintk("srate= %d (range %d, up to %d)\n", srate,i,bands[i]); | 305 | dprintk("srate= %d (range %d, up to %d)\n", srate,i,bands[i]); |
306 | dprintk("fclk = %d\n", fclk); | 306 | dprintk("fclk = %d\n", fclk); |
307 | dprintk("ratio= %08x\n", ratio); | 307 | dprintk("ratio= %08x\n", ratio); |
308 | 308 | ||
309 | cx24110_writereg(state, 0x1, (ratio>>16)&0xff); | 309 | cx24110_writereg(state, 0x1, (ratio>>16)&0xff); |
310 | cx24110_writereg(state, 0x2, (ratio>>8)&0xff); | 310 | cx24110_writereg(state, 0x2, (ratio>>8)&0xff); |
311 | cx24110_writereg(state, 0x3, (ratio)&0xff); | 311 | cx24110_writereg(state, 0x3, (ratio)&0xff); |
312 | 312 | ||
313 | return 0; | 313 | return 0; |
314 | 314 | ||
315 | } | 315 | } |
316 | 316 | ||
@@ -324,48 +324,48 @@ int cx24110_pll_write (struct dvb_frontend* fe, u32 data) | |||
324 | 324 | ||
325 | dprintk("cx24110 debug: cx24108_write(%8.8x)\n",data); | 325 | dprintk("cx24110 debug: cx24108_write(%8.8x)\n",data); |
326 | 326 | ||
327 | cx24110_writereg(state,0x6d,0x30); /* auto mode at 62kHz */ | 327 | cx24110_writereg(state,0x6d,0x30); /* auto mode at 62kHz */ |
328 | cx24110_writereg(state,0x70,0x15); /* auto mode 21 bits */ | 328 | cx24110_writereg(state,0x70,0x15); /* auto mode 21 bits */ |
329 | 329 | ||
330 | /* if the auto tuner writer is still busy, clear it out */ | 330 | /* if the auto tuner writer is still busy, clear it out */ |
331 | while (cx24110_readreg(state,0x6d)&0x80) | 331 | while (cx24110_readreg(state,0x6d)&0x80) |
332 | cx24110_writereg(state,0x72,0); | 332 | cx24110_writereg(state,0x72,0); |
333 | 333 | ||
334 | /* write the topmost 8 bits */ | 334 | /* write the topmost 8 bits */ |
335 | cx24110_writereg(state,0x72,(data>>24)&0xff); | 335 | cx24110_writereg(state,0x72,(data>>24)&0xff); |
336 | 336 | ||
337 | /* wait for the send to be completed */ | 337 | /* wait for the send to be completed */ |
338 | while ((cx24110_readreg(state,0x6d)&0xc0)==0x80) | 338 | while ((cx24110_readreg(state,0x6d)&0xc0)==0x80) |
339 | ; | 339 | ; |
340 | 340 | ||
341 | /* send another 8 bytes */ | 341 | /* send another 8 bytes */ |
342 | cx24110_writereg(state,0x72,(data>>16)&0xff); | 342 | cx24110_writereg(state,0x72,(data>>16)&0xff); |
343 | while ((cx24110_readreg(state,0x6d)&0xc0)==0x80) | 343 | while ((cx24110_readreg(state,0x6d)&0xc0)==0x80) |
344 | ; | 344 | ; |
345 | 345 | ||
346 | /* and the topmost 5 bits of this byte */ | 346 | /* and the topmost 5 bits of this byte */ |
347 | cx24110_writereg(state,0x72,(data>>8)&0xff); | 347 | cx24110_writereg(state,0x72,(data>>8)&0xff); |
348 | while ((cx24110_readreg(state,0x6d)&0xc0)==0x80) | 348 | while ((cx24110_readreg(state,0x6d)&0xc0)==0x80) |
349 | ; | 349 | ; |
350 | 350 | ||
351 | /* now strobe the enable line once */ | 351 | /* now strobe the enable line once */ |
352 | cx24110_writereg(state,0x6d,0x32); | 352 | cx24110_writereg(state,0x6d,0x32); |
353 | cx24110_writereg(state,0x6d,0x30); | 353 | cx24110_writereg(state,0x6d,0x30); |
354 | 354 | ||
355 | return 0; | 355 | return 0; |
356 | } | 356 | } |
357 | 357 | ||
358 | static int cx24110_initfe(struct dvb_frontend* fe) | 358 | static int cx24110_initfe(struct dvb_frontend* fe) |
359 | { | 359 | { |
360 | struct cx24110_state *state = fe->demodulator_priv; | 360 | struct cx24110_state *state = fe->demodulator_priv; |
361 | /* fixme (low): error handling */ | 361 | /* fixme (low): error handling */ |
362 | int i; | 362 | int i; |
363 | 363 | ||
364 | dprintk("%s: init chip\n", __FUNCTION__); | 364 | dprintk("%s: init chip\n", __FUNCTION__); |
365 | 365 | ||
366 | for(i=0;i<sizeof(cx24110_regdata)/sizeof(cx24110_regdata[0]);i++) { | 366 | for(i=0;i<sizeof(cx24110_regdata)/sizeof(cx24110_regdata[0]);i++) { |
367 | cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data); | 367 | cx24110_writereg(state, cx24110_regdata[i].reg, cx24110_regdata[i].data); |
368 | }; | 368 | }; |
369 | 369 | ||
370 | if (state->config->pll_init) state->config->pll_init(fe); | 370 | if (state->config->pll_init) state->config->pll_init(fe); |
371 | 371 | ||
diff --git a/drivers/media/dvb/frontends/l64781.c b/drivers/media/dvb/frontends/l64781.c index 19b4bf7c21a7..1c7c91224472 100644 --- a/drivers/media/dvb/frontends/l64781.c +++ b/drivers/media/dvb/frontends/l64781.c | |||
@@ -2,7 +2,7 @@ | |||
2 | driver for LSI L64781 COFDM demodulator | 2 | driver for LSI L64781 COFDM demodulator |
3 | 3 | ||
4 | Copyright (C) 2001 Holger Waechtler for Convergence Integrated Media GmbH | 4 | Copyright (C) 2001 Holger Waechtler for Convergence Integrated Media GmbH |
5 | Marko Kohtala <marko.kohtala@luukku.com> | 5 | Marko Kohtala <marko.kohtala@luukku.com> |
6 | 6 | ||
7 | This program is free software; you can redistribute it and/or modify | 7 | This program is free software; you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
@@ -433,7 +433,7 @@ static int l64781_init(struct dvb_frontend* fe) | |||
433 | { | 433 | { |
434 | struct l64781_state* state = fe->demodulator_priv; | 434 | struct l64781_state* state = fe->demodulator_priv; |
435 | 435 | ||
436 | reset_and_configure (state); | 436 | reset_and_configure (state); |
437 | 437 | ||
438 | /* Power up */ | 438 | /* Power up */ |
439 | l64781_writereg (state, 0x3e, 0xa5); | 439 | l64781_writereg (state, 0x3e, 0xa5); |
@@ -456,9 +456,9 @@ static int l64781_init(struct dvb_frontend* fe) | |||
456 | l64781_writereg (state, 0x0d, 0x8c); | 456 | l64781_writereg (state, 0x0d, 0x8c); |
457 | 457 | ||
458 | /* With ppm=8000, it seems the DTR_SENSITIVITY will result in | 458 | /* With ppm=8000, it seems the DTR_SENSITIVITY will result in |
459 | value of 2 with all possible bandwidths and guard | 459 | value of 2 with all possible bandwidths and guard |
460 | intervals, which is the initial value anyway. */ | 460 | intervals, which is the initial value anyway. */ |
461 | /*l64781_writereg (state, 0x19, 0x92);*/ | 461 | /*l64781_writereg (state, 0x19, 0x92);*/ |
462 | 462 | ||
463 | /* Everything is two's complement, soft bit and CSI_OUT too */ | 463 | /* Everything is two's complement, soft bit and CSI_OUT too */ |
464 | l64781_writereg (state, 0x1e, 0x09); | 464 | l64781_writereg (state, 0x1e, 0x09); |
@@ -477,10 +477,10 @@ static int l64781_init(struct dvb_frontend* fe) | |||
477 | static int l64781_get_tune_settings(struct dvb_frontend* fe, | 477 | static int l64781_get_tune_settings(struct dvb_frontend* fe, |
478 | struct dvb_frontend_tune_settings* fesettings) | 478 | struct dvb_frontend_tune_settings* fesettings) |
479 | { | 479 | { |
480 | fesettings->min_delay_ms = 4000; | 480 | fesettings->min_delay_ms = 4000; |
481 | fesettings->step_size = 0; | 481 | fesettings->step_size = 0; |
482 | fesettings->max_drift = 0; | 482 | fesettings->max_drift = 0; |
483 | return 0; | 483 | return 0; |
484 | } | 484 | } |
485 | 485 | ||
486 | static void l64781_release(struct dvb_frontend* fe) | 486 | static void l64781_release(struct dvb_frontend* fe) |
@@ -522,7 +522,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config, | |||
522 | 522 | ||
523 | /* The chip always responds to reads */ | 523 | /* The chip always responds to reads */ |
524 | if (i2c_transfer(state->i2c, msg, 2) != 2) { | 524 | if (i2c_transfer(state->i2c, msg, 2) != 2) { |
525 | dprintk("No response to read on I2C bus\n"); | 525 | dprintk("No response to read on I2C bus\n"); |
526 | goto error; | 526 | goto error; |
527 | } | 527 | } |
528 | 528 | ||
@@ -531,7 +531,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config, | |||
531 | 531 | ||
532 | /* Reading the POWER_DOWN register always returns 0 */ | 532 | /* Reading the POWER_DOWN register always returns 0 */ |
533 | if (reg0x3e != 0) { | 533 | if (reg0x3e != 0) { |
534 | dprintk("Device doesn't look like L64781\n"); | 534 | dprintk("Device doesn't look like L64781\n"); |
535 | goto error; | 535 | goto error; |
536 | } | 536 | } |
537 | 537 | ||
@@ -540,7 +540,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config, | |||
540 | 540 | ||
541 | /* Responds to all reads with 0 */ | 541 | /* Responds to all reads with 0 */ |
542 | if (l64781_readreg(state, 0x1a) != 0) { | 542 | if (l64781_readreg(state, 0x1a) != 0) { |
543 | dprintk("Read 1 returned unexpcted value\n"); | 543 | dprintk("Read 1 returned unexpcted value\n"); |
544 | goto error; | 544 | goto error; |
545 | } | 545 | } |
546 | 546 | ||
@@ -549,7 +549,7 @@ struct dvb_frontend* l64781_attach(const struct l64781_config* config, | |||
549 | 549 | ||
550 | /* Responds with register default value */ | 550 | /* Responds with register default value */ |
551 | if (l64781_readreg(state, 0x1a) != 0xa1) { | 551 | if (l64781_readreg(state, 0x1a) != 0xa1) { |
552 | dprintk("Read 2 returned unexpcted value\n"); | 552 | dprintk("Read 2 returned unexpcted value\n"); |
553 | goto error; | 553 | goto error; |
554 | } | 554 | } |
555 | 555 | ||
diff --git a/drivers/media/dvb/frontends/l64781.h b/drivers/media/dvb/frontends/l64781.h index 7e30fb0fdfa7..947f65f87465 100644 --- a/drivers/media/dvb/frontends/l64781.h +++ b/drivers/media/dvb/frontends/l64781.h | |||
@@ -2,7 +2,7 @@ | |||
2 | driver for LSI L64781 COFDM demodulator | 2 | driver for LSI L64781 COFDM demodulator |
3 | 3 | ||
4 | Copyright (C) 2001 Holger Waechtler for Convergence Integrated Media GmbH | 4 | Copyright (C) 2001 Holger Waechtler for Convergence Integrated Media GmbH |
5 | Marko Kohtala <marko.kohtala@luukku.com> | 5 | Marko Kohtala <marko.kohtala@luukku.com> |
6 | 6 | ||
7 | This program is free software; you can redistribute it and/or modify | 7 | This program is free software; you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by | 8 | it under the terms of the GNU General Public License as published by |
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c index 6a33f5a19a8d..cb5301865d07 100644 --- a/drivers/media/dvb/frontends/lgdt330x.c +++ b/drivers/media/dvb/frontends/lgdt330x.c | |||
@@ -301,10 +301,10 @@ static int lgdt330x_set_parameters(struct dvb_frontend* fe, | |||
301 | static u8 lgdt3303_8vsb_44_data[] = { | 301 | static u8 lgdt3303_8vsb_44_data[] = { |
302 | 0x04, 0x00, | 302 | 0x04, 0x00, |
303 | 0x0d, 0x40, | 303 | 0x0d, 0x40, |
304 | 0x0e, 0x87, | 304 | 0x0e, 0x87, |
305 | 0x0f, 0x8e, | 305 | 0x0f, 0x8e, |
306 | 0x10, 0x01, | 306 | 0x10, 0x01, |
307 | 0x47, 0x8b }; | 307 | 0x47, 0x8b }; |
308 | 308 | ||
309 | /* | 309 | /* |
310 | * Array of byte pairs <address, value> | 310 | * Array of byte pairs <address, value> |
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c index 9c67f406d581..8d672283c93d 100644 --- a/drivers/media/dvb/frontends/mt312.c +++ b/drivers/media/dvb/frontends/mt312.c | |||
@@ -554,7 +554,7 @@ static int mt312_set_frontend(struct dvb_frontend* fe, | |||
554 | if ((ret = mt312_write(state, SYM_RATE_H, buf, sizeof(buf))) < 0) | 554 | if ((ret = mt312_write(state, SYM_RATE_H, buf, sizeof(buf))) < 0) |
555 | return ret; | 555 | return ret; |
556 | 556 | ||
557 | mt312_reset(state, 0); | 557 | mt312_reset(state, 0); |
558 | 558 | ||
559 | return 0; | 559 | return 0; |
560 | } | 560 | } |
@@ -695,7 +695,7 @@ static struct dvb_frontend_ops vp310_mt312_ops = { | |||
695 | FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | | 695 | FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | |
696 | FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | | 696 | FE_CAN_FEC_3_4 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | |
697 | FE_CAN_FEC_AUTO | FE_CAN_QPSK | FE_CAN_MUTE_TS | | 697 | FE_CAN_FEC_AUTO | FE_CAN_QPSK | FE_CAN_MUTE_TS | |
698 | FE_CAN_RECOVER | 698 | FE_CAN_RECOVER |
699 | }, | 699 | }, |
700 | 700 | ||
701 | .release = mt312_release, | 701 | .release = mt312_release, |
diff --git a/drivers/media/dvb/frontends/nxt2002.c b/drivers/media/dvb/frontends/nxt2002.c index 30786b1911bd..52c416043a62 100644 --- a/drivers/media/dvb/frontends/nxt2002.c +++ b/drivers/media/dvb/frontends/nxt2002.c | |||
@@ -527,7 +527,7 @@ static int nxt2002_read_snr(struct dvb_frontend* fe, u16* snr) | |||
527 | else | 527 | else |
528 | snrdb = 1000*0 + ( 1000*(12-0) * ( temp2 - 0 ) / ( 0x7C00 - 0 ) ); | 528 | snrdb = 1000*0 + ( 1000*(12-0) * ( temp2 - 0 ) / ( 0x7C00 - 0 ) ); |
529 | 529 | ||
530 | /* the value reported back from the frontend will be FFFF=32db 0000=0db */ | 530 | /* the value reported back from the frontend will be FFFF=32db 0000=0db */ |
531 | 531 | ||
532 | *snr = snrdb * (0xFFFF/32000); | 532 | *snr = snrdb * (0xFFFF/32000); |
533 | 533 | ||
@@ -646,7 +646,7 @@ struct dvb_frontend* nxt2002_attach(const struct nxt2002_config* config, | |||
646 | memcpy(&state->ops, &nxt2002_ops, sizeof(struct dvb_frontend_ops)); | 646 | memcpy(&state->ops, &nxt2002_ops, sizeof(struct dvb_frontend_ops)); |
647 | state->initialised = 0; | 647 | state->initialised = 0; |
648 | 648 | ||
649 | /* Check the first 5 registers to ensure this a revision we can handle */ | 649 | /* Check the first 5 registers to ensure this a revision we can handle */ |
650 | 650 | ||
651 | i2c_readbytes(state, 0x00, buf, 5); | 651 | i2c_readbytes(state, 0x00, buf, 5); |
652 | if (buf[0] != 0x04) goto error; /* device id */ | 652 | if (buf[0] != 0x04) goto error; /* device id */ |
@@ -672,7 +672,7 @@ static struct dvb_frontend_ops nxt2002_ops = { | |||
672 | .type = FE_ATSC, | 672 | .type = FE_ATSC, |
673 | .frequency_min = 54000000, | 673 | .frequency_min = 54000000, |
674 | .frequency_max = 860000000, | 674 | .frequency_max = 860000000, |
675 | /* stepsize is just a guess */ | 675 | /* stepsize is just a guess */ |
676 | .frequency_stepsize = 166666, | 676 | .frequency_stepsize = 166666, |
677 | .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | | 677 | .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | |
678 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO | | 678 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO | |
diff --git a/drivers/media/dvb/frontends/nxt200x.c b/drivers/media/dvb/frontends/nxt200x.c index 84b62881cea7..aeafef46e3eb 100644 --- a/drivers/media/dvb/frontends/nxt200x.c +++ b/drivers/media/dvb/frontends/nxt200x.c | |||
@@ -339,7 +339,7 @@ static int nxt200x_writetuner (struct nxt200x_state* state, u8* data) | |||
339 | switch (state->demod_chip) { | 339 | switch (state->demod_chip) { |
340 | case NXT2004: | 340 | case NXT2004: |
341 | if (i2c_writebytes(state, state->config->pll_address, data, 4)) | 341 | if (i2c_writebytes(state, state->config->pll_address, data, 4)) |
342 | printk(KERN_WARNING "nxt200x: error writing to tuner\n"); | 342 | printk(KERN_WARNING "nxt200x: error writing to tuner\n"); |
343 | /* wait until we have a lock */ | 343 | /* wait until we have a lock */ |
344 | while (count < 20) { | 344 | while (count < 20) { |
345 | i2c_readbytes(state, state->config->pll_address, &buf, 1); | 345 | i2c_readbytes(state, state->config->pll_address, &buf, 1); |
@@ -497,7 +497,7 @@ static int nxt2004_load_firmware (struct dvb_frontend* fe, const struct firmware | |||
497 | 497 | ||
498 | /* calculate firmware CRC */ | 498 | /* calculate firmware CRC */ |
499 | for (position = 0; position < fw->size; position++) { | 499 | for (position = 0; position < fw->size; position++) { |
500 | crc = nxt200x_crc(crc, fw->data[position]); | 500 | crc = nxt200x_crc(crc, fw->data[position]); |
501 | } | 501 | } |
502 | 502 | ||
503 | buf[0] = rambase >> 8; | 503 | buf[0] = rambase >> 8; |
diff --git a/drivers/media/dvb/frontends/nxt6000.c b/drivers/media/dvb/frontends/nxt6000.c index 88a57b791112..a458a3bfff70 100644 --- a/drivers/media/dvb/frontends/nxt6000.c +++ b/drivers/media/dvb/frontends/nxt6000.c | |||
@@ -574,11 +574,11 @@ static struct dvb_frontend_ops nxt6000_ops = { | |||
574 | .symbol_rate_max = 9360000, /* FIXME */ | 574 | .symbol_rate_max = 9360000, /* FIXME */ |
575 | .symbol_rate_tolerance = 4000, | 575 | .symbol_rate_tolerance = 4000, |
576 | .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | | 576 | .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | |
577 | FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 | | 577 | FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 | |
578 | FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO | | 578 | FE_CAN_FEC_7_8 | FE_CAN_FEC_8_9 | FE_CAN_FEC_AUTO | |
579 | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO | | 579 | FE_CAN_QAM_16 | FE_CAN_QAM_64 | FE_CAN_QAM_AUTO | |
580 | FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO | | 580 | FE_CAN_TRANSMISSION_MODE_AUTO | FE_CAN_GUARD_INTERVAL_AUTO | |
581 | FE_CAN_HIERARCHY_AUTO, | 581 | FE_CAN_HIERARCHY_AUTO, |
582 | }, | 582 | }, |
583 | 583 | ||
584 | .release = nxt6000_release, | 584 | .release = nxt6000_release, |
diff --git a/drivers/media/dvb/frontends/or51132.c b/drivers/media/dvb/frontends/or51132.c index 78bded861d02..80e0f28127b7 100644 --- a/drivers/media/dvb/frontends/or51132.c +++ b/drivers/media/dvb/frontends/or51132.c | |||
@@ -503,7 +503,7 @@ static int or51132_read_signal_strength(struct dvb_frontend* fe, u16* strength) | |||
503 | rcvr_stat = rec_buf[1]; | 503 | rcvr_stat = rec_buf[1]; |
504 | usK = (rcvr_stat & 0x10) ? 3 : 0; | 504 | usK = (rcvr_stat & 0x10) ? 3 : 0; |
505 | 505 | ||
506 | /* The value reported back from the frontend will be FFFF=100% 0000=0% */ | 506 | /* The value reported back from the frontend will be FFFF=100% 0000=0% */ |
507 | signal_strength = (((8952 - i20Log10(snr_equ) - usK*100)/3+5)*65535)/1000; | 507 | signal_strength = (((8952 - i20Log10(snr_equ) - usK*100)/3+5)*65535)/1000; |
508 | if (signal_strength > 0xffff) | 508 | if (signal_strength > 0xffff) |
509 | *strength = 0xffff; | 509 | *strength = 0xffff; |
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c index f265418e3261..18715091aed8 100644 --- a/drivers/media/dvb/frontends/s5h1420.c +++ b/drivers/media/dvb/frontends/s5h1420.c | |||
@@ -494,7 +494,7 @@ static int s5h1420_getfreqoffset(struct s5h1420_state* state) | |||
494 | } | 494 | } |
495 | 495 | ||
496 | static void s5h1420_setfec_inversion(struct s5h1420_state* state, | 496 | static void s5h1420_setfec_inversion(struct s5h1420_state* state, |
497 | struct dvb_frontend_parameters *p) | 497 | struct dvb_frontend_parameters *p) |
498 | { | 498 | { |
499 | u8 inversion = 0; | 499 | u8 inversion = 0; |
500 | 500 | ||
@@ -521,8 +521,8 @@ static void s5h1420_setfec_inversion(struct s5h1420_state* state, | |||
521 | 521 | ||
522 | case FEC_3_4: | 522 | case FEC_3_4: |
523 | s5h1420_writereg(state, 0x30, 0x04); | 523 | s5h1420_writereg(state, 0x30, 0x04); |
524 | s5h1420_writereg(state, 0x31, 0x12 | inversion); | 524 | s5h1420_writereg(state, 0x31, 0x12 | inversion); |
525 | break; | 525 | break; |
526 | 526 | ||
527 | case FEC_5_6: | 527 | case FEC_5_6: |
528 | s5h1420_writereg(state, 0x30, 0x08); | 528 | s5h1420_writereg(state, 0x30, 0x08); |
diff --git a/drivers/media/dvb/frontends/s5h1420.h b/drivers/media/dvb/frontends/s5h1420.h index 872028ddf2a2..73296f13c324 100644 --- a/drivers/media/dvb/frontends/s5h1420.h +++ b/drivers/media/dvb/frontends/s5h1420.h | |||
@@ -39,6 +39,6 @@ struct s5h1420_config | |||
39 | }; | 39 | }; |
40 | 40 | ||
41 | extern struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config, | 41 | extern struct dvb_frontend* s5h1420_attach(const struct s5h1420_config* config, |
42 | struct i2c_adapter* i2c); | 42 | struct i2c_adapter* i2c); |
43 | 43 | ||
44 | #endif // S5H1420_H | 44 | #endif // S5H1420_H |
diff --git a/drivers/media/dvb/frontends/sp8870.c b/drivers/media/dvb/frontends/sp8870.c index 1c6b2e9264bc..fc06cd6b46c3 100644 --- a/drivers/media/dvb/frontends/sp8870.c +++ b/drivers/media/dvb/frontends/sp8870.c | |||
@@ -67,16 +67,16 @@ static int debug; | |||
67 | 67 | ||
68 | static int sp8870_writereg (struct sp8870_state* state, u16 reg, u16 data) | 68 | static int sp8870_writereg (struct sp8870_state* state, u16 reg, u16 data) |
69 | { | 69 | { |
70 | u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff }; | 70 | u8 buf [] = { reg >> 8, reg & 0xff, data >> 8, data & 0xff }; |
71 | struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 4 }; | 71 | struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 4 }; |
72 | int err; | 72 | int err; |
73 | 73 | ||
74 | if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { | 74 | if ((err = i2c_transfer (state->i2c, &msg, 1)) != 1) { |
75 | dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data); | 75 | dprintk ("%s: writereg error (err == %i, reg == 0x%02x, data == 0x%02x)\n", __FUNCTION__, err, reg, data); |
76 | return -EREMOTEIO; | 76 | return -EREMOTEIO; |
77 | } | 77 | } |
78 | 78 | ||
79 | return 0; | 79 | return 0; |
80 | } | 80 | } |
81 | 81 | ||
82 | static int sp8870_readreg (struct sp8870_state* state, u16 reg) | 82 | static int sp8870_readreg (struct sp8870_state* state, u16 reg) |
@@ -305,7 +305,7 @@ static int sp8870_set_frontend_parameters (struct dvb_frontend* fe, | |||
305 | static int sp8870_init (struct dvb_frontend* fe) | 305 | static int sp8870_init (struct dvb_frontend* fe) |
306 | { | 306 | { |
307 | struct sp8870_state* state = fe->demodulator_priv; | 307 | struct sp8870_state* state = fe->demodulator_priv; |
308 | const struct firmware *fw = NULL; | 308 | const struct firmware *fw = NULL; |
309 | 309 | ||
310 | sp8870_wake_up(state); | 310 | sp8870_wake_up(state); |
311 | if (state->initialised) return 0; | 311 | if (state->initialised) return 0; |
@@ -534,10 +534,10 @@ static int sp8870_sleep(struct dvb_frontend* fe) | |||
534 | 534 | ||
535 | static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings) | 535 | static int sp8870_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings) |
536 | { | 536 | { |
537 | fesettings->min_delay_ms = 350; | 537 | fesettings->min_delay_ms = 350; |
538 | fesettings->step_size = 0; | 538 | fesettings->step_size = 0; |
539 | fesettings->max_drift = 0; | 539 | fesettings->max_drift = 0; |
540 | return 0; | 540 | return 0; |
541 | } | 541 | } |
542 | 542 | ||
543 | static void sp8870_release(struct dvb_frontend* fe) | 543 | static void sp8870_release(struct dvb_frontend* fe) |
diff --git a/drivers/media/dvb/frontends/sp887x.c b/drivers/media/dvb/frontends/sp887x.c index 73384e75625e..e3b665782243 100644 --- a/drivers/media/dvb/frontends/sp887x.c +++ b/drivers/media/dvb/frontends/sp887x.c | |||
@@ -80,7 +80,7 @@ static int sp887x_readreg (struct sp887x_state* state, u16 reg) | |||
80 | u8 b1 [2]; | 80 | u8 b1 [2]; |
81 | int ret; | 81 | int ret; |
82 | struct i2c_msg msg[] = {{ .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 2 }, | 82 | struct i2c_msg msg[] = {{ .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 2 }, |
83 | { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }}; | 83 | { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 2 }}; |
84 | 84 | ||
85 | if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { | 85 | if ((ret = i2c_transfer(state->i2c, msg, 2)) != 2) { |
86 | printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret); | 86 | printk("%s: readreg error (ret == %i)\n", __FUNCTION__, ret); |
@@ -498,7 +498,7 @@ static int sp887x_sleep(struct dvb_frontend* fe) | |||
498 | static int sp887x_init(struct dvb_frontend* fe) | 498 | static int sp887x_init(struct dvb_frontend* fe) |
499 | { | 499 | { |
500 | struct sp887x_state* state = fe->demodulator_priv; | 500 | struct sp887x_state* state = fe->demodulator_priv; |
501 | const struct firmware *fw = NULL; | 501 | const struct firmware *fw = NULL; |
502 | int ret; | 502 | int ret; |
503 | 503 | ||
504 | if (!state->initialised) { | 504 | if (!state->initialised) { |
@@ -528,10 +528,10 @@ static int sp887x_init(struct dvb_frontend* fe) | |||
528 | 528 | ||
529 | static int sp887x_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings) | 529 | static int sp887x_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings) |
530 | { | 530 | { |
531 | fesettings->min_delay_ms = 350; | 531 | fesettings->min_delay_ms = 350; |
532 | fesettings->step_size = 166666*2; | 532 | fesettings->step_size = 166666*2; |
533 | fesettings->max_drift = (166666*2)+1; | 533 | fesettings->max_drift = (166666*2)+1; |
534 | return 0; | 534 | return 0; |
535 | } | 535 | } |
536 | 536 | ||
537 | static void sp887x_release(struct dvb_frontend* fe) | 537 | static void sp887x_release(struct dvb_frontend* fe) |
@@ -581,7 +581,7 @@ static struct dvb_frontend_ops sp887x_ops = { | |||
581 | .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | | 581 | .caps = FE_CAN_FEC_1_2 | FE_CAN_FEC_2_3 | FE_CAN_FEC_3_4 | |
582 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO | | 582 | FE_CAN_FEC_5_6 | FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO | |
583 | FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | | 583 | FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_QAM_64 | |
584 | FE_CAN_RECOVER | 584 | FE_CAN_RECOVER |
585 | }, | 585 | }, |
586 | 586 | ||
587 | .release = sp887x_release, | 587 | .release = sp887x_release, |
diff --git a/drivers/media/dvb/frontends/stv0299.c b/drivers/media/dvb/frontends/stv0299.c index 29c48665e130..177d71d56b67 100644 --- a/drivers/media/dvb/frontends/stv0299.c +++ b/drivers/media/dvb/frontends/stv0299.c | |||
@@ -95,7 +95,7 @@ static int stv0299_writeregI (struct stv0299_state* state, u8 reg, u8 data) | |||
95 | 95 | ||
96 | int stv0299_writereg (struct dvb_frontend* fe, u8 reg, u8 data) | 96 | int stv0299_writereg (struct dvb_frontend* fe, u8 reg, u8 data) |
97 | { | 97 | { |
98 | struct stv0299_state* state = fe->demodulator_priv; | 98 | struct stv0299_state* state = fe->demodulator_priv; |
99 | 99 | ||
100 | return stv0299_writeregI(state, reg, data); | 100 | return stv0299_writeregI(state, reg, data); |
101 | } | 101 | } |
@@ -220,7 +220,7 @@ static int stv0299_wait_diseqc_idle (struct stv0299_state* state, int timeout) | |||
220 | 220 | ||
221 | static int stv0299_set_symbolrate (struct dvb_frontend* fe, u32 srate) | 221 | static int stv0299_set_symbolrate (struct dvb_frontend* fe, u32 srate) |
222 | { | 222 | { |
223 | struct stv0299_state* state = fe->demodulator_priv; | 223 | struct stv0299_state* state = fe->demodulator_priv; |
224 | u64 big = srate; | 224 | u64 big = srate; |
225 | u32 ratio; | 225 | u32 ratio; |
226 | 226 | ||
@@ -271,7 +271,7 @@ static int stv0299_get_symbolrate (struct stv0299_state* state) | |||
271 | static int stv0299_send_diseqc_msg (struct dvb_frontend* fe, | 271 | static int stv0299_send_diseqc_msg (struct dvb_frontend* fe, |
272 | struct dvb_diseqc_master_cmd *m) | 272 | struct dvb_diseqc_master_cmd *m) |
273 | { | 273 | { |
274 | struct stv0299_state* state = fe->demodulator_priv; | 274 | struct stv0299_state* state = fe->demodulator_priv; |
275 | u8 val; | 275 | u8 val; |
276 | int i; | 276 | int i; |
277 | 277 | ||
@@ -301,7 +301,7 @@ static int stv0299_send_diseqc_msg (struct dvb_frontend* fe, | |||
301 | 301 | ||
302 | static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst) | 302 | static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t burst) |
303 | { | 303 | { |
304 | struct stv0299_state* state = fe->demodulator_priv; | 304 | struct stv0299_state* state = fe->demodulator_priv; |
305 | u8 val; | 305 | u8 val; |
306 | 306 | ||
307 | dprintk ("%s\n", __FUNCTION__); | 307 | dprintk ("%s\n", __FUNCTION__); |
@@ -328,7 +328,7 @@ static int stv0299_send_diseqc_burst (struct dvb_frontend* fe, fe_sec_mini_cmd_t | |||
328 | 328 | ||
329 | static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone) | 329 | static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone) |
330 | { | 330 | { |
331 | struct stv0299_state* state = fe->demodulator_priv; | 331 | struct stv0299_state* state = fe->demodulator_priv; |
332 | u8 val; | 332 | u8 val; |
333 | 333 | ||
334 | if (stv0299_wait_diseqc_idle (state, 100) < 0) | 334 | if (stv0299_wait_diseqc_idle (state, 100) < 0) |
@@ -350,7 +350,7 @@ static int stv0299_set_tone (struct dvb_frontend* fe, fe_sec_tone_mode_t tone) | |||
350 | 350 | ||
351 | static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage) | 351 | static int stv0299_set_voltage (struct dvb_frontend* fe, fe_sec_voltage_t voltage) |
352 | { | 352 | { |
353 | struct stv0299_state* state = fe->demodulator_priv; | 353 | struct stv0299_state* state = fe->demodulator_priv; |
354 | u8 reg0x08; | 354 | u8 reg0x08; |
355 | u8 reg0x0c; | 355 | u8 reg0x0c; |
356 | 356 | ||
@@ -442,7 +442,7 @@ static int stv0299_send_legacy_dish_cmd (struct dvb_frontend* fe, u32 cmd) | |||
442 | 442 | ||
443 | static int stv0299_init (struct dvb_frontend* fe) | 443 | static int stv0299_init (struct dvb_frontend* fe) |
444 | { | 444 | { |
445 | struct stv0299_state* state = fe->demodulator_priv; | 445 | struct stv0299_state* state = fe->demodulator_priv; |
446 | int i; | 446 | int i; |
447 | 447 | ||
448 | dprintk("stv0299: init chip\n"); | 448 | dprintk("stv0299: init chip\n"); |
@@ -461,7 +461,7 @@ static int stv0299_init (struct dvb_frontend* fe) | |||
461 | 461 | ||
462 | static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status) | 462 | static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status) |
463 | { | 463 | { |
464 | struct stv0299_state* state = fe->demodulator_priv; | 464 | struct stv0299_state* state = fe->demodulator_priv; |
465 | 465 | ||
466 | u8 signal = 0xff - stv0299_readreg (state, 0x18); | 466 | u8 signal = 0xff - stv0299_readreg (state, 0x18); |
467 | u8 sync = stv0299_readreg (state, 0x1b); | 467 | u8 sync = stv0299_readreg (state, 0x1b); |
@@ -489,7 +489,7 @@ static int stv0299_read_status(struct dvb_frontend* fe, fe_status_t* status) | |||
489 | 489 | ||
490 | static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber) | 490 | static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber) |
491 | { | 491 | { |
492 | struct stv0299_state* state = fe->demodulator_priv; | 492 | struct stv0299_state* state = fe->demodulator_priv; |
493 | 493 | ||
494 | if (state->errmode != STATUS_BER) return 0; | 494 | if (state->errmode != STATUS_BER) return 0; |
495 | *ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e); | 495 | *ber = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e); |
@@ -499,7 +499,7 @@ static int stv0299_read_ber(struct dvb_frontend* fe, u32* ber) | |||
499 | 499 | ||
500 | static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength) | 500 | static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength) |
501 | { | 501 | { |
502 | struct stv0299_state* state = fe->demodulator_priv; | 502 | struct stv0299_state* state = fe->demodulator_priv; |
503 | 503 | ||
504 | s32 signal = 0xffff - ((stv0299_readreg (state, 0x18) << 8) | 504 | s32 signal = 0xffff - ((stv0299_readreg (state, 0x18) << 8) |
505 | | stv0299_readreg (state, 0x19)); | 505 | | stv0299_readreg (state, 0x19)); |
@@ -516,7 +516,7 @@ static int stv0299_read_signal_strength(struct dvb_frontend* fe, u16* strength) | |||
516 | 516 | ||
517 | static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr) | 517 | static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr) |
518 | { | 518 | { |
519 | struct stv0299_state* state = fe->demodulator_priv; | 519 | struct stv0299_state* state = fe->demodulator_priv; |
520 | 520 | ||
521 | s32 xsnr = 0xffff - ((stv0299_readreg (state, 0x24) << 8) | 521 | s32 xsnr = 0xffff - ((stv0299_readreg (state, 0x24) << 8) |
522 | | stv0299_readreg (state, 0x25)); | 522 | | stv0299_readreg (state, 0x25)); |
@@ -528,7 +528,7 @@ static int stv0299_read_snr(struct dvb_frontend* fe, u16* snr) | |||
528 | 528 | ||
529 | static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) | 529 | static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) |
530 | { | 530 | { |
531 | struct stv0299_state* state = fe->demodulator_priv; | 531 | struct stv0299_state* state = fe->demodulator_priv; |
532 | 532 | ||
533 | if (state->errmode != STATUS_UCBLOCKS) *ucblocks = 0; | 533 | if (state->errmode != STATUS_UCBLOCKS) *ucblocks = 0; |
534 | else *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e); | 534 | else *ucblocks = (stv0299_readreg (state, 0x1d) << 8) | stv0299_readreg (state, 0x1e); |
@@ -538,7 +538,7 @@ static int stv0299_read_ucblocks(struct dvb_frontend* fe, u32* ucblocks) | |||
538 | 538 | ||
539 | static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p) | 539 | static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p) |
540 | { | 540 | { |
541 | struct stv0299_state* state = fe->demodulator_priv; | 541 | struct stv0299_state* state = fe->demodulator_priv; |
542 | int invval = 0; | 542 | int invval = 0; |
543 | 543 | ||
544 | dprintk ("%s : FE_SET_FRONTEND\n", __FUNCTION__); | 544 | dprintk ("%s : FE_SET_FRONTEND\n", __FUNCTION__); |
@@ -571,7 +571,7 @@ static int stv0299_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
571 | 571 | ||
572 | static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p) | 572 | static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_parameters * p) |
573 | { | 573 | { |
574 | struct stv0299_state* state = fe->demodulator_priv; | 574 | struct stv0299_state* state = fe->demodulator_priv; |
575 | s32 derot_freq; | 575 | s32 derot_freq; |
576 | int invval; | 576 | int invval; |
577 | 577 | ||
@@ -596,7 +596,7 @@ static int stv0299_get_frontend(struct dvb_frontend* fe, struct dvb_frontend_par | |||
596 | 596 | ||
597 | static int stv0299_sleep(struct dvb_frontend* fe) | 597 | static int stv0299_sleep(struct dvb_frontend* fe) |
598 | { | 598 | { |
599 | struct stv0299_state* state = fe->demodulator_priv; | 599 | struct stv0299_state* state = fe->demodulator_priv; |
600 | 600 | ||
601 | stv0299_writeregI(state, 0x02, 0x80); | 601 | stv0299_writeregI(state, 0x02, 0x80); |
602 | state->initialised = 0; | 602 | state->initialised = 0; |
@@ -606,7 +606,7 @@ static int stv0299_sleep(struct dvb_frontend* fe) | |||
606 | 606 | ||
607 | static int stv0299_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings) | 607 | static int stv0299_get_tune_settings(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* fesettings) |
608 | { | 608 | { |
609 | struct stv0299_state* state = fe->demodulator_priv; | 609 | struct stv0299_state* state = fe->demodulator_priv; |
610 | 610 | ||
611 | fesettings->min_delay_ms = state->config->min_delay_ms; | 611 | fesettings->min_delay_ms = state->config->min_delay_ms; |
612 | if (fesettings->parameters.u.qpsk.symbol_rate < 10000000) { | 612 | if (fesettings->parameters.u.qpsk.symbol_rate < 10000000) { |
@@ -658,7 +658,7 @@ struct dvb_frontend* stv0299_attach(const struct stv0299_config* config, | |||
658 | 658 | ||
659 | /* create dvb_frontend */ | 659 | /* create dvb_frontend */ |
660 | state->frontend.ops = &state->ops; | 660 | state->frontend.ops = &state->ops; |
661 | state->frontend.demodulator_priv = state; | 661 | state->frontend.demodulator_priv = state; |
662 | return &state->frontend; | 662 | return &state->frontend; |
663 | 663 | ||
664 | error: | 664 | error: |
@@ -714,7 +714,7 @@ MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off)."); | |||
714 | 714 | ||
715 | MODULE_DESCRIPTION("ST STV0299 DVB Demodulator driver"); | 715 | MODULE_DESCRIPTION("ST STV0299 DVB Demodulator driver"); |
716 | MODULE_AUTHOR("Ralph Metzler, Holger Waechtler, Peter Schildmann, Felix Domke, " | 716 | MODULE_AUTHOR("Ralph Metzler, Holger Waechtler, Peter Schildmann, Felix Domke, " |
717 | "Andreas Oberritter, Andrew de Quincey, Kenneth Aafløy"); | 717 | "Andreas Oberritter, Andrew de Quincey, Kenneth Aafløy"); |
718 | MODULE_LICENSE("GPL"); | 718 | MODULE_LICENSE("GPL"); |
719 | 719 | ||
720 | EXPORT_SYMBOL(stv0299_writereg); | 720 | EXPORT_SYMBOL(stv0299_writereg); |
diff --git a/drivers/media/dvb/frontends/tda10021.c b/drivers/media/dvb/frontends/tda10021.c index eaf130e666d8..425cd19136fe 100644 --- a/drivers/media/dvb/frontends/tda10021.c +++ b/drivers/media/dvb/frontends/tda10021.c | |||
@@ -1,10 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | TDA10021 - Single Chip Cable Channel Receiver driver module | 2 | TDA10021 - Single Chip Cable Channel Receiver driver module |
3 | used on the the Siemens DVB-C cards | 3 | used on the the Siemens DVB-C cards |
4 | 4 | ||
5 | Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de> | 5 | Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de> |
6 | Copyright (C) 2004 Markus Schulz <msc@antzsystem.de> | 6 | Copyright (C) 2004 Markus Schulz <msc@antzsystem.de> |
7 | Support for TDA10021 | 7 | Support for TDA10021 |
8 | 8 | ||
9 | This program is free software; you can redistribute it and/or modify | 9 | This program is free software; you can redistribute it and/or modify |
10 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
@@ -76,9 +76,9 @@ static u8 tda10021_inittab[0x40]= | |||
76 | 76 | ||
77 | static int tda10021_writereg (struct tda10021_state* state, u8 reg, u8 data) | 77 | static int tda10021_writereg (struct tda10021_state* state, u8 reg, u8 data) |
78 | { | 78 | { |
79 | u8 buf[] = { reg, data }; | 79 | u8 buf[] = { reg, data }; |
80 | struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 }; | 80 | struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 }; |
81 | int ret; | 81 | int ret; |
82 | 82 | ||
83 | ret = i2c_transfer (state->i2c, &msg, 1); | 83 | ret = i2c_transfer (state->i2c, &msg, 1); |
84 | if (ret != 1) | 84 | if (ret != 1) |
@@ -95,7 +95,7 @@ static u8 tda10021_readreg (struct tda10021_state* state, u8 reg) | |||
95 | u8 b0 [] = { reg }; | 95 | u8 b0 [] = { reg }; |
96 | u8 b1 [] = { 0 }; | 96 | u8 b1 [] = { 0 }; |
97 | struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 }, | 97 | struct i2c_msg msg [] = { { .addr = state->config->demod_address, .flags = 0, .buf = b0, .len = 1 }, |
98 | { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } }; | 98 | { .addr = state->config->demod_address, .flags = I2C_M_RD, .buf = b1, .len = 1 } }; |
99 | int ret; | 99 | int ret; |
100 | 100 | ||
101 | ret = i2c_transfer (state->i2c, msg, 2); | 101 | ret = i2c_transfer (state->i2c, msg, 2); |
diff --git a/drivers/media/dvb/frontends/tda10021.h b/drivers/media/dvb/frontends/tda10021.h index 7d6a51ce291e..53be939e8c55 100644 --- a/drivers/media/dvb/frontends/tda10021.h +++ b/drivers/media/dvb/frontends/tda10021.h | |||
@@ -1,10 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | TDA10021 - Single Chip Cable Channel Receiver driver module | 2 | TDA10021 - Single Chip Cable Channel Receiver driver module |
3 | used on the the Siemens DVB-C cards | 3 | used on the the Siemens DVB-C cards |
4 | 4 | ||
5 | Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de> | 5 | Copyright (C) 1999 Convergence Integrated Media GmbH <ralph@convergence.de> |
6 | Copyright (C) 2004 Markus Schulz <msc@antzsystem.de> | 6 | Copyright (C) 2004 Markus Schulz <msc@antzsystem.de> |
7 | Support for TDA10021 | 7 | Support for TDA10021 |
8 | 8 | ||
9 | This program is free software; you can redistribute it and/or modify | 9 | This program is free software; you can redistribute it and/or modify |
10 | it under the terms of the GNU General Public License as published by | 10 | it under the terms of the GNU General Public License as published by |
diff --git a/drivers/media/dvb/frontends/tda1004x.c b/drivers/media/dvb/frontends/tda1004x.c index 7968743826fc..dd02aff467fe 100644 --- a/drivers/media/dvb/frontends/tda1004x.c +++ b/drivers/media/dvb/frontends/tda1004x.c | |||
@@ -475,7 +475,7 @@ static int tda10046_fwupload(struct dvb_frontend* fe) | |||
475 | ret = state->config->request_firmware(fe, &fw, TDA10046_DEFAULT_FIRMWARE); | 475 | ret = state->config->request_firmware(fe, &fw, TDA10046_DEFAULT_FIRMWARE); |
476 | if (ret) { | 476 | if (ret) { |
477 | printk(KERN_ERR "tda1004x: no firmware upload (timeout or file not found?)\n"); | 477 | printk(KERN_ERR "tda1004x: no firmware upload (timeout or file not found?)\n"); |
478 | return ret; | 478 | return ret; |
479 | } | 479 | } |
480 | tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 8); // going to boot from HOST | 480 | tda1004x_write_mask(state, TDA1004X_CONFC4, 8, 8); // going to boot from HOST |
481 | ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10046H_CODE_CPT, TDA10046H_CODE_IN); | 481 | ret = tda1004x_do_upload(state, fw->data, fw->size, TDA10046H_CODE_CPT, TDA10046H_CODE_IN); |
diff --git a/drivers/media/dvb/frontends/tda8083.c b/drivers/media/dvb/frontends/tda8083.c index c05cf1861051..91baa9cedd79 100644 --- a/drivers/media/dvb/frontends/tda8083.c +++ b/drivers/media/dvb/frontends/tda8083.c | |||
@@ -66,13 +66,13 @@ static int tda8083_writereg (struct tda8083_state* state, u8 reg, u8 data) | |||
66 | u8 buf [] = { reg, data }; | 66 | u8 buf [] = { reg, data }; |
67 | struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 }; | 67 | struct i2c_msg msg = { .addr = state->config->demod_address, .flags = 0, .buf = buf, .len = 2 }; |
68 | 68 | ||
69 | ret = i2c_transfer(state->i2c, &msg, 1); | 69 | ret = i2c_transfer(state->i2c, &msg, 1); |
70 | 70 | ||
71 | if (ret != 1) | 71 | if (ret != 1) |
72 | dprintk ("%s: writereg error (reg %02x, ret == %i)\n", | 72 | dprintk ("%s: writereg error (reg %02x, ret == %i)\n", |
73 | __FUNCTION__, reg, ret); | 73 | __FUNCTION__, reg, ret); |
74 | 74 | ||
75 | return (ret != 1) ? -1 : 0; | 75 | return (ret != 1) ? -1 : 0; |
76 | } | 76 | } |
77 | 77 | ||
78 | static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len) | 78 | static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len) |
@@ -87,7 +87,7 @@ static int tda8083_readregs (struct tda8083_state* state, u8 reg1, u8 *b, u8 len | |||
87 | dprintk ("%s: readreg error (reg %02x, ret == %i)\n", | 87 | dprintk ("%s: readreg error (reg %02x, ret == %i)\n", |
88 | __FUNCTION__, reg1, ret); | 88 | __FUNCTION__, reg1, ret); |
89 | 89 | ||
90 | return ret == 2 ? 0 : -1; | 90 | return ret == 2 ? 0 : -1; |
91 | } | 91 | } |
92 | 92 | ||
93 | static inline u8 tda8083_readreg (struct tda8083_state* state, u8 reg) | 93 | static inline u8 tda8083_readreg (struct tda8083_state* state, u8 reg) |
@@ -132,14 +132,14 @@ static fe_code_rate_t tda8083_get_fec (struct tda8083_state* state) | |||
132 | 132 | ||
133 | static int tda8083_set_symbolrate (struct tda8083_state* state, u32 srate) | 133 | static int tda8083_set_symbolrate (struct tda8083_state* state, u32 srate) |
134 | { | 134 | { |
135 | u32 ratio; | 135 | u32 ratio; |
136 | u32 tmp; | 136 | u32 tmp; |
137 | u8 filter; | 137 | u8 filter; |
138 | 138 | ||
139 | if (srate > 32000000) | 139 | if (srate > 32000000) |
140 | srate = 32000000; | 140 | srate = 32000000; |
141 | if (srate < 500000) | 141 | if (srate < 500000) |
142 | srate = 500000; | 142 | srate = 500000; |
143 | 143 | ||
144 | filter = 0; | 144 | filter = 0; |
145 | if (srate < 24000000) | 145 | if (srate < 24000000) |
@@ -174,7 +174,7 @@ static void tda8083_wait_diseqc_fifo (struct tda8083_state* state, int timeout) | |||
174 | unsigned long start = jiffies; | 174 | unsigned long start = jiffies; |
175 | 175 | ||
176 | while (jiffies - start < timeout && | 176 | while (jiffies - start < timeout && |
177 | !(tda8083_readreg(state, 0x02) & 0x80)) | 177 | !(tda8083_readreg(state, 0x02) & 0x80)) |
178 | { | 178 | { |
179 | msleep(50); | 179 | msleep(50); |
180 | }; | 180 | }; |
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c index 87ea52757a21..7dae91e5863c 100644 --- a/drivers/media/dvb/ttpci/av7110.c +++ b/drivers/media/dvb/ttpci/av7110.c | |||
@@ -176,6 +176,9 @@ static void init_av7110_av(struct av7110 *av7110) | |||
176 | } | 176 | } |
177 | } | 177 | } |
178 | 178 | ||
179 | if (dev->pci->subsystem_vendor == 0x13c2 && dev->pci->subsystem_device == 0x000e) | ||
180 | av7110_fw_cmd(av7110, COMTYPE_AUDIODAC, SpdifSwitch, 1, 0); // SPDIF on | ||
181 | |||
179 | ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right); | 182 | ret = av7110_set_volume(av7110, av7110->mixer.volume_left, av7110->mixer.volume_right); |
180 | if (ret < 0) | 183 | if (ret < 0) |
181 | printk("dvb-ttpci:cannot set volume :%d\n",ret); | 184 | printk("dvb-ttpci:cannot set volume :%d\n",ret); |
@@ -217,10 +220,10 @@ static int arm_thread(void *data) | |||
217 | 220 | ||
218 | dprintk(4, "%p\n",av7110); | 221 | dprintk(4, "%p\n",av7110); |
219 | 222 | ||
220 | lock_kernel(); | 223 | lock_kernel(); |
221 | daemonize("arm_mon"); | 224 | daemonize("arm_mon"); |
222 | sigfillset(¤t->blocked); | 225 | sigfillset(¤t->blocked); |
223 | unlock_kernel(); | 226 | unlock_kernel(); |
224 | 227 | ||
225 | av7110->arm_thread = current; | 228 | av7110->arm_thread = current; |
226 | 229 | ||
@@ -1535,7 +1538,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param | |||
1535 | buf[2] = ((div & 0x18000) >> 10) | 0x95; | 1538 | buf[2] = ((div & 0x18000) >> 10) | 0x95; |
1536 | buf[3] = (pwr << 6) | 0x30; | 1539 | buf[3] = (pwr << 6) | 0x30; |
1537 | 1540 | ||
1538 | // NOTE: since we're using a prescaler of 2, we set the | 1541 | // NOTE: since we're using a prescaler of 2, we set the |
1539 | // divisor frequency to 62.5kHz and divide by 125 above | 1542 | // divisor frequency to 62.5kHz and divide by 125 above |
1540 | 1543 | ||
1541 | if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1) | 1544 | if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1) |
@@ -1811,7 +1814,7 @@ static struct tda8083_config grundig_29504_451_config = { | |||
1811 | static int philips_cd1516_pll_set(struct dvb_frontend* fe, | 1814 | static int philips_cd1516_pll_set(struct dvb_frontend* fe, |
1812 | struct dvb_frontend_parameters* params) | 1815 | struct dvb_frontend_parameters* params) |
1813 | { | 1816 | { |
1814 | struct av7110* av7110 = fe->dvb->priv; | 1817 | struct av7110* av7110 = fe->dvb->priv; |
1815 | u32 div; | 1818 | u32 div; |
1816 | u32 f = params->frequency; | 1819 | u32 f = params->frequency; |
1817 | u8 data[4]; | 1820 | u8 data[4]; |
@@ -2202,7 +2205,7 @@ static u8 read_pwm(struct av7110* av7110) | |||
2202 | struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 }, | 2205 | struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 }, |
2203 | { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} }; | 2206 | { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} }; |
2204 | 2207 | ||
2205 | if ((i2c_transfer(&av7110->i2c_adap, msg, 2) != 2) || (pwm == 0xff)) | 2208 | if ((i2c_transfer(&av7110->i2c_adap, msg, 2) != 2) || (pwm == 0xff)) |
2206 | pwm = 0x48; | 2209 | pwm = 0x48; |
2207 | 2210 | ||
2208 | return pwm; | 2211 | return pwm; |
@@ -2245,7 +2248,7 @@ static int frontend_init(struct av7110 *av7110) | |||
2245 | } | 2248 | } |
2246 | 2249 | ||
2247 | // Try the grundig 29504-451 | 2250 | // Try the grundig 29504-451 |
2248 | av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap); | 2251 | av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap); |
2249 | if (av7110->fe) { | 2252 | if (av7110->fe) { |
2250 | av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd; | 2253 | av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd; |
2251 | av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst; | 2254 | av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst; |
@@ -2271,12 +2274,12 @@ static int frontend_init(struct av7110 *av7110) | |||
2271 | case 0x0001: // Hauppauge/TT Nexus-T premium rev1.X | 2274 | case 0x0001: // Hauppauge/TT Nexus-T premium rev1.X |
2272 | 2275 | ||
2273 | // ALPS TDLB7 | 2276 | // ALPS TDLB7 |
2274 | av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap); | 2277 | av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap); |
2275 | break; | 2278 | break; |
2276 | 2279 | ||
2277 | case 0x0002: // Hauppauge/TT DVB-C premium rev2.X | 2280 | case 0x0002: // Hauppauge/TT DVB-C premium rev2.X |
2278 | 2281 | ||
2279 | av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110)); | 2282 | av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110)); |
2280 | break; | 2283 | break; |
2281 | 2284 | ||
2282 | case 0x0006: /* Fujitsu-Siemens DVB-S rev 1.6 */ | 2285 | case 0x0006: /* Fujitsu-Siemens DVB-S rev 1.6 */ |
@@ -2421,9 +2424,9 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d | |||
2421 | 2424 | ||
2422 | dprintk(4, "dev: %p\n", dev); | 2425 | dprintk(4, "dev: %p\n", dev); |
2423 | 2426 | ||
2424 | /* Set RPS_IRQ to 1 to track rps1 activity. | 2427 | /* Set RPS_IRQ to 1 to track rps1 activity. |
2425 | * Enabling this won't send any interrupt to PC CPU. | 2428 | * Enabling this won't send any interrupt to PC CPU. |
2426 | */ | 2429 | */ |
2427 | #define RPS_IRQ 0 | 2430 | #define RPS_IRQ 0 |
2428 | 2431 | ||
2429 | if (budgetpatch == 1) { | 2432 | if (budgetpatch == 1) { |
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c index 7442f56a72ec..87106e8bf35b 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.c +++ b/drivers/media/dvb/ttpci/av7110_hw.c | |||
@@ -1203,15 +1203,15 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) | |||
1203 | 1203 | ||
1204 | int av7110_osd_capability(struct av7110 *av7110, osd_cap_t *cap) | 1204 | int av7110_osd_capability(struct av7110 *av7110, osd_cap_t *cap) |
1205 | { | 1205 | { |
1206 | switch (cap->cmd) { | 1206 | switch (cap->cmd) { |
1207 | case OSD_CAP_MEMSIZE: | 1207 | case OSD_CAP_MEMSIZE: |
1208 | if (FW_4M_SDRAM(av7110->arm_app)) | 1208 | if (FW_4M_SDRAM(av7110->arm_app)) |
1209 | cap->val = 1000000; | 1209 | cap->val = 1000000; |
1210 | else | 1210 | else |
1211 | cap->val = 92000; | 1211 | cap->val = 92000; |
1212 | return 0; | 1212 | return 0; |
1213 | default: | 1213 | default: |
1214 | return -EINVAL; | 1214 | return -EINVAL; |
1215 | } | 1215 | } |
1216 | } | 1216 | } |
1217 | #endif /* CONFIG_DVB_AV7110_OSD */ | 1217 | #endif /* CONFIG_DVB_AV7110_OSD */ |
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h index fedd20f9815d..2a5e87ba1052 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.h +++ b/drivers/media/dvb/ttpci/av7110_hw.h | |||
@@ -143,7 +143,8 @@ enum av7110_audio_command { | |||
143 | MainSwitch, | 143 | MainSwitch, |
144 | ADSwitch, | 144 | ADSwitch, |
145 | SendDiSEqC, | 145 | SendDiSEqC, |
146 | SetRegister | 146 | SetRegister, |
147 | SpdifSwitch | ||
147 | }; | 148 | }; |
148 | 149 | ||
149 | enum av7110_request_command { | 150 | enum av7110_request_command { |
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c index 6af74f78b3e5..b5aea4129fa7 100644 --- a/drivers/media/dvb/ttpci/av7110_v4l.c +++ b/drivers/media/dvb/ttpci/av7110_v4l.c | |||
@@ -120,8 +120,8 @@ static int ves1820_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data) | |||
120 | 120 | ||
121 | static int stv0297_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data) | 121 | static int stv0297_writereg(struct saa7146_dev *dev, u8 addr, u8 reg, u8 data) |
122 | { | 122 | { |
123 | u8 buf [] = { reg, data }; | 123 | u8 buf [] = { reg, data }; |
124 | struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 2 }; | 124 | struct i2c_msg msg = { .addr = addr, .flags = 0, .buf = buf, .len = 2 }; |
125 | 125 | ||
126 | if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1)) | 126 | if (1 != saa7146_i2c_transfer(dev, &msg, 1, 1)) |
127 | return -1; | 127 | return -1; |
diff --git a/drivers/media/dvb/ttpci/budget-core.c b/drivers/media/dvb/ttpci/budget-core.c index 0498a055a4cd..017fcbccb8cc 100644 --- a/drivers/media/dvb/ttpci/budget-core.c +++ b/drivers/media/dvb/ttpci/budget-core.c | |||
@@ -87,7 +87,7 @@ static int start_ts_capture(struct budget *budget) | |||
87 | * Pitch: 188, NumBytes3: 188, NumLines3: 1024 | 87 | * Pitch: 188, NumBytes3: 188, NumLines3: 1024 |
88 | */ | 88 | */ |
89 | 89 | ||
90 | switch(budget->card->type) { | 90 | switch(budget->card->type) { |
91 | case BUDGET_FS_ACTIVY: | 91 | case BUDGET_FS_ACTIVY: |
92 | saa7146_write(dev, DD1_INIT, 0x04000000); | 92 | saa7146_write(dev, DD1_INIT, 0x04000000); |
93 | saa7146_write(dev, MC2, (MASK_09 | MASK_25)); | 93 | saa7146_write(dev, MC2, (MASK_09 | MASK_25)); |
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c index 755df81cbc49..fc416cf5253c 100644 --- a/drivers/media/dvb/ttpci/budget-patch.c +++ b/drivers/media/dvb/ttpci/budget-patch.c | |||
@@ -45,11 +45,11 @@ MAKE_BUDGET_INFO(ttbp, "TT-Budget/Patch DVB-S 1.x PCI", BUDGET_PATCH); | |||
45 | //MAKE_BUDGET_INFO(satel,"TT-Budget/Patch SATELCO PCI", BUDGET_TT_HW_DISEQC); | 45 | //MAKE_BUDGET_INFO(satel,"TT-Budget/Patch SATELCO PCI", BUDGET_TT_HW_DISEQC); |
46 | 46 | ||
47 | static struct pci_device_id pci_tbl[] = { | 47 | static struct pci_device_id pci_tbl[] = { |
48 | MAKE_EXTENSION_PCI(ttbp,0x13c2, 0x0000), | 48 | MAKE_EXTENSION_PCI(ttbp,0x13c2, 0x0000), |
49 | // MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013), | 49 | // MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013), |
50 | { | 50 | { |
51 | .vendor = 0, | 51 | .vendor = 0, |
52 | } | 52 | } |
53 | }; | 53 | }; |
54 | 54 | ||
55 | /* those lines are for budget-patch to be tried | 55 | /* those lines are for budget-patch to be tried |
@@ -165,57 +165,57 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m | |||
165 | 165 | ||
166 | static int budget_av7110_send_fw_cmd(struct budget_patch *budget, u16* buf, int length) | 166 | static int budget_av7110_send_fw_cmd(struct budget_patch *budget, u16* buf, int length) |
167 | { | 167 | { |
168 | int i; | 168 | int i; |
169 | 169 | ||
170 | dprintk(2, "budget: %p\n", budget); | 170 | dprintk(2, "budget: %p\n", budget); |
171 | 171 | ||
172 | for (i = 2; i < length; i++) | 172 | for (i = 2; i < length; i++) |
173 | { | 173 | { |
174 | ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2*i, 2, (u32) buf[i], 0,0); | 174 | ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2*i, 2, (u32) buf[i], 0,0); |
175 | msleep(5); | 175 | msleep(5); |
176 | } | 176 | } |
177 | if (length) | 177 | if (length) |
178 | ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, (u32) buf[1], 0,0); | 178 | ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, (u32) buf[1], 0,0); |
179 | else | 179 | else |
180 | ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, 0, 0,0); | 180 | ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND + 2, 2, 0, 0,0); |
181 | msleep(5); | 181 | msleep(5); |
182 | ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND, 2, (u32) buf[0], 0,0); | 182 | ttpci_budget_debiwrite(budget, DEBINOSWAP, COMMAND, 2, (u32) buf[0], 0,0); |
183 | msleep(5); | 183 | msleep(5); |
184 | return 0; | 184 | return 0; |
185 | } | 185 | } |
186 | 186 | ||
187 | static void av7110_set22k(struct budget_patch *budget, int state) | 187 | static void av7110_set22k(struct budget_patch *budget, int state) |
188 | { | 188 | { |
189 | u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0}; | 189 | u16 buf[2] = {( COMTYPE_AUDIODAC << 8) | (state ? ON22K : OFF22K), 0}; |
190 | 190 | ||
191 | dprintk(2, "budget: %p\n", budget); | 191 | dprintk(2, "budget: %p\n", budget); |
192 | budget_av7110_send_fw_cmd(budget, buf, 2); | 192 | budget_av7110_send_fw_cmd(budget, buf, 2); |
193 | } | 193 | } |
194 | 194 | ||
195 | static int av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg, int burst) | 195 | static int av7110_send_diseqc_msg(struct budget_patch *budget, int len, u8 *msg, int burst) |
196 | { | 196 | { |
197 | int i; | 197 | int i; |
198 | u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC), | 198 | u16 buf[18] = { ((COMTYPE_AUDIODAC << 8) | SendDiSEqC), |
199 | 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; | 199 | 16, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; |
200 | 200 | ||
201 | dprintk(2, "budget: %p\n", budget); | 201 | dprintk(2, "budget: %p\n", budget); |
202 | 202 | ||
203 | if (len>10) | 203 | if (len>10) |
204 | len=10; | 204 | len=10; |
205 | 205 | ||
206 | buf[1] = len+2; | 206 | buf[1] = len+2; |
207 | buf[2] = len; | 207 | buf[2] = len; |
208 | 208 | ||
209 | if (burst != -1) | 209 | if (burst != -1) |
210 | buf[3]=burst ? 0x01 : 0x00; | 210 | buf[3]=burst ? 0x01 : 0x00; |
211 | else | 211 | else |
212 | buf[3]=0xffff; | 212 | buf[3]=0xffff; |
213 | 213 | ||
214 | for (i=0; i<len; i++) | 214 | for (i=0; i<len; i++) |
215 | buf[i+4]=msg[i]; | 215 | buf[i+4]=msg[i]; |
216 | 216 | ||
217 | budget_av7110_send_fw_cmd(budget, buf, 18); | 217 | budget_av7110_send_fw_cmd(budget, buf, 18); |
218 | return 0; | 218 | return 0; |
219 | } | 219 | } |
220 | 220 | ||
221 | static int budget_patch_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone) | 221 | static int budget_patch_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone) |
@@ -276,7 +276,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param | |||
276 | buf[2] = ((div & 0x18000) >> 10) | 0x95; | 276 | buf[2] = ((div & 0x18000) >> 10) | 0x95; |
277 | buf[3] = (pwr << 6) | 0x30; | 277 | buf[3] = (pwr << 6) | 0x30; |
278 | 278 | ||
279 | // NOTE: since we're using a prescaler of 2, we set the | 279 | // NOTE: since we're using a prescaler of 2, we set the |
280 | // divisor frequency to 62.5kHz and divide by 125 above | 280 | // divisor frequency to 62.5kHz and divide by 125 above |
281 | 281 | ||
282 | if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO; | 282 | if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO; |
@@ -294,7 +294,7 @@ static u8 alps_bsru6_inittab[] = { | |||
294 | 0x01, 0x15, | 294 | 0x01, 0x15, |
295 | 0x02, 0x00, | 295 | 0x02, 0x00, |
296 | 0x03, 0x00, | 296 | 0x03, 0x00, |
297 | 0x04, 0x7d, /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */ | 297 | 0x04, 0x7d, /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */ |
298 | 0x05, 0x35, /* I2CT = 0, SCLT = 1, SDAT = 1 */ | 298 | 0x05, 0x35, /* I2CT = 0, SCLT = 1, SDAT = 1 */ |
299 | 0x06, 0x40, /* DAC not used, set to high impendance mode */ | 299 | 0x06, 0x40, /* DAC not used, set to high impendance mode */ |
300 | 0x07, 0x00, /* DAC LSB */ | 300 | 0x07, 0x00, /* DAC LSB */ |
@@ -413,7 +413,7 @@ static void frontend_init(struct budget_patch* budget) | |||
413 | { | 413 | { |
414 | switch(budget->dev->pci->subsystem_device) { | 414 | switch(budget->dev->pci->subsystem_device) { |
415 | case 0x0000: // Hauppauge/TT WinTV DVB-S rev1.X | 415 | case 0x0000: // Hauppauge/TT WinTV DVB-S rev1.X |
416 | case 0x1013: // SATELCO Multimedia PCI | 416 | case 0x1013: // SATELCO Multimedia PCI |
417 | 417 | ||
418 | // try the ALPS BSRV2 first of all | 418 | // try the ALPS BSRV2 first of all |
419 | budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap); | 419 | budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap); |
@@ -463,8 +463,8 @@ static void frontend_init(struct budget_patch* budget) | |||
463 | /* written by Emard */ | 463 | /* written by Emard */ |
464 | static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info) | 464 | static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_extension_data *info) |
465 | { | 465 | { |
466 | struct budget_patch *budget; | 466 | struct budget_patch *budget; |
467 | int err; | 467 | int err; |
468 | int count = 0; | 468 | int count = 0; |
469 | int detected = 0; | 469 | int detected = 0; |
470 | 470 | ||
@@ -472,12 +472,12 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte | |||
472 | #define RPS_IRQ 0 | 472 | #define RPS_IRQ 0 |
473 | #define HPS_SETUP 0 | 473 | #define HPS_SETUP 0 |
474 | #if PATCH_RESET | 474 | #if PATCH_RESET |
475 | saa7146_write(dev, MC1, MASK_31); | 475 | saa7146_write(dev, MC1, MASK_31); |
476 | msleep(40); | 476 | msleep(40); |
477 | #endif | 477 | #endif |
478 | #if HPS_SETUP | 478 | #if HPS_SETUP |
479 | // initialize registers. Better to have it like this | 479 | // initialize registers. Better to have it like this |
480 | // than leaving something unconfigured | 480 | // than leaving something unconfigured |
481 | saa7146_write(dev, DD1_STREAM_B, 0); | 481 | saa7146_write(dev, DD1_STREAM_B, 0); |
482 | // port B VSYNC at rising edge | 482 | // port B VSYNC at rising edge |
483 | saa7146_write(dev, DD1_INIT, 0x00000200); // have this in budget-core too! | 483 | saa7146_write(dev, DD1_INIT, 0x00000200); // have this in budget-core too! |
@@ -486,29 +486,29 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte | |||
486 | // debi config | 486 | // debi config |
487 | // saa7146_write(dev, DEBI_CONFIG, MASK_30|MASK_28|MASK_18); | 487 | // saa7146_write(dev, DEBI_CONFIG, MASK_30|MASK_28|MASK_18); |
488 | 488 | ||
489 | // zero all HPS registers | 489 | // zero all HPS registers |
490 | saa7146_write(dev, HPS_H_PRESCALE, 0); // r68 | 490 | saa7146_write(dev, HPS_H_PRESCALE, 0); // r68 |
491 | saa7146_write(dev, HPS_H_SCALE, 0); // r6c | 491 | saa7146_write(dev, HPS_H_SCALE, 0); // r6c |
492 | saa7146_write(dev, BCS_CTRL, 0); // r70 | 492 | saa7146_write(dev, BCS_CTRL, 0); // r70 |
493 | saa7146_write(dev, HPS_V_SCALE, 0); // r60 | 493 | saa7146_write(dev, HPS_V_SCALE, 0); // r60 |
494 | saa7146_write(dev, HPS_V_GAIN, 0); // r64 | 494 | saa7146_write(dev, HPS_V_GAIN, 0); // r64 |
495 | saa7146_write(dev, CHROMA_KEY_RANGE, 0); // r74 | 495 | saa7146_write(dev, CHROMA_KEY_RANGE, 0); // r74 |
496 | saa7146_write(dev, CLIP_FORMAT_CTRL, 0); // r78 | 496 | saa7146_write(dev, CLIP_FORMAT_CTRL, 0); // r78 |
497 | // Set HPS prescaler for port B input | 497 | // Set HPS prescaler for port B input |
498 | saa7146_write(dev, HPS_CTRL, (1<<30) | (0<<29) | (1<<28) | (0<<12) ); | 498 | saa7146_write(dev, HPS_CTRL, (1<<30) | (0<<29) | (1<<28) | (0<<12) ); |
499 | saa7146_write(dev, MC2, | 499 | saa7146_write(dev, MC2, |
500 | 0 * (MASK_08 | MASK_24) | // BRS control | 500 | 0 * (MASK_08 | MASK_24) | // BRS control |
501 | 0 * (MASK_09 | MASK_25) | // a | 501 | 0 * (MASK_09 | MASK_25) | // a |
502 | 0 * (MASK_10 | MASK_26) | // b | 502 | 0 * (MASK_10 | MASK_26) | // b |
503 | 1 * (MASK_06 | MASK_22) | // HPS_CTRL1 | 503 | 1 * (MASK_06 | MASK_22) | // HPS_CTRL1 |
504 | 1 * (MASK_05 | MASK_21) | // HPS_CTRL2 | 504 | 1 * (MASK_05 | MASK_21) | // HPS_CTRL2 |
505 | 0 * (MASK_01 | MASK_15) // DEBI | 505 | 0 * (MASK_01 | MASK_15) // DEBI |
506 | ); | 506 | ); |
507 | #endif | 507 | #endif |
508 | // Disable RPS1 and RPS0 | 508 | // Disable RPS1 and RPS0 |
509 | saa7146_write(dev, MC1, ( MASK_29 | MASK_28)); | 509 | saa7146_write(dev, MC1, ( MASK_29 | MASK_28)); |
510 | // RPS1 timeout disable | 510 | // RPS1 timeout disable |
511 | saa7146_write(dev, RPS_TOV1, 0); | 511 | saa7146_write(dev, RPS_TOV1, 0); |
512 | 512 | ||
513 | // code for autodetection | 513 | // code for autodetection |
514 | // will wait for VBI_B event (vertical blank at port B) | 514 | // will wait for VBI_B event (vertical blank at port B) |
@@ -521,38 +521,38 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte | |||
521 | WRITE_RPS1(cpu_to_le32(CMD_UPLOAD | | 521 | WRITE_RPS1(cpu_to_le32(CMD_UPLOAD | |
522 | MASK_10 | MASK_09 | MASK_08 | MASK_06 | MASK_05 | MASK_04 | MASK_03 | MASK_02 )); | 522 | MASK_10 | MASK_09 | MASK_08 | MASK_06 | MASK_05 | MASK_04 | MASK_03 | MASK_02 )); |
523 | #endif | 523 | #endif |
524 | WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_VBI_B)); | 524 | WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_VBI_B)); |
525 | WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2))); | 525 | WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2))); |
526 | WRITE_RPS1(cpu_to_le32(GPIO3_MSK)); | 526 | WRITE_RPS1(cpu_to_le32(GPIO3_MSK)); |
527 | WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24)); | 527 | WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24)); |
528 | #if RPS_IRQ | 528 | #if RPS_IRQ |
529 | // issue RPS1 interrupt to increment counter | 529 | // issue RPS1 interrupt to increment counter |
530 | WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT)); | 530 | WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT)); |
531 | // at least a NOP is neede between two interrupts | 531 | // at least a NOP is neede between two interrupts |
532 | WRITE_RPS1(cpu_to_le32(CMD_NOP)); | 532 | WRITE_RPS1(cpu_to_le32(CMD_NOP)); |
533 | // interrupt again | 533 | // interrupt again |
534 | WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT)); | 534 | WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT)); |
535 | #endif | 535 | #endif |
536 | WRITE_RPS1(cpu_to_le32(CMD_STOP)); | 536 | WRITE_RPS1(cpu_to_le32(CMD_STOP)); |
537 | 537 | ||
538 | #if RPS_IRQ | 538 | #if RPS_IRQ |
539 | // set event counter 1 source as RPS1 interrupt (0x03) (rE4 p53) | 539 | // set event counter 1 source as RPS1 interrupt (0x03) (rE4 p53) |
540 | // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled | 540 | // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled |
541 | // use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called | 541 | // use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called |
542 | saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); | 542 | saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); |
543 | // set event counter 1 treshold to maximum allowed value (rEC p55) | 543 | // set event counter 1 treshold to maximum allowed value (rEC p55) |
544 | saa7146_write(dev, ECT1R, 0x3fff ); | 544 | saa7146_write(dev, ECT1R, 0x3fff ); |
545 | #endif | 545 | #endif |
546 | // Fix VSYNC level | 546 | // Fix VSYNC level |
547 | saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); | 547 | saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); |
548 | // Set RPS1 Address register to point to RPS code (r108 p42) | 548 | // Set RPS1 Address register to point to RPS code (r108 p42) |
549 | saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle); | 549 | saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle); |
550 | // Enable RPS1, (rFC p33) | 550 | // Enable RPS1, (rFC p33) |
551 | saa7146_write(dev, MC1, (MASK_13 | MASK_29 )); | 551 | saa7146_write(dev, MC1, (MASK_13 | MASK_29 )); |
552 | 552 | ||
553 | 553 | ||
554 | mdelay(50); | 554 | mdelay(50); |
555 | saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI); | 555 | saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTHI); |
556 | mdelay(150); | 556 | mdelay(150); |
557 | 557 | ||
558 | 558 | ||
@@ -560,17 +560,17 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte | |||
560 | detected = 1; | 560 | detected = 1; |
561 | 561 | ||
562 | #if RPS_IRQ | 562 | #if RPS_IRQ |
563 | printk("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff ); | 563 | printk("Event Counter 1 0x%04x\n", saa7146_read(dev, EC1R) & 0x3fff ); |
564 | #endif | 564 | #endif |
565 | // Disable RPS1 | 565 | // Disable RPS1 |
566 | saa7146_write(dev, MC1, ( MASK_29 )); | 566 | saa7146_write(dev, MC1, ( MASK_29 )); |
567 | 567 | ||
568 | if(detected == 0) | 568 | if(detected == 0) |
569 | printk("budget-patch not detected or saa7146 in non-default state.\n" | 569 | printk("budget-patch not detected or saa7146 in non-default state.\n" |
570 | "try enabling ressetting of 7146 with MASK_31 in MC1 register\n"); | 570 | "try enabling ressetting of 7146 with MASK_31 in MC1 register\n"); |
571 | 571 | ||
572 | else | 572 | else |
573 | printk("BUDGET-PATCH DETECTED.\n"); | 573 | printk("BUDGET-PATCH DETECTED.\n"); |
574 | 574 | ||
575 | 575 | ||
576 | /* OLD (Original design by Roberto Deza): | 576 | /* OLD (Original design by Roberto Deza): |
@@ -641,83 +641,83 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte | |||
641 | */ | 641 | */ |
642 | 642 | ||
643 | // Setup RPS1 "program" (p35) | 643 | // Setup RPS1 "program" (p35) |
644 | count = 0; | 644 | count = 0; |
645 | 645 | ||
646 | 646 | ||
647 | // Wait Source Line Counter Threshold (p36) | 647 | // Wait Source Line Counter Threshold (p36) |
648 | WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_HS)); | 648 | WRITE_RPS1(cpu_to_le32(CMD_PAUSE | EVT_HS)); |
649 | // Set GPIO3=1 (p42) | 649 | // Set GPIO3=1 (p42) |
650 | WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2))); | 650 | WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2))); |
651 | WRITE_RPS1(cpu_to_le32(GPIO3_MSK)); | 651 | WRITE_RPS1(cpu_to_le32(GPIO3_MSK)); |
652 | WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTHI<<24)); | 652 | WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTHI<<24)); |
653 | #if RPS_IRQ | 653 | #if RPS_IRQ |
654 | // issue RPS1 interrupt | 654 | // issue RPS1 interrupt |
655 | WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT)); | 655 | WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT)); |
656 | #endif | 656 | #endif |
657 | // Wait reset Source Line Counter Threshold (p36) | 657 | // Wait reset Source Line Counter Threshold (p36) |
658 | WRITE_RPS1(cpu_to_le32(CMD_PAUSE | RPS_INV | EVT_HS)); | 658 | WRITE_RPS1(cpu_to_le32(CMD_PAUSE | RPS_INV | EVT_HS)); |
659 | // Set GPIO3=0 (p42) | 659 | // Set GPIO3=0 (p42) |
660 | WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2))); | 660 | WRITE_RPS1(cpu_to_le32(CMD_WR_REG_MASK | (GPIO_CTRL>>2))); |
661 | WRITE_RPS1(cpu_to_le32(GPIO3_MSK)); | 661 | WRITE_RPS1(cpu_to_le32(GPIO3_MSK)); |
662 | WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24)); | 662 | WRITE_RPS1(cpu_to_le32(SAA7146_GPIO_OUTLO<<24)); |
663 | #if RPS_IRQ | 663 | #if RPS_IRQ |
664 | // issue RPS1 interrupt | 664 | // issue RPS1 interrupt |
665 | WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT)); | 665 | WRITE_RPS1(cpu_to_le32(CMD_INTERRUPT)); |
666 | #endif | 666 | #endif |
667 | // Jump to begin of RPS program (p37) | 667 | // Jump to begin of RPS program (p37) |
668 | WRITE_RPS1(cpu_to_le32(CMD_JUMP)); | 668 | WRITE_RPS1(cpu_to_le32(CMD_JUMP)); |
669 | WRITE_RPS1(cpu_to_le32(dev->d_rps1.dma_handle)); | 669 | WRITE_RPS1(cpu_to_le32(dev->d_rps1.dma_handle)); |
670 | |||
671 | // Fix VSYNC level | ||
672 | saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); | ||
673 | // Set RPS1 Address register to point to RPS code (r108 p42) | ||
674 | saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle); | ||
675 | // Set Source Line Counter Threshold, using BRS (rCC p43) | ||
676 | // It generates HS event every TS_HEIGHT lines | ||
677 | // this is related to TS_WIDTH set in register | ||
678 | // NUM_LINE_BYTE3 in budget-core.c. If NUM_LINE_BYTE | ||
679 | // low 16 bits are set to TS_WIDTH bytes (TS_WIDTH=2*188 | ||
680 | //,then RPS_THRESH1 | ||
681 | // should be set to trigger every TS_HEIGHT (512) lines. | ||
682 | // | ||
683 | saa7146_write(dev, RPS_THRESH1, (TS_HEIGHT*1) | MASK_12 ); | ||
684 | 670 | ||
685 | // saa7146_write(dev, RPS_THRESH0, ((TS_HEIGHT/2)<<16) |MASK_28| (TS_HEIGHT/2) |MASK_12 ); | 671 | // Fix VSYNC level |
686 | // Enable RPS1 (rFC p33) | 672 | saa7146_setgpio(dev, 3, SAA7146_GPIO_OUTLO); |
687 | saa7146_write(dev, MC1, (MASK_13 | MASK_29)); | 673 | // Set RPS1 Address register to point to RPS code (r108 p42) |
688 | 674 | saa7146_write(dev, RPS_ADDR1, dev->d_rps1.dma_handle); | |
689 | 675 | // Set Source Line Counter Threshold, using BRS (rCC p43) | |
690 | if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL))) | 676 | // It generates HS event every TS_HEIGHT lines |
691 | return -ENOMEM; | 677 | // this is related to TS_WIDTH set in register |
678 | // NUM_LINE_BYTE3 in budget-core.c. If NUM_LINE_BYTE | ||
679 | // low 16 bits are set to TS_WIDTH bytes (TS_WIDTH=2*188 | ||
680 | //,then RPS_THRESH1 | ||
681 | // should be set to trigger every TS_HEIGHT (512) lines. | ||
682 | // | ||
683 | saa7146_write(dev, RPS_THRESH1, (TS_HEIGHT*1) | MASK_12 ); | ||
684 | |||
685 | // saa7146_write(dev, RPS_THRESH0, ((TS_HEIGHT/2)<<16) |MASK_28| (TS_HEIGHT/2) |MASK_12 ); | ||
686 | // Enable RPS1 (rFC p33) | ||
687 | saa7146_write(dev, MC1, (MASK_13 | MASK_29)); | ||
688 | |||
689 | |||
690 | if (!(budget = kmalloc (sizeof(struct budget_patch), GFP_KERNEL))) | ||
691 | return -ENOMEM; | ||
692 | 692 | ||
693 | dprintk(2, "budget: %p\n", budget); | 693 | dprintk(2, "budget: %p\n", budget); |
694 | 694 | ||
695 | if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) { | 695 | if ((err = ttpci_budget_init (budget, dev, info, THIS_MODULE))) { |
696 | kfree (budget); | 696 | kfree (budget); |
697 | return err; | 697 | return err; |
698 | } | 698 | } |
699 | 699 | ||
700 | 700 | ||
701 | dev->ext_priv = budget; | 701 | dev->ext_priv = budget; |
702 | 702 | ||
703 | budget->dvb_adapter.priv = budget; | 703 | budget->dvb_adapter.priv = budget; |
704 | frontend_init(budget); | 704 | frontend_init(budget); |
705 | 705 | ||
706 | return 0; | 706 | return 0; |
707 | } | 707 | } |
708 | 708 | ||
709 | static int budget_patch_detach (struct saa7146_dev* dev) | 709 | static int budget_patch_detach (struct saa7146_dev* dev) |
710 | { | 710 | { |
711 | struct budget_patch *budget = (struct budget_patch*) dev->ext_priv; | 711 | struct budget_patch *budget = (struct budget_patch*) dev->ext_priv; |
712 | int err; | 712 | int err; |
713 | 713 | ||
714 | if (budget->dvb_frontend) dvb_unregister_frontend(budget->dvb_frontend); | 714 | if (budget->dvb_frontend) dvb_unregister_frontend(budget->dvb_frontend); |
715 | 715 | ||
716 | err = ttpci_budget_deinit (budget); | 716 | err = ttpci_budget_deinit (budget); |
717 | 717 | ||
718 | kfree (budget); | 718 | kfree (budget); |
719 | 719 | ||
720 | return err; | 720 | return err; |
721 | } | 721 | } |
722 | 722 | ||
723 | static int __init budget_patch_init(void) | 723 | static int __init budget_patch_init(void) |
@@ -727,20 +727,20 @@ static int __init budget_patch_init(void) | |||
727 | 727 | ||
728 | static void __exit budget_patch_exit(void) | 728 | static void __exit budget_patch_exit(void) |
729 | { | 729 | { |
730 | saa7146_unregister_extension(&budget_extension); | 730 | saa7146_unregister_extension(&budget_extension); |
731 | } | 731 | } |
732 | 732 | ||
733 | static struct saa7146_extension budget_extension = { | 733 | static struct saa7146_extension budget_extension = { |
734 | .name = "budget_patch dvb\0", | 734 | .name = "budget_patch dvb\0", |
735 | .flags = 0, | 735 | .flags = 0, |
736 | 736 | ||
737 | .module = THIS_MODULE, | 737 | .module = THIS_MODULE, |
738 | .pci_tbl = pci_tbl, | 738 | .pci_tbl = pci_tbl, |
739 | .attach = budget_patch_attach, | 739 | .attach = budget_patch_attach, |
740 | .detach = budget_patch_detach, | 740 | .detach = budget_patch_detach, |
741 | 741 | ||
742 | .irq_mask = MASK_10, | 742 | .irq_mask = MASK_10, |
743 | .irq_func = ttpci_budget_irq10_handler, | 743 | .irq_func = ttpci_budget_irq10_handler, |
744 | }; | 744 | }; |
745 | 745 | ||
746 | module_init(budget_patch_init); | 746 | module_init(budget_patch_init); |
@@ -749,4 +749,4 @@ module_exit(budget_patch_exit); | |||
749 | MODULE_LICENSE("GPL"); | 749 | MODULE_LICENSE("GPL"); |
750 | MODULE_AUTHOR("Emard, Roberto Deza, Holger Waechtler, Michael Hunold, others"); | 750 | MODULE_AUTHOR("Emard, Roberto Deza, Holger Waechtler, Michael Hunold, others"); |
751 | MODULE_DESCRIPTION("Driver for full TS modified DVB-S SAA7146+AV7110 " | 751 | MODULE_DESCRIPTION("Driver for full TS modified DVB-S SAA7146+AV7110 " |
752 | "based so-called Budget Patch cards"); | 752 | "based so-called Budget Patch cards"); |
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c index bc4ce7559cbe..fafe6407b3d0 100644 --- a/drivers/media/dvb/ttpci/budget.c +++ b/drivers/media/dvb/ttpci/budget.c | |||
@@ -256,7 +256,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param | |||
256 | buf[2] = ((div & 0x18000) >> 10) | 0x95; | 256 | buf[2] = ((div & 0x18000) >> 10) | 0x95; |
257 | buf[3] = (pwr << 6) | 0x30; | 257 | buf[3] = (pwr << 6) | 0x30; |
258 | 258 | ||
259 | // NOTE: since we're using a prescaler of 2, we set the | 259 | // NOTE: since we're using a prescaler of 2, we set the |
260 | // divisor frequency to 62.5kHz and divide by 125 above | 260 | // divisor frequency to 62.5kHz and divide by 125 above |
261 | 261 | ||
262 | if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO; | 262 | if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO; |
@@ -565,7 +565,7 @@ static u8 read_pwm(struct budget* budget) | |||
565 | struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 }, | 565 | struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 }, |
566 | { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} }; | 566 | { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} }; |
567 | 567 | ||
568 | if ((i2c_transfer(&budget->i2c_adap, msg, 2) != 2) || (pwm == 0xff)) | 568 | if ((i2c_transfer(&budget->i2c_adap, msg, 2) != 2) || (pwm == 0xff)) |
569 | pwm = 0x48; | 569 | pwm = 0x48; |
570 | 570 | ||
571 | return pwm; | 571 | return pwm; |
@@ -593,7 +593,7 @@ static void frontend_init(struct budget *budget) | |||
593 | budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap); | 593 | budget->dvb_frontend = ves1x93_attach(&alps_bsrv2_config, &budget->i2c_adap); |
594 | if (budget->dvb_frontend) { | 594 | if (budget->dvb_frontend) { |
595 | budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd; | 595 | budget->dvb_frontend->ops->diseqc_send_master_cmd = budget_diseqc_send_master_cmd; |
596 | budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst; | 596 | budget->dvb_frontend->ops->diseqc_send_burst = budget_diseqc_send_burst; |
597 | budget->dvb_frontend->ops->set_tone = budget_set_tone; | 597 | budget->dvb_frontend->ops->set_tone = budget_set_tone; |
598 | break; | 598 | break; |
599 | } | 599 | } |
diff --git a/drivers/media/dvb/ttpci/budget.h b/drivers/media/dvb/ttpci/budget.h index c6ef496ba70a..fdaa3318ad3a 100644 --- a/drivers/media/dvb/ttpci/budget.h +++ b/drivers/media/dvb/ttpci/budget.h | |||
@@ -19,7 +19,7 @@ extern int budget_debug; | |||
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | #define dprintk(level,args...) \ | 21 | #define dprintk(level,args...) \ |
22 | do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0) | 22 | do { if ((budget_debug & level)) { printk("%s: %s(): ",__stringify(KBUILD_MODNAME), __FUNCTION__); printk(args); } } while (0) |
23 | 23 | ||
24 | struct budget_info { | 24 | struct budget_info { |
25 | char *name; | 25 | char *name; |
diff --git a/drivers/media/dvb/ttpci/fdump.c b/drivers/media/dvb/ttpci/fdump.c index 0b478db3e744..c90001d35e7d 100644 --- a/drivers/media/dvb/ttpci/fdump.c +++ b/drivers/media/dvb/ttpci/fdump.c | |||
@@ -36,7 +36,7 @@ int main(int argc, char **argv) | |||
36 | } | 36 | } |
37 | 37 | ||
38 | fprintf(fd_out, "\n};\n\n"); | 38 | fprintf(fd_out, "\n};\n\n"); |
39 | 39 | ||
40 | fclose(fd_in); | 40 | fclose(fd_in); |
41 | fclose(fd_out); | 41 | fclose(fd_out); |
42 | 42 | ||
diff --git a/drivers/media/dvb/ttpci/ttpci-eeprom.c b/drivers/media/dvb/ttpci/ttpci-eeprom.c index ac79ef178c05..18aa22b5478d 100644 --- a/drivers/media/dvb/ttpci/ttpci-eeprom.c +++ b/drivers/media/dvb/ttpci/ttpci-eeprom.c | |||
@@ -13,7 +13,7 @@ | |||
13 | Holger Waechtler Convergence | 13 | Holger Waechtler Convergence |
14 | 14 | ||
15 | Copyright (C) 2002-2003 Ralph Metzler <rjkm@metzlerbros.de> | 15 | Copyright (C) 2002-2003 Ralph Metzler <rjkm@metzlerbros.de> |
16 | Metzler Brothers Systementwicklung GbR | 16 | Metzler Brothers Systementwicklung GbR |
17 | 17 | ||
18 | This program is free software; you can redistribute it and/or modify | 18 | This program is free software; you can redistribute it and/or modify |
19 | it under the terms of the GNU General Public License as published by | 19 | it under the terms of the GNU General Public License as published by |
@@ -48,41 +48,41 @@ | |||
48 | 48 | ||
49 | static int check_mac_tt(u8 *buf) | 49 | static int check_mac_tt(u8 *buf) |
50 | { | 50 | { |
51 | int i; | 51 | int i; |
52 | u16 tmp = 0xffff; | 52 | u16 tmp = 0xffff; |
53 | 53 | ||
54 | for (i = 0; i < 8; i++) { | 54 | for (i = 0; i < 8; i++) { |
55 | tmp = (tmp << 8) | ((tmp >> 8) ^ buf[i]); | 55 | tmp = (tmp << 8) | ((tmp >> 8) ^ buf[i]); |
56 | tmp ^= (tmp >> 4) & 0x0f; | 56 | tmp ^= (tmp >> 4) & 0x0f; |
57 | tmp ^= (tmp << 12) ^ ((tmp & 0xff) << 5); | 57 | tmp ^= (tmp << 12) ^ ((tmp & 0xff) << 5); |
58 | } | 58 | } |
59 | tmp ^= 0xffff; | 59 | tmp ^= 0xffff; |
60 | return (((tmp >> 8) ^ buf[8]) | ((tmp & 0xff) ^ buf[9])); | 60 | return (((tmp >> 8) ^ buf[8]) | ((tmp & 0xff) ^ buf[9])); |
61 | } | 61 | } |
62 | 62 | ||
63 | static int getmac_tt(u8 * decodedMAC, u8 * encodedMAC) | 63 | static int getmac_tt(u8 * decodedMAC, u8 * encodedMAC) |
64 | { | 64 | { |
65 | u8 xor[20] = { 0x72, 0x23, 0x68, 0x19, 0x5c, 0xa8, 0x71, 0x2c, | 65 | u8 xor[20] = { 0x72, 0x23, 0x68, 0x19, 0x5c, 0xa8, 0x71, 0x2c, |
66 | 0x54, 0xd3, 0x7b, 0xf1, 0x9E, 0x23, 0x16, 0xf6, | 66 | 0x54, 0xd3, 0x7b, 0xf1, 0x9E, 0x23, 0x16, 0xf6, |
67 | 0x1d, 0x36, 0x64, 0x78}; | 67 | 0x1d, 0x36, 0x64, 0x78}; |
68 | u8 data[20]; | 68 | u8 data[20]; |
69 | int i; | 69 | int i; |
70 | 70 | ||
71 | /* In case there is a sig check failure have the orig contents available */ | 71 | /* In case there is a sig check failure have the orig contents available */ |
72 | memcpy(data, encodedMAC, 20); | 72 | memcpy(data, encodedMAC, 20); |
73 | 73 | ||
74 | for (i = 0; i < 20; i++) | 74 | for (i = 0; i < 20; i++) |
75 | data[i] ^= xor[i]; | 75 | data[i] ^= xor[i]; |
76 | for (i = 0; i < 10; i++) | 76 | for (i = 0; i < 10; i++) |
77 | data[i] = ((data[2 * i + 1] << 8) | data[2 * i]) | 77 | data[i] = ((data[2 * i + 1] << 8) | data[2 * i]) |
78 | >> ((data[2 * i + 1] >> 6) & 3); | 78 | >> ((data[2 * i + 1] >> 6) & 3); |
79 | 79 | ||
80 | if (check_mac_tt(data)) | 80 | if (check_mac_tt(data)) |
81 | return -ENODEV; | 81 | return -ENODEV; |
82 | 82 | ||
83 | decodedMAC[0] = data[2]; decodedMAC[1] = data[1]; decodedMAC[2] = data[0]; | 83 | decodedMAC[0] = data[2]; decodedMAC[1] = data[1]; decodedMAC[2] = data[0]; |
84 | decodedMAC[3] = data[6]; decodedMAC[4] = data[5]; decodedMAC[5] = data[4]; | 84 | decodedMAC[3] = data[6]; decodedMAC[4] = data[5]; decodedMAC[5] = data[4]; |
85 | return 0; | 85 | return 0; |
86 | } | 86 | } |
87 | 87 | ||
88 | static int ttpci_eeprom_read_encodedMAC(struct i2c_adapter *adapter, u8 * encodedMAC) | 88 | static int ttpci_eeprom_read_encodedMAC(struct i2c_adapter *adapter, u8 * encodedMAC) |
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c index fd53d6010502..104df610dbe1 100644 --- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c +++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c | |||
@@ -225,8 +225,8 @@ static int ttusb_i2c_msg(struct ttusb *ttusb, | |||
225 | 225 | ||
226 | err = ttusb_result(ttusb, b, 0x20); | 226 | err = ttusb_result(ttusb, b, 0x20); |
227 | 227 | ||
228 | /* check if the i2c transaction was successful */ | 228 | /* check if the i2c transaction was successful */ |
229 | if ((snd_len != b[5]) || (rcv_len != b[6])) return -EREMOTEIO; | 229 | if ((snd_len != b[5]) || (rcv_len != b[6])) return -EREMOTEIO; |
230 | 230 | ||
231 | if (rcv_len > 0) { | 231 | if (rcv_len > 0) { |
232 | 232 | ||
@@ -489,27 +489,27 @@ static int ttusb_send_diseqc(struct dvb_frontend* fe, | |||
489 | 489 | ||
490 | static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage) | 490 | static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage) |
491 | { | 491 | { |
492 | struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv; | 492 | struct ttusb* ttusb = (struct ttusb*) fe->dvb->priv; |
493 | int ret; | 493 | int ret; |
494 | u8 data[1]; | 494 | u8 data[1]; |
495 | struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = data, .len = sizeof(data) }; | 495 | struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = data, .len = sizeof(data) }; |
496 | 496 | ||
497 | switch(voltage) { | 497 | switch(voltage) { |
498 | case SEC_VOLTAGE_OFF: | 498 | case SEC_VOLTAGE_OFF: |
499 | data[0] = 0x00; | 499 | data[0] = 0x00; |
500 | break; | 500 | break; |
501 | case SEC_VOLTAGE_13: | 501 | case SEC_VOLTAGE_13: |
502 | data[0] = 0x44; | 502 | data[0] = 0x44; |
503 | break; | 503 | break; |
504 | case SEC_VOLTAGE_18: | 504 | case SEC_VOLTAGE_18: |
505 | data[0] = 0x4c; | 505 | data[0] = 0x4c; |
506 | break; | 506 | break; |
507 | default: | 507 | default: |
508 | return -EINVAL; | 508 | return -EINVAL; |
509 | }; | 509 | }; |
510 | 510 | ||
511 | ret = i2c_transfer(&ttusb->i2c_adap, &msg, 1); | 511 | ret = i2c_transfer(&ttusb->i2c_adap, &msg, 1); |
512 | return (ret != 1) ? -EIO : 0; | 512 | return (ret != 1) ? -EIO : 0; |
513 | } | 513 | } |
514 | 514 | ||
515 | static int ttusb_update_lnb(struct ttusb *ttusb) | 515 | static int ttusb_update_lnb(struct ttusb *ttusb) |
@@ -1184,45 +1184,45 @@ static struct tda1004x_config philips_tdm1316l_config = { | |||
1184 | }; | 1184 | }; |
1185 | 1185 | ||
1186 | static u8 alps_bsbe1_inittab[] = { | 1186 | static u8 alps_bsbe1_inittab[] = { |
1187 | 0x01, 0x15, | 1187 | 0x01, 0x15, |
1188 | 0x02, 0x30, | 1188 | 0x02, 0x30, |
1189 | 0x03, 0x00, | 1189 | 0x03, 0x00, |
1190 | 0x04, 0x7d, /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */ | 1190 | 0x04, 0x7d, /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */ |
1191 | 0x05, 0x35, /* I2CT = 0, SCLT = 1, SDAT = 1 */ | 1191 | 0x05, 0x35, /* I2CT = 0, SCLT = 1, SDAT = 1 */ |
1192 | 0x06, 0x40, /* DAC not used, set to high impendance mode */ | 1192 | 0x06, 0x40, /* DAC not used, set to high impendance mode */ |
1193 | 0x07, 0x00, /* DAC LSB */ | 1193 | 0x07, 0x00, /* DAC LSB */ |
1194 | 0x08, 0x40, /* DiSEqC off, LNB power on OP2/LOCK pin on */ | 1194 | 0x08, 0x40, /* DiSEqC off, LNB power on OP2/LOCK pin on */ |
1195 | 0x09, 0x00, /* FIFO */ | 1195 | 0x09, 0x00, /* FIFO */ |
1196 | 0x0c, 0x51, /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */ | 1196 | 0x0c, 0x51, /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */ |
1197 | 0x0d, 0x82, /* DC offset compensation = ON, beta_agc1 = 2 */ | 1197 | 0x0d, 0x82, /* DC offset compensation = ON, beta_agc1 = 2 */ |
1198 | 0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */ | 1198 | 0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */ |
1199 | 0x10, 0x3f, // AGC2 0x3d | 1199 | 0x10, 0x3f, // AGC2 0x3d |
1200 | 0x11, 0x84, | 1200 | 0x11, 0x84, |
1201 | 0x12, 0xb9, | 1201 | 0x12, 0xb9, |
1202 | 0x15, 0xc9, // lock detector threshold | 1202 | 0x15, 0xc9, // lock detector threshold |
1203 | 0x16, 0x00, | 1203 | 0x16, 0x00, |
1204 | 0x17, 0x00, | 1204 | 0x17, 0x00, |
1205 | 0x18, 0x00, | 1205 | 0x18, 0x00, |
1206 | 0x19, 0x00, | 1206 | 0x19, 0x00, |
1207 | 0x1a, 0x00, | 1207 | 0x1a, 0x00, |
1208 | 0x1f, 0x50, | 1208 | 0x1f, 0x50, |
1209 | 0x20, 0x00, | 1209 | 0x20, 0x00, |
1210 | 0x21, 0x00, | 1210 | 0x21, 0x00, |
1211 | 0x22, 0x00, | 1211 | 0x22, 0x00, |
1212 | 0x23, 0x00, | 1212 | 0x23, 0x00, |
1213 | 0x28, 0x00, // out imp: normal out type: parallel FEC mode:0 | 1213 | 0x28, 0x00, // out imp: normal out type: parallel FEC mode:0 |
1214 | 0x29, 0x1e, // 1/2 threshold | 1214 | 0x29, 0x1e, // 1/2 threshold |
1215 | 0x2a, 0x14, // 2/3 threshold | 1215 | 0x2a, 0x14, // 2/3 threshold |
1216 | 0x2b, 0x0f, // 3/4 threshold | 1216 | 0x2b, 0x0f, // 3/4 threshold |
1217 | 0x2c, 0x09, // 5/6 threshold | 1217 | 0x2c, 0x09, // 5/6 threshold |
1218 | 0x2d, 0x05, // 7/8 threshold | 1218 | 0x2d, 0x05, // 7/8 threshold |
1219 | 0x2e, 0x01, | 1219 | 0x2e, 0x01, |
1220 | 0x31, 0x1f, // test all FECs | 1220 | 0x31, 0x1f, // test all FECs |
1221 | 0x32, 0x19, // viterbi and synchro search | 1221 | 0x32, 0x19, // viterbi and synchro search |
1222 | 0x33, 0xfc, // rs control | 1222 | 0x33, 0xfc, // rs control |
1223 | 0x34, 0x93, // error control | 1223 | 0x34, 0x93, // error control |
1224 | 0x0f, 0x92, | 1224 | 0x0f, 0x92, |
1225 | 0xff, 0xff | 1225 | 0xff, 0xff |
1226 | }; | 1226 | }; |
1227 | 1227 | ||
1228 | static u8 alps_bsru6_inittab[] = { | 1228 | static u8 alps_bsru6_inittab[] = { |
@@ -1350,7 +1350,7 @@ static int ttusb_novas_grundig_29504_491_pll_set(struct dvb_frontend *fe, struct | |||
1350 | u32 div; | 1350 | u32 div; |
1351 | struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) }; | 1351 | struct i2c_msg msg = {.addr = 0x61,.flags = 0,.buf = buf,.len = sizeof(buf) }; |
1352 | 1352 | ||
1353 | div = params->frequency / 125; | 1353 | div = params->frequency / 125; |
1354 | 1354 | ||
1355 | buf[0] = (div >> 8) & 0x7f; | 1355 | buf[0] = (div >> 8) & 0x7f; |
1356 | buf[1] = div & 0xff; | 1356 | buf[1] = div & 0xff; |
@@ -1487,7 +1487,7 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i | |||
1487 | 1487 | ||
1488 | udev = interface_to_usbdev(intf); | 1488 | udev = interface_to_usbdev(intf); |
1489 | 1489 | ||
1490 | if (intf->altsetting->desc.bInterfaceNumber != 1) return -ENODEV; | 1490 | if (intf->altsetting->desc.bInterfaceNumber != 1) return -ENODEV; |
1491 | 1491 | ||
1492 | if (!(ttusb = kmalloc(sizeof(struct ttusb), GFP_KERNEL))) | 1492 | if (!(ttusb = kmalloc(sizeof(struct ttusb), GFP_KERNEL))) |
1493 | return -ENOMEM; | 1493 | return -ENOMEM; |
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h b/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h index 95ee7995455e..8c3cd545e8f4 100644 --- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h +++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-dspbootcode.h | |||
@@ -2,1643 +2,1643 @@ | |||
2 | #include <asm/types.h> | 2 | #include <asm/types.h> |
3 | 3 | ||
4 | static u8 dsp_bootcode [] = { | 4 | static u8 dsp_bootcode [] = { |
5 | 0x08, 0xaa, 0x00, 0x18, 0x00, 0x03, 0x08, 0x00, | 5 | 0x08, 0xaa, 0x00, 0x18, 0x00, 0x03, 0x08, 0x00, |
6 | 0x00, 0x10, 0x00, 0x00, 0x01, 0x80, 0x18, 0x5f, | 6 | 0x00, 0x10, 0x00, 0x00, 0x01, 0x80, 0x18, 0x5f, |
7 | 0x00, 0x00, 0x01, 0x80, 0x77, 0x18, 0x2a, 0xeb, | 7 | 0x00, 0x00, 0x01, 0x80, 0x77, 0x18, 0x2a, 0xeb, |
8 | 0x6b, 0xf8, 0x00, 0x18, 0x03, 0xff, 0x68, 0xf8, | 8 | 0x6b, 0xf8, 0x00, 0x18, 0x03, 0xff, 0x68, 0xf8, |
9 | 0x00, 0x18, 0xff, 0xfe, 0xf7, 0xb8, 0xf7, 0xbe, | 9 | 0x00, 0x18, 0xff, 0xfe, 0xf7, 0xb8, 0xf7, 0xbe, |
10 | 0xf6, 0xb9, 0xf4, 0xa0, 0xf6, 0xb7, 0xf6, 0xb5, | 10 | 0xf6, 0xb9, 0xf4, 0xa0, 0xf6, 0xb7, 0xf6, 0xb5, |
11 | 0xf6, 0xb6, 0xf0, 0x20, 0x19, 0xdf, 0xf1, 0x00, | 11 | 0xf6, 0xb6, 0xf0, 0x20, 0x19, 0xdf, 0xf1, 0x00, |
12 | 0x00, 0x01, 0xf8, 0x4d, 0x01, 0xab, 0xf6, 0xb8, | 12 | 0x00, 0x01, 0xf8, 0x4d, 0x01, 0xab, 0xf6, 0xb8, |
13 | 0xf0, 0x20, 0x19, 0xdf, 0xf0, 0x73, 0x01, 0xa5, | 13 | 0xf0, 0x20, 0x19, 0xdf, 0xf0, 0x73, 0x01, 0xa5, |
14 | 0x7e, 0xf8, 0x00, 0x12, 0xf0, 0x00, 0x00, 0x01, | 14 | 0x7e, 0xf8, 0x00, 0x12, 0xf0, 0x00, 0x00, 0x01, |
15 | 0x47, 0xf8, 0x00, 0x11, 0x7e, 0x92, 0x00, 0xf8, | 15 | 0x47, 0xf8, 0x00, 0x11, 0x7e, 0x92, 0x00, 0xf8, |
16 | 0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x7e, 0xf8, | 16 | 0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x7e, 0xf8, |
17 | 0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x6c, 0x89, | 17 | 0x00, 0x11, 0xf0, 0x00, 0x00, 0x01, 0x6c, 0x89, |
18 | 0x01, 0x9a, 0xf7, 0xb8, 0xee, 0xfc, 0xf0, 0x20, | 18 | 0x01, 0x9a, 0xf7, 0xb8, 0xee, 0xfc, 0xf0, 0x20, |
19 | 0xff, 0xff, 0xf1, 0x00, 0x00, 0x01, 0xf8, 0x4d, | 19 | 0xff, 0xff, 0xf1, 0x00, 0x00, 0x01, 0xf8, 0x4d, |
20 | 0x01, 0xbf, 0xf2, 0x73, 0x01, 0xb9, 0x4e, 0x02, | 20 | 0x01, 0xbf, 0xf2, 0x73, 0x01, 0xb9, 0x4e, 0x02, |
21 | 0xf4, 0x95, 0xf5, 0xe3, 0x56, 0x02, 0x7e, 0x00, | 21 | 0xf4, 0x95, 0xf5, 0xe3, 0x56, 0x02, 0x7e, 0x00, |
22 | 0x11, 0x00, 0xfa, 0x4c, 0x01, 0xb7, 0x6b, 0x03, | 22 | 0x11, 0x00, 0xfa, 0x4c, 0x01, 0xb7, 0x6b, 0x03, |
23 | 0x00, 0x01, 0xf6, 0xb8, 0xee, 0x04, 0xf0, 0x74, | 23 | 0x00, 0x01, 0xf6, 0xb8, 0xee, 0x04, 0xf0, 0x74, |
24 | 0x0d, 0xa7, 0xf0, 0x74, 0x01, 0xc5, 0x4a, 0x11, | 24 | 0x0d, 0xa7, 0xf0, 0x74, 0x01, 0xc5, 0x4a, 0x11, |
25 | 0x4a, 0x16, 0x72, 0x11, 0x2a, 0xe6, 0x10, 0xf8, | 25 | 0x4a, 0x16, 0x72, 0x11, 0x2a, 0xe6, 0x10, 0xf8, |
26 | 0x00, 0x11, 0xfa, 0x45, 0x01, 0xdb, 0xf4, 0x95, | 26 | 0x00, 0x11, 0xfa, 0x45, 0x01, 0xdb, 0xf4, 0x95, |
27 | 0xee, 0xff, 0x48, 0x11, 0xf0, 0x00, 0x2a, 0xc6, | 27 | 0xee, 0xff, 0x48, 0x11, 0xf0, 0x00, 0x2a, 0xc6, |
28 | 0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0xee, | 28 | 0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0xee, |
29 | 0xff, 0xff, 0xf4, 0xe3, 0x6c, 0xe9, 0xff, 0xff, | 29 | 0xff, 0xff, 0xf4, 0xe3, 0x6c, 0xe9, 0xff, 0xff, |
30 | 0x01, 0xd5, 0x10, 0xf8, 0x2a, 0xe7, 0xf8, 0x45, | 30 | 0x01, 0xd5, 0x10, 0xf8, 0x2a, 0xe7, 0xf8, 0x45, |
31 | 0x01, 0xe2, 0x10, 0xf8, 0x2a, 0xe7, 0xf4, 0xe3, | 31 | 0x01, 0xe2, 0x10, 0xf8, 0x2a, 0xe7, 0xf4, 0xe3, |
32 | 0xf0, 0x74, 0x01, 0xff, 0xee, 0x01, 0x8a, 0x16, | 32 | 0xf0, 0x74, 0x01, 0xff, 0xee, 0x01, 0x8a, 0x16, |
33 | 0x8a, 0x11, 0xfc, 0x00, 0xf7, 0xb8, 0xe9, 0x20, | 33 | 0x8a, 0x11, 0xfc, 0x00, 0xf7, 0xb8, 0xe9, 0x20, |
34 | 0x4a, 0x11, 0x09, 0xf8, 0x2a, 0xe6, 0xf8, 0x4e, | 34 | 0x4a, 0x11, 0x09, 0xf8, 0x2a, 0xe6, 0xf8, 0x4e, |
35 | 0x01, 0xf3, 0xf2, 0x73, 0x01, 0xfd, 0xf4, 0x95, | 35 | 0x01, 0xf3, 0xf2, 0x73, 0x01, 0xfd, 0xf4, 0x95, |
36 | 0xe8, 0x01, 0x72, 0x11, 0x2a, 0xe6, 0x49, 0x11, | 36 | 0xe8, 0x01, 0x72, 0x11, 0x2a, 0xe6, 0x49, 0x11, |
37 | 0x80, 0xe1, 0x2a, 0xc6, 0xf3, 0x00, 0x00, 0x01, | 37 | 0x80, 0xe1, 0x2a, 0xc6, 0xf3, 0x00, 0x00, 0x01, |
38 | 0xe8, 0x00, 0x81, 0xf8, 0x2a, 0xe6, 0x8a, 0x11, | 38 | 0xe8, 0x00, 0x81, 0xf8, 0x2a, 0xe6, 0x8a, 0x11, |
39 | 0xfc, 0x00, 0xf4, 0x95, 0xf0, 0x73, 0x02, 0x00, | 39 | 0xfc, 0x00, 0xf4, 0x95, 0xf0, 0x73, 0x02, 0x00, |
40 | 0x10, 0xf8, 0x2a, 0x0f, 0xfc, 0x00, 0x4a, 0x11, | 40 | 0x10, 0xf8, 0x2a, 0x0f, 0xfc, 0x00, 0x4a, 0x11, |
41 | 0xf0, 0x74, 0x02, 0x02, 0x80, 0xf8, 0x2a, 0x10, | 41 | 0xf0, 0x74, 0x02, 0x02, 0x80, 0xf8, 0x2a, 0x10, |
42 | 0x73, 0x08, 0x00, 0x09, 0x40, 0xf8, 0x2a, 0x15, | 42 | 0x73, 0x08, 0x00, 0x09, 0x40, 0xf8, 0x2a, 0x15, |
43 | 0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10, | 43 | 0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10, |
44 | 0x03, 0xe8, 0xf5, 0xa9, 0xf8, 0x30, 0x02, 0x21, | 44 | 0x03, 0xe8, 0xf5, 0xa9, 0xf8, 0x30, 0x02, 0x21, |
45 | 0x71, 0xf8, 0x2a, 0x10, 0x2a, 0x15, 0x56, 0xf8, | 45 | 0x71, 0xf8, 0x2a, 0x10, 0x2a, 0x15, 0x56, 0xf8, |
46 | 0x2a, 0x0c, 0xf0, 0xe3, 0x4e, 0xf8, 0x2a, 0x16, | 46 | 0x2a, 0x0c, 0xf0, 0xe3, 0x4e, 0xf8, 0x2a, 0x16, |
47 | 0xe8, 0x00, 0x4e, 0xf8, 0x2a, 0x0c, 0x8a, 0x11, | 47 | 0xe8, 0x00, 0x4e, 0xf8, 0x2a, 0x0c, 0x8a, 0x11, |
48 | 0xfc, 0x00, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, | 48 | 0xfc, 0x00, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, |
49 | 0x68, 0xf8, 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, | 49 | 0x68, 0xf8, 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, |
50 | 0x00, 0x07, 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, | 50 | 0x00, 0x07, 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, |
51 | 0xff, 0xfc, 0x6b, 0xf8, 0x2a, 0x0f, 0x00, 0x01, | 51 | 0xff, 0xfc, 0x6b, 0xf8, 0x2a, 0x0f, 0x00, 0x01, |
52 | 0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x06, 0xf4, 0xeb, | 52 | 0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x06, 0xf4, 0xeb, |
53 | 0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x0f, 0x00, 0x00, | 53 | 0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x0f, 0x00, 0x00, |
54 | 0x76, 0x00, 0x00, 0x00, 0xfb, 0x80, 0x19, 0x4c, | 54 | 0x76, 0x00, 0x00, 0x00, 0xfb, 0x80, 0x19, 0x4c, |
55 | 0xf4, 0x95, 0xe8, 0x00, 0x80, 0xf8, 0x2a, 0x11, | 55 | 0xf4, 0x95, 0xe8, 0x00, 0x80, 0xf8, 0x2a, 0x11, |
56 | 0xf9, 0x80, 0x19, 0x07, 0x80, 0xf8, 0x2a, 0x0e, | 56 | 0xf9, 0x80, 0x19, 0x07, 0x80, 0xf8, 0x2a, 0x0e, |
57 | 0xf9, 0x80, 0x16, 0x66, 0x76, 0x00, 0x2a, 0x12, | 57 | 0xf9, 0x80, 0x16, 0x66, 0x76, 0x00, 0x2a, 0x12, |
58 | 0x10, 0xf8, 0x2a, 0x11, 0xf9, 0x80, 0x18, 0xe3, | 58 | 0x10, 0xf8, 0x2a, 0x11, 0xf9, 0x80, 0x18, 0xe3, |
59 | 0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x66, | 59 | 0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x66, |
60 | 0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x87, | 60 | 0x10, 0xf8, 0x2a, 0x0e, 0xf9, 0x80, 0x16, 0x87, |
61 | 0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf6, 0xb8, | 61 | 0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf6, 0xb8, |
62 | 0xf4, 0x95, 0xf0, 0x20, 0x80, 0x00, 0x11, 0xf8, | 62 | 0xf4, 0x95, 0xf0, 0x20, 0x80, 0x00, 0x11, 0xf8, |
63 | 0x2a, 0x5a, 0xf8, 0x4d, 0x02, 0x93, 0x11, 0xf8, | 63 | 0x2a, 0x5a, 0xf8, 0x4d, 0x02, 0x93, 0x11, 0xf8, |
64 | 0x2a, 0x9f, 0xf8, 0x4c, 0x02, 0x7c, 0x77, 0x12, | 64 | 0x2a, 0x9f, 0xf8, 0x4c, 0x02, 0x7c, 0x77, 0x12, |
65 | 0x2a, 0x39, 0x49, 0x12, 0x01, 0xf8, 0x2a, 0x9f, | 65 | 0x2a, 0x39, 0x49, 0x12, 0x01, 0xf8, 0x2a, 0x9f, |
66 | 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81, | 66 | 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81, |
67 | 0x00, 0x11, 0x6c, 0xe1, 0xff, 0xab, 0x02, 0x93, | 67 | 0x00, 0x11, 0x6c, 0xe1, 0xff, 0xab, 0x02, 0x93, |
68 | 0x6b, 0xf8, 0x2a, 0x9f, 0x00, 0x01, 0xe9, 0x05, | 68 | 0x6b, 0xf8, 0x2a, 0x9f, 0x00, 0x01, 0xe9, 0x05, |
69 | 0x01, 0xe2, 0x00, 0x03, 0x81, 0xf8, 0x2a, 0xa0, | 69 | 0x01, 0xe2, 0x00, 0x03, 0x81, 0xf8, 0x2a, 0xa0, |
70 | 0xf0, 0x73, 0x02, 0x95, 0x72, 0x11, 0x2a, 0x9f, | 70 | 0xf0, 0x73, 0x02, 0x95, 0x72, 0x11, 0x2a, 0x9f, |
71 | 0xf4, 0x95, 0x10, 0xe1, 0x2a, 0x39, 0x6b, 0xf8, | 71 | 0xf4, 0x95, 0x10, 0xe1, 0x2a, 0x39, 0x6b, 0xf8, |
72 | 0x2a, 0x9f, 0x00, 0x01, 0x11, 0xf8, 0x2a, 0x9f, | 72 | 0x2a, 0x9f, 0x00, 0x01, 0x11, 0xf8, 0x2a, 0x9f, |
73 | 0x09, 0xf8, 0x2a, 0xa0, 0xf8, 0x4c, 0x02, 0x93, | 73 | 0x09, 0xf8, 0x2a, 0xa0, 0xf8, 0x4c, 0x02, 0x93, |
74 | 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, 0x76, 0xf8, | 74 | 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, 0x76, 0xf8, |
75 | 0x2a, 0x9f, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa0, | 75 | 0x2a, 0x9f, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa0, |
76 | 0x00, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x48, 0x11, | 76 | 0x00, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x48, 0x11, |
77 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, | 77 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, |
78 | 0x10, 0xf8, 0x2a, 0x5a, 0xf8, 0x44, 0x02, 0xb2, | 78 | 0x10, 0xf8, 0x2a, 0x5a, 0xf8, 0x44, 0x02, 0xb2, |
79 | 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x01, 0xf0, 0x74, | 79 | 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x01, 0xf0, 0x74, |
80 | 0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, | 80 | 0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, |
81 | 0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, 0x02, 0xb2, | 81 | 0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, 0x02, 0xb2, |
82 | 0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, 0x80, 0x00, | 82 | 0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, 0x80, 0x00, |
83 | 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0xd6, | 83 | 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0xd6, |
84 | 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95, | 84 | 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95, |
85 | 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b, | 85 | 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b, |
86 | 0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11, | 86 | 0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11, |
87 | 0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15, | 87 | 0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15, |
88 | 0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19, | 88 | 0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19, |
89 | 0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a, | 89 | 0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a, |
90 | 0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8, | 90 | 0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8, |
91 | 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, | 91 | 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, |
92 | 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, | 92 | 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, |
93 | 0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe, | 93 | 0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe, |
94 | 0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xfd, | 94 | 0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xfd, |
95 | 0xf0, 0x74, 0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, | 95 | 0xf0, 0x74, 0x02, 0x58, 0x88, 0x11, 0xf4, 0x95, |
96 | 0x77, 0x10, 0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, | 96 | 0x77, 0x10, 0x80, 0x00, 0xf4, 0xa9, 0xf8, 0x30, |
97 | 0x02, 0xef, 0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, | 97 | 0x02, 0xef, 0x48, 0x11, 0xf0, 0x30, 0x00, 0xff, |
98 | 0x80, 0x00, 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, | 98 | 0x80, 0x00, 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, |
99 | 0x18, 0xd6, 0xee, 0x03, 0x8a, 0x18, 0xf4, 0x95, | 99 | 0x18, 0xd6, 0xee, 0x03, 0x8a, 0x18, 0xf4, 0x95, |
100 | 0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, 0x8a, 0x1a, | 100 | 0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, 0x8a, 0x1a, |
101 | 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, 0x8a, 0x19, | 101 | 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, 0x8a, 0x19, |
102 | 0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x15, | 102 | 0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x15, |
103 | 0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, 0x8a, 0x11, | 103 | 0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, 0x8a, 0x11, |
104 | 0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, | 104 | 0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, |
105 | 0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, 0xf4, 0xeb, | 105 | 0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, 0xf4, 0xeb, |
106 | 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, | 106 | 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, |
107 | 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, | 107 | 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, |
108 | 0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, | 108 | 0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, |
109 | 0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, | 109 | 0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, |
110 | 0x00, 0x03, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, | 110 | 0x00, 0x03, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, |
111 | 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, | 111 | 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, |
112 | 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95, | 112 | 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95, |
113 | 0xf4, 0x95, 0x10, 0x81, 0x6f, 0xf8, 0x2a, 0x9e, | 113 | 0xf4, 0x95, 0x10, 0x81, 0x6f, 0xf8, 0x2a, 0x9e, |
114 | 0x0c, 0x88, 0xe8, 0xff, 0x18, 0xe1, 0x00, 0x01, | 114 | 0x0c, 0x88, 0xe8, 0xff, 0x18, 0xe1, 0x00, 0x01, |
115 | 0x1a, 0xf8, 0x2a, 0x9e, 0xf0, 0x30, 0x1f, 0xff, | 115 | 0x1a, 0xf8, 0x2a, 0x9e, 0xf0, 0x30, 0x1f, 0xff, |
116 | 0x80, 0xf8, 0x2a, 0x9e, 0x8a, 0x11, 0xfc, 0x00, | 116 | 0x80, 0xf8, 0x2a, 0x9e, 0x8a, 0x11, 0xfc, 0x00, |
117 | 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, | 117 | 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, |
118 | 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x11, 0xe2, | 118 | 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, 0x11, 0xe2, |
119 | 0x00, 0x01, 0x81, 0xe1, 0x00, 0x01, 0x11, 0xe2, | 119 | 0x00, 0x01, 0x81, 0xe1, 0x00, 0x01, 0x11, 0xe2, |
120 | 0x00, 0x02, 0x81, 0xe1, 0x00, 0x02, 0x76, 0xe1, | 120 | 0x00, 0x02, 0x81, 0xe1, 0x00, 0x02, 0x76, 0xe1, |
121 | 0x00, 0x03, 0x00, 0x02, 0x48, 0x08, 0x6f, 0xe1, | 121 | 0x00, 0x03, 0x00, 0x02, 0x48, 0x08, 0x6f, 0xe1, |
122 | 0x00, 0x04, 0x0c, 0x98, 0xf0, 0x30, 0x00, 0xff, | 122 | 0x00, 0x04, 0x0c, 0x98, 0xf0, 0x30, 0x00, 0xff, |
123 | 0x80, 0xe1, 0x00, 0x05, 0x76, 0xe1, 0x00, 0x06, | 123 | 0x80, 0xe1, 0x00, 0x05, 0x76, 0xe1, 0x00, 0x06, |
124 | 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, | 124 | 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, |
125 | 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, | 125 | 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, 0x2a, 0x39, |
126 | 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, | 126 | 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, 0x2a, 0x18, |
127 | 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, | 127 | 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, 0x00, 0x01, |
128 | 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, | 128 | 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, 0x00, 0x02, |
129 | 0x76, 0xe1, 0x00, 0x03, 0x00, 0x04, 0x48, 0x11, | 129 | 0x76, 0xe1, 0x00, 0x03, 0x00, 0x04, 0x48, 0x11, |
130 | 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 0xf4, 0x95, | 130 | 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, 0xf4, 0x95, |
131 | 0x77, 0x13, 0x2a, 0x76, 0xe9, 0x00, 0xe5, 0x98, | 131 | 0x77, 0x13, 0x2a, 0x76, 0xe9, 0x00, 0xe5, 0x98, |
132 | 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 0x48, 0x0b, | 132 | 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, 0x48, 0x0b, |
133 | 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x03, 0x71, | 133 | 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x03, 0x71, |
134 | 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, | 134 | 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, |
135 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xf0, | 135 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xf0, |
136 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81, | 136 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0x81, |
137 | 0x00, 0x14, 0x71, 0xe1, 0x00, 0x01, 0x00, 0x15, | 137 | 0x00, 0x14, 0x71, 0xe1, 0x00, 0x01, 0x00, 0x15, |
138 | 0x49, 0x11, 0xf3, 0x00, 0x00, 0x02, 0x89, 0x11, | 138 | 0x49, 0x11, 0xf3, 0x00, 0x00, 0x02, 0x89, 0x11, |
139 | 0xe7, 0x82, 0x6d, 0xea, 0x00, 0x04, 0xe7, 0x83, | 139 | 0xe7, 0x82, 0x6d, 0xea, 0x00, 0x04, 0xe7, 0x83, |
140 | 0x6d, 0xeb, 0x00, 0x0a, 0x77, 0x1a, 0x00, 0x05, | 140 | 0x6d, 0xeb, 0x00, 0x0a, 0x77, 0x1a, 0x00, 0x05, |
141 | 0xf0, 0x72, 0x03, 0xaa, 0x11, 0x81, 0xf2, 0xe8, | 141 | 0xf0, 0x72, 0x03, 0xaa, 0x11, 0x81, 0xf2, 0xe8, |
142 | 0x80, 0x82, 0xe9, 0xff, 0x19, 0xe1, 0x00, 0x01, | 142 | 0x80, 0x82, 0xe9, 0xff, 0x19, 0xe1, 0x00, 0x01, |
143 | 0xf1, 0xa0, 0x81, 0x92, 0x11, 0xe1, 0x00, 0x0c, | 143 | 0xf1, 0xa0, 0x81, 0x92, 0x11, 0xe1, 0x00, 0x0c, |
144 | 0xf2, 0xe8, 0x80, 0x83, 0xe9, 0xff, 0x19, 0xe1, | 144 | 0xf2, 0xe8, 0x80, 0x83, 0xe9, 0xff, 0x19, 0xe1, |
145 | 0x00, 0x0d, 0xf1, 0xa0, 0x81, 0x93, 0x6d, 0xe9, | 145 | 0x00, 0x0d, 0xf1, 0xa0, 0x81, 0x93, 0x6d, 0xe9, |
146 | 0x00, 0x02, 0x48, 0x18, 0x49, 0x18, 0x70, 0x00, | 146 | 0x00, 0x02, 0x48, 0x18, 0x49, 0x18, 0x70, 0x00, |
147 | 0x00, 0x15, 0xf0, 0x00, 0x00, 0x04, 0xf3, 0x00, | 147 | 0x00, 0x15, 0xf0, 0x00, 0x00, 0x04, 0xf3, 0x00, |
148 | 0x00, 0x0a, 0x80, 0x01, 0x81, 0x02, 0xf2, 0x74, | 148 | 0x00, 0x0a, 0x80, 0x01, 0x81, 0x02, 0xf2, 0x74, |
149 | 0x0e, 0x54, 0xf4, 0x95, 0x48, 0x14, 0xee, 0x10, | 149 | 0x0e, 0x54, 0xf4, 0x95, 0x48, 0x14, 0xee, 0x10, |
150 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf0, 0x74, | 150 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf0, 0x74, |
151 | 0x0c, 0x5e, 0x80, 0xf8, 0x2a, 0x5c, 0x77, 0x12, | 151 | 0x0c, 0x5e, 0x80, 0xf8, 0x2a, 0x5c, 0x77, 0x12, |
152 | 0x2a, 0x39, 0x76, 0x82, 0x00, 0x55, 0x77, 0x11, | 152 | 0x2a, 0x39, 0x76, 0x82, 0x00, 0x55, 0x77, 0x11, |
153 | 0x2a, 0x18, 0x10, 0xe1, 0x00, 0x01, 0x80, 0xe2, | 153 | 0x2a, 0x18, 0x10, 0xe1, 0x00, 0x01, 0x80, 0xe2, |
154 | 0x00, 0x01, 0x10, 0xe1, 0x00, 0x02, 0x80, 0xe2, | 154 | 0x00, 0x01, 0x10, 0xe1, 0x00, 0x02, 0x80, 0xe2, |
155 | 0x00, 0x02, 0x76, 0xe2, 0x00, 0x03, 0x00, 0x1c, | 155 | 0x00, 0x02, 0x76, 0xe2, 0x00, 0x03, 0x00, 0x1c, |
156 | 0xf6, 0xb8, 0x56, 0xf8, 0x2a, 0x16, 0xf0, 0xf0, | 156 | 0xf6, 0xb8, 0x56, 0xf8, 0x2a, 0x16, 0xf0, 0xf0, |
157 | 0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x07, 0x56, 0xf8, | 157 | 0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x07, 0x56, 0xf8, |
158 | 0x2a, 0x16, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80, | 158 | 0x2a, 0x16, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80, |
159 | 0x80, 0xe2, 0x00, 0x06, 0x56, 0xf8, 0x2a, 0x16, | 159 | 0x80, 0xe2, 0x00, 0x06, 0x56, 0xf8, 0x2a, 0x16, |
160 | 0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, | 160 | 0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, |
161 | 0x00, 0x05, 0x57, 0xf8, 0x2a, 0x16, 0xe8, 0xff, | 161 | 0x00, 0x05, 0x57, 0xf8, 0x2a, 0x16, 0xe8, 0xff, |
162 | 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x04, 0x56, 0xf8, | 162 | 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x04, 0x56, 0xf8, |
163 | 0x27, 0x6c, 0xf0, 0xf0, 0xf0, 0xf8, 0x80, 0xe2, | 163 | 0x27, 0x6c, 0xf0, 0xf0, 0xf0, 0xf8, 0x80, 0xe2, |
164 | 0x00, 0x0b, 0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf0, | 164 | 0x00, 0x0b, 0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf0, |
165 | 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0a, | 165 | 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0a, |
166 | 0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf8, 0xe8, 0xff, | 166 | 0x56, 0xf8, 0x27, 0x6c, 0xf1, 0xf8, 0xe8, 0xff, |
167 | 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x09, 0xe8, 0xff, | 167 | 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x09, 0xe8, 0xff, |
168 | 0x57, 0xf8, 0x27, 0x6c, 0xf2, 0x80, 0x80, 0xe2, | 168 | 0x57, 0xf8, 0x27, 0x6c, 0xf2, 0x80, 0x80, 0xe2, |
169 | 0x00, 0x08, 0x56, 0xf8, 0x27, 0x6a, 0xf0, 0xf0, | 169 | 0x00, 0x08, 0x56, 0xf8, 0x27, 0x6a, 0xf0, 0xf0, |
170 | 0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x0f, 0x56, 0xf8, | 170 | 0xf0, 0xf8, 0x80, 0xe2, 0x00, 0x0f, 0x56, 0xf8, |
171 | 0x27, 0x6a, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80, | 171 | 0x27, 0x6a, 0xf1, 0xf0, 0xe8, 0xff, 0xf2, 0x80, |
172 | 0x80, 0xe2, 0x00, 0x0e, 0x56, 0xf8, 0x27, 0x6a, | 172 | 0x80, 0xe2, 0x00, 0x0e, 0x56, 0xf8, 0x27, 0x6a, |
173 | 0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, | 173 | 0xf1, 0xf8, 0xe8, 0xff, 0xf2, 0x80, 0x80, 0xe2, |
174 | 0x00, 0x0d, 0x57, 0xf8, 0x27, 0x6a, 0xe8, 0xff, | 174 | 0x00, 0x0d, 0x57, 0xf8, 0x27, 0x6a, 0xe8, 0xff, |
175 | 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0c, 0x76, 0xe2, | 175 | 0xf2, 0x80, 0x80, 0xe2, 0x00, 0x0c, 0x76, 0xe2, |
176 | 0x00, 0x13, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x12, | 176 | 0x00, 0x13, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x12, |
177 | 0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x5c, 0x0c, 0x58, | 177 | 0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x5c, 0x0c, 0x58, |
178 | 0x80, 0xe2, 0x00, 0x11, 0xe8, 0xff, 0x18, 0xf8, | 178 | 0x80, 0xe2, 0x00, 0x11, 0xe8, 0xff, 0x18, 0xf8, |
179 | 0x2a, 0x5c, 0x80, 0xe2, 0x00, 0x10, 0x76, 0xe2, | 179 | 0x2a, 0x5c, 0x80, 0xe2, 0x00, 0x10, 0x76, 0xe2, |
180 | 0x00, 0x17, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x16, | 180 | 0x00, 0x17, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x16, |
181 | 0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x9e, 0x0c, 0x58, | 181 | 0x00, 0x00, 0x6f, 0xf8, 0x2a, 0x9e, 0x0c, 0x58, |
182 | 0x80, 0xe2, 0x00, 0x15, 0xe8, 0xff, 0x18, 0xf8, | 182 | 0x80, 0xe2, 0x00, 0x15, 0xe8, 0xff, 0x18, 0xf8, |
183 | 0x2a, 0x9e, 0x80, 0xe2, 0x00, 0x14, 0x76, 0xe2, | 183 | 0x2a, 0x9e, 0x80, 0xe2, 0x00, 0x14, 0x76, 0xe2, |
184 | 0x00, 0x1b, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1a, | 184 | 0x00, 0x1b, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1a, |
185 | 0x00, 0x00, 0x76, 0xe2, 0x00, 0x19, 0x00, 0x00, | 185 | 0x00, 0x00, 0x76, 0xe2, 0x00, 0x19, 0x00, 0x00, |
186 | 0x70, 0xe2, 0x00, 0x18, 0x27, 0x6e, 0x76, 0xe2, | 186 | 0x70, 0xe2, 0x00, 0x18, 0x27, 0x6e, 0x76, 0xe2, |
187 | 0x00, 0x1f, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1e, | 187 | 0x00, 0x1f, 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1e, |
188 | 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1d, 0x00, 0x00, | 188 | 0x00, 0x00, 0x76, 0xe2, 0x00, 0x1d, 0x00, 0x00, |
189 | 0x76, 0xe2, 0x00, 0x1c, 0x00, 0x00, 0x76, 0xe2, | 189 | 0x76, 0xe2, 0x00, 0x1c, 0x00, 0x00, 0x76, 0xe2, |
190 | 0x00, 0x20, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, | 190 | 0x00, 0x20, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, |
191 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, | 191 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, |
192 | 0x10, 0xf8, 0x2a, 0x38, 0xf8, 0x45, 0x04, 0xed, | 192 | 0x10, 0xf8, 0x2a, 0x38, 0xf8, 0x45, 0x04, 0xed, |
193 | 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x02, | 193 | 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x02, |
194 | 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x08, | 194 | 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x08, |
195 | 0x6d, 0xe9, 0xff, 0xdf, 0xf6, 0xa9, 0xf8, 0x20, | 195 | 0x6d, 0xe9, 0xff, 0xdf, 0xf6, 0xa9, 0xf8, 0x20, |
196 | 0x04, 0x75, 0xf0, 0x73, 0x04, 0x7d, 0xf0, 0x10, | 196 | 0x04, 0x75, 0xf0, 0x73, 0x04, 0x7d, 0xf0, 0x10, |
197 | 0x00, 0x21, 0xf0, 0x00, 0x1a, 0x83, 0x48, 0x08, | 197 | 0x00, 0x21, 0xf0, 0x00, 0x1a, 0x83, 0x48, 0x08, |
198 | 0x7e, 0xf8, 0x00, 0x08, 0xf4, 0xe2, 0xf0, 0x74, | 198 | 0x7e, 0xf8, 0x00, 0x08, 0xf4, 0xe2, 0xf0, 0x74, |
199 | 0x03, 0x0a, 0xf0, 0x73, 0x04, 0xea, 0x48, 0x12, | 199 | 0x03, 0x0a, 0xf0, 0x73, 0x04, 0xea, 0x48, 0x12, |
200 | 0xf2, 0x74, 0x03, 0x23, 0xf0, 0x00, 0x00, 0x04, | 200 | 0xf2, 0x74, 0x03, 0x23, 0xf0, 0x00, 0x00, 0x04, |
201 | 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, | 201 | 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, |
202 | 0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, | 202 | 0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, |
203 | 0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48, | 203 | 0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48, |
204 | 0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x69, | 204 | 0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x69, |
205 | 0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36, | 205 | 0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36, |
206 | 0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, | 206 | 0xf0, 0x73, 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, |
207 | 0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48, | 207 | 0xe8, 0xff, 0x6f, 0xe1, 0x00, 0x04, 0x0d, 0x48, |
208 | 0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x41, | 208 | 0x18, 0xe1, 0x00, 0x05, 0xf2, 0x74, 0x09, 0x41, |
209 | 0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36, | 209 | 0xf4, 0x95, 0xf2, 0xa0, 0xf0, 0x74, 0x03, 0x36, |
210 | 0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0x57, | 210 | 0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0x57, |
211 | 0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, 0x2a, 0x1c, | 211 | 0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, 0x2a, 0x1c, |
212 | 0xf0, 0x74, 0x12, 0xa4, 0xf2, 0x74, 0x03, 0x36, | 212 | 0xf0, 0x74, 0x12, 0xa4, 0xf2, 0x74, 0x03, 0x36, |
213 | 0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, | 213 | 0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, |
214 | 0x48, 0x12, 0xf2, 0x74, 0x03, 0x80, 0xf0, 0x00, | 214 | 0x48, 0x12, 0xf2, 0x74, 0x03, 0x80, 0xf0, 0x00, |
215 | 0x00, 0x04, 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, | 215 | 0x00, 0x04, 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, |
216 | 0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, | 216 | 0xe8, 0x00, 0xf0, 0x73, 0x04, 0xea, 0x10, 0xf8, |
217 | 0x2a, 0x1c, 0xf0, 0x74, 0x12, 0xc5, 0xf2, 0x74, | 217 | 0x2a, 0x1c, 0xf0, 0x74, 0x12, 0xc5, 0xf2, 0x74, |
218 | 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, | 218 | 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, 0xf0, 0x73, |
219 | 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 0xe8, 0xff, | 219 | 0x04, 0xea, 0x77, 0x11, 0x2a, 0x18, 0xe8, 0xff, |
220 | 0x6f, 0xe1, 0x00, 0x06, 0x0d, 0x48, 0x18, 0xe1, | 220 | 0x6f, 0xe1, 0x00, 0x06, 0x0d, 0x48, 0x18, 0xe1, |
221 | 0x00, 0x07, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 221 | 0x00, 0x07, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
222 | 0xf2, 0xa0, 0x70, 0x00, 0x00, 0x12, 0x80, 0x01, | 222 | 0xf2, 0xa0, 0x70, 0x00, 0x00, 0x12, 0x80, 0x01, |
223 | 0x10, 0xe1, 0x00, 0x04, 0xf0, 0x74, 0x0e, 0x7a, | 223 | 0x10, 0xe1, 0x00, 0x04, 0xf0, 0x74, 0x0e, 0x7a, |
224 | 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, | 224 | 0xf2, 0x74, 0x03, 0x36, 0xf4, 0x95, 0xe8, 0x00, |
225 | 0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0xbc, | 225 | 0xf0, 0x73, 0x04, 0xea, 0xf0, 0x74, 0x03, 0xbc, |
226 | 0x76, 0xf8, 0x2a, 0x38, 0x00, 0x00, 0xee, 0x02, | 226 | 0x76, 0xf8, 0x2a, 0x38, 0x00, 0x00, 0xee, 0x02, |
227 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, | 227 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, |
228 | 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, | 228 | 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, |
229 | 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, | 229 | 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, |
230 | 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, | 230 | 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, |
231 | 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x09, | 231 | 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x09, |
232 | 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, | 232 | 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, |
233 | 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x86, 0xe9, 0x00, | 233 | 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x86, 0xe9, 0x00, |
234 | 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, | 234 | 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, |
235 | 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, | 235 | 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, |
236 | 0x05, 0x0a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, | 236 | 0x05, 0x0a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, |
237 | 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, | 237 | 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, |
238 | 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, | 238 | 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, |
239 | 0x77, 0x13, 0x2a, 0x18, 0x10, 0xe3, 0x00, 0x01, | 239 | 0x77, 0x13, 0x2a, 0x18, 0x10, 0xe3, 0x00, 0x01, |
240 | 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe3, 0x00, 0x02, | 240 | 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe3, 0x00, 0x02, |
241 | 0x80, 0xe1, 0x00, 0x02, 0x13, 0xe3, 0x00, 0x03, | 241 | 0x80, 0xe1, 0x00, 0x02, 0x13, 0xe3, 0x00, 0x03, |
242 | 0x81, 0xe1, 0x00, 0x03, 0x48, 0x11, 0x77, 0x11, | 242 | 0x81, 0xe1, 0x00, 0x03, 0x48, 0x11, 0x77, 0x11, |
243 | 0x00, 0x00, 0xf8, 0x4d, 0x05, 0x44, 0xf0, 0x00, | 243 | 0x00, 0x00, 0xf8, 0x4d, 0x05, 0x44, 0xf0, 0x00, |
244 | 0x00, 0x04, 0x88, 0x12, 0x48, 0x13, 0xf0, 0x00, | 244 | 0x00, 0x04, 0x88, 0x12, 0x48, 0x13, 0xf0, 0x00, |
245 | 0x00, 0x04, 0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, | 245 | 0x00, 0x04, 0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, |
246 | 0xe5, 0x98, 0x6d, 0x91, 0xf6, 0xb8, 0x48, 0x11, | 246 | 0xe5, 0x98, 0x6d, 0x91, 0xf6, 0xb8, 0x48, 0x11, |
247 | 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x05, 0x3a, | 247 | 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, 0x05, 0x3a, |
248 | 0xf0, 0x20, 0x2a, 0x39, 0x49, 0x11, 0xf5, 0x00, | 248 | 0xf0, 0x20, 0x2a, 0x39, 0x49, 0x11, 0xf5, 0x00, |
249 | 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x76, 0xe1, | 249 | 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x76, 0xe1, |
250 | 0x00, 0x04, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, | 250 | 0x00, 0x04, 0x00, 0xaa, 0xf0, 0x74, 0x02, 0x98, |
251 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, | 251 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x77, 0x11, |
252 | 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, | 252 | 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, 0x77, 0x12, |
253 | 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, | 253 | 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, 0x80, 0xe1, |
254 | 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, | 254 | 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, 0x80, 0xe1, |
255 | 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x0c, | 255 | 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x0c, |
256 | 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, | 256 | 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x12, |
257 | 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x7a, 0xe9, 0x00, | 257 | 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x7a, 0xe9, 0x00, |
258 | 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, | 258 | 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, 0xf6, 0xb8, |
259 | 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, | 259 | 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, 0xf8, 0x43, |
260 | 0x05, 0x6a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, | 260 | 0x05, 0x6a, 0x76, 0x82, 0x00, 0xaa, 0xf0, 0x74, |
261 | 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, | 261 | 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, |
262 | 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, | 262 | 0x77, 0x11, 0x2a, 0x39, 0x76, 0x81, 0x00, 0x55, |
263 | 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, | 263 | 0x77, 0x12, 0x2a, 0x18, 0x10, 0xe2, 0x00, 0x01, |
264 | 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, | 264 | 0x80, 0xe1, 0x00, 0x01, 0x10, 0xe2, 0x00, 0x02, |
265 | 0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, | 265 | 0x80, 0xe1, 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, |
266 | 0x00, 0x19, 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, | 266 | 0x00, 0x19, 0x48, 0x11, 0xf0, 0x00, 0x00, 0x04, |
267 | 0x88, 0x12, 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x5d, | 267 | 0x88, 0x12, 0xf4, 0x95, 0x77, 0x13, 0x2a, 0x5d, |
268 | 0xe9, 0x00, 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, | 268 | 0xe9, 0x00, 0xe5, 0x98, 0xf3, 0x00, 0x00, 0x01, |
269 | 0xf6, 0xb8, 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, | 269 | 0xf6, 0xb8, 0x48, 0x0b, 0x08, 0xf8, 0x2a, 0x3c, |
270 | 0xf8, 0x43, 0x05, 0x93, 0x76, 0x82, 0x00, 0xaa, | 270 | 0xf8, 0x43, 0x05, 0x93, 0x76, 0x82, 0x00, 0xaa, |
271 | 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, | 271 | 0xf0, 0x74, 0x02, 0x98, 0x8a, 0x11, 0xfc, 0x00, |
272 | 0x4a, 0x11, 0x88, 0x11, 0x10, 0xf8, 0x2a, 0x38, | 272 | 0x4a, 0x11, 0x88, 0x11, 0x10, 0xf8, 0x2a, 0x38, |
273 | 0xf8, 0x44, 0x05, 0xe3, 0x10, 0xf8, 0x2a, 0xa1, | 273 | 0xf8, 0x44, 0x05, 0xe3, 0x10, 0xf8, 0x2a, 0xa1, |
274 | 0xf8, 0x44, 0x05, 0xba, 0x6c, 0xe1, 0xff, 0x56, | 274 | 0xf8, 0x44, 0x05, 0xba, 0x6c, 0xe1, 0xff, 0x56, |
275 | 0x05, 0xe3, 0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, | 275 | 0x05, 0xe3, 0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, |
276 | 0x70, 0xe2, 0x2a, 0x18, 0x00, 0x11, 0x6b, 0xf8, | 276 | 0x70, 0xe2, 0x2a, 0x18, 0x00, 0x11, 0x6b, 0xf8, |
277 | 0x2a, 0xa1, 0x00, 0x01, 0xf0, 0x73, 0x05, 0xe3, | 277 | 0x2a, 0xa1, 0x00, 0x01, 0xf0, 0x73, 0x05, 0xe3, |
278 | 0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, 0x70, 0xe2, | 278 | 0x72, 0x12, 0x2a, 0xa1, 0xf4, 0x95, 0x70, 0xe2, |
279 | 0x2a, 0x18, 0x00, 0x11, 0x10, 0xf8, 0x2a, 0xa1, | 279 | 0x2a, 0x18, 0x00, 0x11, 0x10, 0xf8, 0x2a, 0xa1, |
280 | 0xf0, 0x00, 0x00, 0x01, 0x88, 0x12, 0xf4, 0x95, | 280 | 0xf0, 0x00, 0x00, 0x01, 0x88, 0x12, 0xf4, 0x95, |
281 | 0xf4, 0x95, 0x6e, 0xe2, 0xff, 0xfc, 0x05, 0xd1, | 281 | 0xf4, 0x95, 0x6e, 0xe2, 0xff, 0xfc, 0x05, 0xd1, |
282 | 0x73, 0x12, 0x2a, 0xa1, 0x48, 0x11, 0xf0, 0x00, | 282 | 0x73, 0x12, 0x2a, 0xa1, 0x48, 0x11, 0xf0, 0x00, |
283 | 0x00, 0x05, 0x80, 0xf8, 0x2a, 0xa2, 0x10, 0xf8, | 283 | 0x00, 0x05, 0x80, 0xf8, 0x2a, 0xa2, 0x10, 0xf8, |
284 | 0x2a, 0xa1, 0x08, 0xf8, 0x2a, 0xa2, 0xf8, 0x44, | 284 | 0x2a, 0xa1, 0x08, 0xf8, 0x2a, 0xa2, 0xf8, 0x44, |
285 | 0x05, 0xe3, 0x6c, 0xe1, 0xff, 0xab, 0x05, 0xdd, | 285 | 0x05, 0xe3, 0x6c, 0xe1, 0xff, 0xab, 0x05, 0xdd, |
286 | 0x76, 0xf8, 0x2a, 0x38, 0x00, 0x01, 0x76, 0xf8, | 286 | 0x76, 0xf8, 0x2a, 0x38, 0x00, 0x01, 0x76, 0xf8, |
287 | 0x2a, 0xa1, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa2, | 287 | 0x2a, 0xa1, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa2, |
288 | 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95, | 288 | 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0xf4, 0x95, |
289 | 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b, | 289 | 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, 0x4a, 0x0b, |
290 | 0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11, | 290 | 0x4a, 0x0c, 0x4a, 0x0d, 0x4a, 0x10, 0x4a, 0x11, |
291 | 0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15, | 291 | 0x4a, 0x12, 0x4a, 0x13, 0x4a, 0x14, 0x4a, 0x15, |
292 | 0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19, | 292 | 0x4a, 0x16, 0x4a, 0x17, 0x4a, 0x17, 0x4a, 0x19, |
293 | 0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a, | 293 | 0x4a, 0x0e, 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1a, |
294 | 0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8, | 294 | 0x4a, 0x1d, 0x4a, 0x1b, 0x4a, 0x1c, 0x68, 0xf8, |
295 | 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, | 295 | 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, |
296 | 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, | 296 | 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, |
297 | 0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe, | 297 | 0x48, 0x18, 0x68, 0xf8, 0x00, 0x18, 0xff, 0xfe, |
298 | 0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xff, | 298 | 0xf4, 0x95, 0xf4, 0x95, 0x4a, 0x08, 0xee, 0xff, |
299 | 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0x04, | 299 | 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x18, 0x04, |
300 | 0xf0, 0x74, 0x05, 0xa2, 0xee, 0x01, 0x8a, 0x18, | 300 | 0xf0, 0x74, 0x05, 0xa2, 0xee, 0x01, 0x8a, 0x18, |
301 | 0xf4, 0x95, 0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, | 301 | 0xf4, 0x95, 0x8a, 0x1c, 0x8a, 0x1b, 0x8a, 0x1d, |
302 | 0x8a, 0x1a, 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, | 302 | 0x8a, 0x1a, 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0e, |
303 | 0x8a, 0x19, 0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, | 303 | 0x8a, 0x19, 0x8a, 0x17, 0x8a, 0x17, 0x8a, 0x16, |
304 | 0x8a, 0x15, 0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, | 304 | 0x8a, 0x15, 0x8a, 0x14, 0x8a, 0x13, 0x8a, 0x12, |
305 | 0x8a, 0x11, 0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, | 305 | 0x8a, 0x11, 0x8a, 0x10, 0x8a, 0x0d, 0x8a, 0x0c, |
306 | 0x8a, 0x0b, 0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, | 306 | 0x8a, 0x0b, 0x8a, 0x0a, 0x8a, 0x09, 0x8a, 0x08, |
307 | 0xf4, 0xeb, 0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x38, | 307 | 0xf4, 0xeb, 0xee, 0xfd, 0x76, 0xf8, 0x2a, 0x38, |
308 | 0x00, 0x00, 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, | 308 | 0x00, 0x00, 0x76, 0xf8, 0x2a, 0x5a, 0x00, 0x00, |
309 | 0xe8, 0x01, 0x4e, 0x00, 0xfb, 0x80, 0x17, 0xd6, | 309 | 0xe8, 0x01, 0x4e, 0x00, 0xfb, 0x80, 0x17, 0xd6, |
310 | 0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x2a, 0x5b, | 310 | 0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x2a, 0x5b, |
311 | 0x76, 0x00, 0x2a, 0x8f, 0xf9, 0x80, 0x16, 0xaa, | 311 | 0x76, 0x00, 0x2a, 0x8f, 0xf9, 0x80, 0x16, 0xaa, |
312 | 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x5c, | 312 | 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x5c, |
313 | 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x6f, | 313 | 0x10, 0xf8, 0x2a, 0x5b, 0xf9, 0x80, 0x17, 0x6f, |
314 | 0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1a, | 314 | 0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1a, |
315 | 0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1a, | 315 | 0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1a, |
316 | 0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1b, | 316 | 0xfb, 0x80, 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x1b, |
317 | 0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1b, | 317 | 0xfb, 0x80, 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x1b, |
318 | 0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, | 318 | 0xee, 0x03, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, |
319 | 0x13, 0x02, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d, | 319 | 0x13, 0x02, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d, |
320 | 0x06, 0x6a, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, | 320 | 0x06, 0x6a, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, |
321 | 0xf4, 0x95, 0xf0, 0x72, 0x06, 0x69, 0x1c, 0x91, | 321 | 0xf4, 0x95, 0xf0, 0x72, 0x06, 0x69, 0x1c, 0x91, |
322 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, | 322 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, |
323 | 0x12, 0x03, 0x11, 0x02, 0xf8, 0x45, 0x06, 0x79, | 323 | 0x12, 0x03, 0x11, 0x02, 0xf8, 0x45, 0x06, 0x79, |
324 | 0xf0, 0x10, 0x00, 0x01, 0x88, 0x1a, 0xf4, 0x95, | 324 | 0xf0, 0x10, 0x00, 0x01, 0x88, 0x1a, 0xf4, 0x95, |
325 | 0xf0, 0x72, 0x06, 0x78, 0x81, 0x91, 0x8a, 0x11, | 325 | 0xf0, 0x72, 0x06, 0x78, 0x81, 0x91, 0x8a, 0x11, |
326 | 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, | 326 | 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, |
327 | 0x00, 0x11, 0x11, 0x03, 0x61, 0xf8, 0x00, 0x11, | 327 | 0x00, 0x11, 0x11, 0x03, 0x61, 0xf8, 0x00, 0x11, |
328 | 0x00, 0x01, 0xf8, 0x30, 0x06, 0x91, 0xf6, 0xb8, | 328 | 0x00, 0x01, 0xf8, 0x30, 0x06, 0x91, 0xf6, 0xb8, |
329 | 0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11, | 329 | 0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11, |
330 | 0xf3, 0xe8, 0xe8, 0xff, 0x18, 0x81, 0xf1, 0xa0, | 330 | 0xf3, 0xe8, 0xe8, 0xff, 0x18, 0x81, 0xf1, 0xa0, |
331 | 0x81, 0x81, 0xf0, 0x73, 0x06, 0x9d, 0xf6, 0xb8, | 331 | 0x81, 0x81, 0xf0, 0x73, 0x06, 0x9d, 0xf6, 0xb8, |
332 | 0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11, | 332 | 0x6f, 0xf8, 0x00, 0x11, 0x0c, 0x1f, 0x88, 0x11, |
333 | 0xf3, 0x30, 0x00, 0xff, 0xf0, 0x20, 0xff, 0x00, | 333 | 0xf3, 0x30, 0x00, 0xff, 0xf0, 0x20, 0xff, 0x00, |
334 | 0x18, 0x81, 0xf1, 0xa0, 0x81, 0x81, 0x8a, 0x11, | 334 | 0x18, 0x81, 0xf1, 0xa0, 0x81, 0x81, 0x8a, 0x11, |
335 | 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x11, 0x02, | 335 | 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x11, 0x02, |
336 | 0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, | 336 | 0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, |
337 | 0x06, 0xb1, 0x49, 0x0b, 0xf6, 0x1f, 0x88, 0x11, | 337 | 0x06, 0xb1, 0x49, 0x0b, 0xf6, 0x1f, 0x88, 0x11, |
338 | 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf2, 0x73, | 338 | 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf2, 0x73, |
339 | 0x06, 0xb8, 0xf0, 0x30, 0x00, 0xff, 0x49, 0x0b, | 339 | 0x06, 0xb8, 0xf0, 0x30, 0x00, 0xff, 0x49, 0x0b, |
340 | 0xf6, 0x1f, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, | 340 | 0xf6, 0x1f, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, |
341 | 0x12, 0x81, 0xf4, 0x78, 0x8a, 0x11, 0xfc, 0x00, | 341 | 0x12, 0x81, 0xf4, 0x78, 0x8a, 0x11, 0xfc, 0x00, |
342 | 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x12, | 342 | 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x12, |
343 | 0x13, 0x03, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d, | 343 | 0x13, 0x03, 0x88, 0x11, 0xe8, 0x00, 0xf8, 0x4d, |
344 | 0x06, 0xcc, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, | 344 | 0x06, 0xcc, 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, |
345 | 0xf4, 0x95, 0xf0, 0x72, 0x06, 0xcb, 0x11, 0x92, | 345 | 0xf4, 0x95, 0xf0, 0x72, 0x06, 0xcb, 0x11, 0x92, |
346 | 0xf2, 0xc0, 0x81, 0x91, 0x8a, 0x11, 0xfc, 0x00, | 346 | 0xf2, 0xc0, 0x81, 0x91, 0x8a, 0x11, 0xfc, 0x00, |
347 | 0x88, 0x12, 0x12, 0x02, 0x71, 0x01, 0x00, 0x13, | 347 | 0x88, 0x12, 0x12, 0x02, 0x71, 0x01, 0x00, 0x13, |
348 | 0xf8, 0x45, 0x06, 0xdb, 0xf0, 0x10, 0x00, 0x01, | 348 | 0xf8, 0x45, 0x06, 0xdb, 0xf0, 0x10, 0x00, 0x01, |
349 | 0x88, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x06, 0xda, | 349 | 0x88, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x06, 0xda, |
350 | 0xe5, 0x98, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, | 350 | 0xe5, 0x98, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, |
351 | 0x88, 0x11, 0x11, 0x04, 0x10, 0x06, 0x71, 0x05, | 351 | 0x88, 0x11, 0x11, 0x04, 0x10, 0x06, 0x71, 0x05, |
352 | 0x00, 0x12, 0x61, 0xf8, 0x00, 0x12, 0x00, 0x01, | 352 | 0x00, 0x12, 0x61, 0xf8, 0x00, 0x12, 0x00, 0x01, |
353 | 0xf8, 0x20, 0x06, 0xea, 0xf0, 0x00, 0x00, 0x01, | 353 | 0xf8, 0x20, 0x06, 0xea, 0xf0, 0x00, 0x00, 0x01, |
354 | 0xf6, 0xb8, 0xf0, 0x00, 0x00, 0x01, 0x6f, 0xf8, | 354 | 0xf6, 0xb8, 0xf0, 0x00, 0x00, 0x01, 0x6f, 0xf8, |
355 | 0x00, 0x12, 0x0f, 0x1f, 0x48, 0x08, 0x81, 0x00, | 355 | 0x00, 0x12, 0x0f, 0x1f, 0x48, 0x08, 0x81, 0x00, |
356 | 0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xba, | 356 | 0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xba, |
357 | 0xf4, 0x95, 0x48, 0x11, 0xee, 0x02, 0x8a, 0x11, | 357 | 0xf4, 0x95, 0x48, 0x11, 0xee, 0x02, 0x8a, 0x11, |
358 | 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x88, 0x12, | 358 | 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x88, 0x12, |
359 | 0x11, 0x04, 0x10, 0x06, 0x71, 0x05, 0x00, 0x13, | 359 | 0x11, 0x04, 0x10, 0x06, 0x71, 0x05, 0x00, 0x13, |
360 | 0x61, 0xf8, 0x00, 0x13, 0x00, 0x01, 0xf8, 0x20, | 360 | 0x61, 0xf8, 0x00, 0x13, 0x00, 0x01, 0xf8, 0x20, |
361 | 0x07, 0x09, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00, | 361 | 0x07, 0x09, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00, |
362 | 0x00, 0x01, 0x88, 0x11, 0xf6, 0xb8, 0x6f, 0xf8, | 362 | 0x00, 0x01, 0x88, 0x11, 0xf6, 0xb8, 0x6f, 0xf8, |
363 | 0x00, 0x13, 0x0f, 0x1f, 0x81, 0x00, 0x48, 0x11, | 363 | 0x00, 0x13, 0x0f, 0x1f, 0x81, 0x00, 0x48, 0x11, |
364 | 0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xce, | 364 | 0xf4, 0x7f, 0x80, 0x01, 0xf2, 0x74, 0x06, 0xce, |
365 | 0xf4, 0x95, 0x48, 0x12, 0x48, 0x11, 0xf0, 0x30, | 365 | 0xf4, 0x95, 0x48, 0x12, 0x48, 0x11, 0xf0, 0x30, |
366 | 0xff, 0xfe, 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, | 366 | 0xff, 0xfe, 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, |
367 | 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xfc, | 367 | 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xfc, |
368 | 0xf4, 0x95, 0x80, 0x02, 0x71, 0x08, 0x00, 0x16, | 368 | 0xf4, 0x95, 0x80, 0x02, 0x71, 0x08, 0x00, 0x16, |
369 | 0x10, 0x09, 0x71, 0x0b, 0x00, 0x17, 0x80, 0x03, | 369 | 0x10, 0x09, 0x71, 0x0b, 0x00, 0x17, 0x80, 0x03, |
370 | 0x71, 0x0a, 0x00, 0x11, 0x48, 0x17, 0xf8, 0x45, | 370 | 0x71, 0x0a, 0x00, 0x11, 0x48, 0x17, 0xf8, 0x45, |
371 | 0x07, 0x3f, 0x70, 0x00, 0x00, 0x11, 0x10, 0x03, | 371 | 0x07, 0x3f, 0x70, 0x00, 0x00, 0x11, 0x10, 0x03, |
372 | 0xf0, 0x74, 0x06, 0x9f, 0x80, 0x01, 0x70, 0x00, | 372 | 0xf0, 0x74, 0x06, 0x9f, 0x80, 0x01, 0x70, 0x00, |
373 | 0x00, 0x16, 0x10, 0x02, 0xf0, 0x74, 0x06, 0x7b, | 373 | 0x00, 0x16, 0x10, 0x02, 0xf0, 0x74, 0x06, 0x7b, |
374 | 0x6d, 0x91, 0x6d, 0x96, 0x6c, 0xef, 0xff, 0xff, | 374 | 0x6d, 0x91, 0x6d, 0x96, 0x6c, 0xef, 0xff, 0xff, |
375 | 0x07, 0x2f, 0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, | 375 | 0x07, 0x2f, 0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, |
376 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, | 376 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, |
377 | 0x10, 0xf8, 0x2a, 0xe8, 0x08, 0xf8, 0x2a, 0xe9, | 377 | 0x10, 0xf8, 0x2a, 0xe8, 0x08, 0xf8, 0x2a, 0xe9, |
378 | 0xf8, 0x45, 0x07, 0x64, 0x76, 0x00, 0x00, 0x01, | 378 | 0xf8, 0x45, 0x07, 0x64, 0x76, 0x00, 0x00, 0x01, |
379 | 0x62, 0xf8, 0x2a, 0xe9, 0x00, 0x5e, 0xf2, 0x74, | 379 | 0x62, 0xf8, 0x2a, 0xe9, 0x00, 0x5e, 0xf2, 0x74, |
380 | 0x12, 0x0b, 0xf0, 0x00, 0x30, 0x40, 0x72, 0x11, | 380 | 0x12, 0x0b, 0xf0, 0x00, 0x30, 0x40, 0x72, 0x11, |
381 | 0x2a, 0xe9, 0x77, 0x10, 0x00, 0x0f, 0xf5, 0xa9, | 381 | 0x2a, 0xe9, 0x77, 0x10, 0x00, 0x0f, 0xf5, 0xa9, |
382 | 0xf8, 0x20, 0x07, 0x61, 0x6b, 0xf8, 0x2a, 0xe9, | 382 | 0xf8, 0x20, 0x07, 0x61, 0x6b, 0xf8, 0x2a, 0xe9, |
383 | 0x00, 0x01, 0xf0, 0x73, 0x07, 0x64, 0x76, 0xf8, | 383 | 0x00, 0x01, 0xf0, 0x73, 0x07, 0x64, 0x76, 0xf8, |
384 | 0x2a, 0xe9, 0x00, 0x00, 0xee, 0x02, 0x8a, 0x11, | 384 | 0x2a, 0xe9, 0x00, 0x00, 0xee, 0x02, 0x8a, 0x11, |
385 | 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xe8, 0x00, | 385 | 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x11, 0xe8, 0x00, |
386 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x08, 0xe8, 0x00, | 386 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x08, 0xe8, 0x00, |
387 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x09, 0xf6, 0xb8, | 387 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x09, 0xf6, 0xb8, |
388 | 0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, 0x75, 0xf8, | 388 | 0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, 0x75, 0xf8, |
389 | 0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, 0x0c, 0x30, | 389 | 0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, 0x0c, 0x30, |
390 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, 0x76, 0xf8, | 390 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, 0x76, 0xf8, |
391 | 0x2a, 0xe8, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xe9, | 391 | 0x2a, 0xe8, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xe9, |
392 | 0x00, 0x00, 0x6c, 0x81, 0x07, 0x92, 0x76, 0xf8, | 392 | 0x00, 0x00, 0x6c, 0x81, 0x07, 0x92, 0x76, 0xf8, |
393 | 0x2a, 0xea, 0x00, 0x00, 0xfb, 0x80, 0x16, 0x76, | 393 | 0x2a, 0xea, 0x00, 0x00, 0xfb, 0x80, 0x16, 0x76, |
394 | 0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, 0x75, 0xf8, | 394 | 0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, 0x75, 0xf8, |
395 | 0x00, 0x08, 0x00, 0x00, 0xf0, 0x73, 0x07, 0xa8, | 395 | 0x00, 0x08, 0x00, 0x00, 0xf0, 0x73, 0x07, 0xa8, |
396 | 0x76, 0xf8, 0x2a, 0xea, 0x00, 0x01, 0xfb, 0x80, | 396 | 0x76, 0xf8, 0x2a, 0xea, 0x00, 0x01, 0xfb, 0x80, |
397 | 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x10, 0xfb, 0x80, | 397 | 0x16, 0x66, 0xf4, 0x95, 0xe8, 0x10, 0xfb, 0x80, |
398 | 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, | 398 | 0x16, 0x87, 0xf4, 0x95, 0xe8, 0x10, 0xe8, 0x00, |
399 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0xf6, 0xb8, | 399 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0xf6, 0xb8, |
400 | 0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, 0x75, 0xf8, | 400 | 0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, 0x75, 0xf8, |
401 | 0x00, 0x08, 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, | 401 | 0x00, 0x08, 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, |
402 | 0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, | 402 | 0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, 0x4a, 0x0a, |
403 | 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, | 403 | 0x4a, 0x06, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, |
404 | 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, | 404 | 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, |
405 | 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, | 405 | 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, |
406 | 0x10, 0xf8, 0x2a, 0xea, 0xf8, 0x45, 0x07, 0xe1, | 406 | 0x10, 0xf8, 0x2a, 0xea, 0xf8, 0x45, 0x07, 0xe1, |
407 | 0x10, 0xf8, 0x2a, 0xe8, 0xf0, 0x00, 0x00, 0x01, | 407 | 0x10, 0xf8, 0x2a, 0xe8, 0xf0, 0x00, 0x00, 0x01, |
408 | 0xf0, 0x30, 0x00, 0x0f, 0x80, 0xf8, 0x2a, 0xe8, | 408 | 0xf0, 0x30, 0x00, 0x0f, 0x80, 0xf8, 0x2a, 0xe8, |
409 | 0x10, 0xf8, 0x2a, 0xe8, 0xf8, 0x44, 0x07, 0xd6, | 409 | 0x10, 0xf8, 0x2a, 0xe8, 0xf8, 0x44, 0x07, 0xd6, |
410 | 0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, | 410 | 0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xfc, 0x3f, |
411 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, | 411 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0d, 0xf0, 0x20, |
412 | 0x0c, 0x30, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, | 412 | 0x0c, 0x30, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x0c, |
413 | 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, | 413 | 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, |
414 | 0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, | 414 | 0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0xff, |
415 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0x8a, 0x1d, | 415 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x00, 0x8a, 0x1d, |
416 | 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0a, 0x8a, 0x09, | 416 | 0x8a, 0x07, 0x8a, 0x06, 0x8a, 0x0a, 0x8a, 0x09, |
417 | 0x8a, 0x08, 0xf4, 0xeb, 0xee, 0xff, 0xf2, 0x74, | 417 | 0x8a, 0x08, 0xf4, 0xeb, 0xee, 0xff, 0xf2, 0x74, |
418 | 0x07, 0x67, 0xf4, 0x95, 0xe8, 0x01, 0xee, 0x01, | 418 | 0x07, 0x67, 0xf4, 0x95, 0xe8, 0x01, 0xee, 0x01, |
419 | 0xfc, 0x00, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, | 419 | 0xfc, 0x00, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, |
420 | 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, | 420 | 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, |
421 | 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, | 421 | 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, |
422 | 0x8a, 0x1d, 0x8a, 0x07, 0xf4, 0xeb, 0x4a, 0x11, | 422 | 0x8a, 0x1d, 0x8a, 0x07, 0xf4, 0xeb, 0x4a, 0x11, |
423 | 0x77, 0x11, 0x00, 0x28, 0x76, 0x81, 0x24, 0x00, | 423 | 0x77, 0x11, 0x00, 0x28, 0x76, 0x81, 0x24, 0x00, |
424 | 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, | 424 | 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, |
425 | 0xf2, 0x74, 0x07, 0x67, 0xf4, 0x95, 0xe8, 0x00, | 425 | 0xf2, 0x74, 0x07, 0x67, 0xf4, 0x95, 0xe8, 0x00, |
426 | 0x77, 0x11, 0x00, 0x1d, 0x68, 0x81, 0x00, 0x7f, | 426 | 0x77, 0x11, 0x00, 0x1d, 0x68, 0x81, 0x00, 0x7f, |
427 | 0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0x80, | 427 | 0xf6, 0xb8, 0xf4, 0x95, 0xf0, 0x20, 0xff, 0x80, |
428 | 0x77, 0x11, 0x00, 0x1d, 0xf0, 0x30, 0x01, 0x00, | 428 | 0x77, 0x11, 0x00, 0x1d, 0xf0, 0x30, 0x01, 0x00, |
429 | 0x1a, 0x81, 0x80, 0x81, 0xf0, 0x74, 0x0a, 0x33, | 429 | 0x1a, 0x81, 0x80, 0x81, 0xf0, 0x74, 0x0a, 0x33, |
430 | 0xf0, 0x74, 0x11, 0xac, 0xf9, 0x80, 0x13, 0x25, | 430 | 0xf0, 0x74, 0x11, 0xac, 0xf9, 0x80, 0x13, 0x25, |
431 | 0xf9, 0x80, 0x16, 0x53, 0xf9, 0x80, 0x17, 0x82, | 431 | 0xf9, 0x80, 0x16, 0x53, 0xf9, 0x80, 0x17, 0x82, |
432 | 0xf0, 0x74, 0x06, 0x2f, 0xf9, 0x80, 0x14, 0xb2, | 432 | 0xf0, 0x74, 0x06, 0x2f, 0xf9, 0x80, 0x14, 0xb2, |
433 | 0xf9, 0x80, 0x19, 0x10, 0xf0, 0x74, 0x0d, 0xe3, | 433 | 0xf9, 0x80, 0x19, 0x10, 0xf0, 0x74, 0x0d, 0xe3, |
434 | 0xf0, 0x74, 0x07, 0xe8, 0xf0, 0x74, 0x02, 0x36, | 434 | 0xf0, 0x74, 0x07, 0xe8, 0xf0, 0x74, 0x02, 0x36, |
435 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x60, 0xf8, | 435 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x60, 0xf8, |
436 | 0x27, 0x7b, 0xff, 0xff, 0xf8, 0x30, 0x08, 0x39, | 436 | 0x27, 0x7b, 0xff, 0xff, 0xf8, 0x30, 0x08, 0x39, |
437 | 0x71, 0xf8, 0x27, 0x7b, 0x27, 0x79, 0x60, 0xf8, | 437 | 0x71, 0xf8, 0x27, 0x7b, 0x27, 0x79, 0x60, 0xf8, |
438 | 0x27, 0x79, 0xff, 0xff, 0xf8, 0x30, 0x08, 0xb2, | 438 | 0x27, 0x79, 0xff, 0xff, 0xf8, 0x30, 0x08, 0xb2, |
439 | 0x10, 0xf8, 0x29, 0x86, 0x08, 0xf8, 0x27, 0x79, | 439 | 0x10, 0xf8, 0x29, 0x86, 0x08, 0xf8, 0x27, 0x79, |
440 | 0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, 0xf4, 0x95, | 440 | 0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, 0xf4, 0x95, |
441 | 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x30, | 441 | 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x30, |
442 | 0x08, 0x58, 0x10, 0xf8, 0x27, 0x79, 0x08, 0xf8, | 442 | 0x08, 0x58, 0x10, 0xf8, 0x27, 0x79, 0x08, 0xf8, |
443 | 0x27, 0x7a, 0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, | 443 | 0x27, 0x7a, 0xf0, 0x30, 0x7f, 0xff, 0x88, 0x11, |
444 | 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, | 444 | 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, |
445 | 0xf8, 0x20, 0x08, 0x63, 0x76, 0xf8, 0x27, 0x79, | 445 | 0xf8, 0x20, 0x08, 0x63, 0x76, 0xf8, 0x27, 0x79, |
446 | 0xff, 0xff, 0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, | 446 | 0xff, 0xff, 0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, |
447 | 0xf7, 0xb8, 0xf2, 0x73, 0x08, 0xd9, 0xf0, 0x20, | 447 | 0xf7, 0xb8, 0xf2, 0x73, 0x08, 0xd9, 0xf0, 0x20, |
448 | 0xff, 0xff, 0xf6, 0xb8, 0x56, 0xf8, 0x27, 0x74, | 448 | 0xff, 0xff, 0xf6, 0xb8, 0x56, 0xf8, 0x27, 0x74, |
449 | 0xf0, 0xf9, 0x88, 0x11, 0x56, 0xf8, 0x27, 0x72, | 449 | 0xf0, 0xf9, 0x88, 0x11, 0x56, 0xf8, 0x27, 0x72, |
450 | 0xf0, 0xf9, 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, | 450 | 0xf0, 0xf9, 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, |
451 | 0xe7, 0x20, 0xf4, 0xa9, 0xf8, 0x30, 0x08, 0x8f, | 451 | 0xe7, 0x20, 0xf4, 0xa9, 0xf8, 0x30, 0x08, 0x8f, |
452 | 0xf1, 0x20, 0x27, 0x7c, 0x48, 0x11, 0xf6, 0x00, | 452 | 0xf1, 0x20, 0x27, 0x7c, 0x48, 0x11, 0xf6, 0x00, |
453 | 0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x83, | 453 | 0x88, 0x13, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x83, |
454 | 0x08, 0xf8, 0x27, 0x79, 0xf0, 0x30, 0x7f, 0xff, | 454 | 0x08, 0xf8, 0x27, 0x79, 0xf0, 0x30, 0x7f, 0xff, |
455 | 0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, | 455 | 0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, |
456 | 0xf5, 0xab, 0xf8, 0x30, 0x08, 0x8f, 0x6d, 0x91, | 456 | 0xf5, 0xab, 0xf8, 0x30, 0x08, 0x8f, 0x6d, 0x91, |
457 | 0x48, 0x11, 0xf0, 0x30, 0x01, 0xff, 0x88, 0x11, | 457 | 0x48, 0x11, 0xf0, 0x30, 0x01, 0xff, 0x88, 0x11, |
458 | 0xf4, 0x95, 0xe7, 0x20, 0xf7, 0xa9, 0xf8, 0x30, | 458 | 0xf4, 0x95, 0xe7, 0x20, 0xf7, 0xa9, 0xf8, 0x30, |
459 | 0x08, 0x74, 0x6d, 0x89, 0x48, 0x11, 0xf0, 0x30, | 459 | 0x08, 0x74, 0x6d, 0x89, 0x48, 0x11, 0xf0, 0x30, |
460 | 0x01, 0xff, 0xf0, 0xe7, 0xf4, 0x95, 0x48, 0x08, | 460 | 0x01, 0xff, 0xf0, 0xe7, 0xf4, 0x95, 0x48, 0x08, |
461 | 0x4e, 0xf8, 0x27, 0x74, 0x48, 0x08, 0xf1, 0xf9, | 461 | 0x4e, 0xf8, 0x27, 0x74, 0x48, 0x08, 0xf1, 0xf9, |
462 | 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, | 462 | 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, |
463 | 0x27, 0x7c, 0x27, 0x7a, 0x60, 0xf8, 0x27, 0x7b, | 463 | 0x27, 0x7c, 0x27, 0x7a, 0x60, 0xf8, 0x27, 0x7b, |
464 | 0xff, 0xff, 0xf8, 0x30, 0x08, 0xab, 0x48, 0x08, | 464 | 0xff, 0xff, 0xf8, 0x30, 0x08, 0xab, 0x48, 0x08, |
465 | 0x4e, 0xf8, 0x27, 0x72, 0x76, 0xf8, 0x27, 0x7b, | 465 | 0x4e, 0xf8, 0x27, 0x72, 0x76, 0xf8, 0x27, 0x7b, |
466 | 0xff, 0xff, 0x76, 0xf8, 0x27, 0x79, 0xff, 0xff, | 466 | 0xff, 0xff, 0x76, 0xf8, 0x27, 0x79, 0xff, 0xff, |
467 | 0xf2, 0x73, 0x08, 0xd9, 0xf4, 0x95, 0xe8, 0x00, | 467 | 0xf2, 0x73, 0x08, 0xd9, 0xf4, 0x95, 0xe8, 0x00, |
468 | 0x44, 0xf8, 0x27, 0x73, 0x40, 0xf8, 0x27, 0x75, | 468 | 0x44, 0xf8, 0x27, 0x73, 0x40, 0xf8, 0x27, 0x75, |
469 | 0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10, | 469 | 0x82, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0x77, 0x10, |
470 | 0x80, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xd8, | 470 | 0x80, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xd8, |
471 | 0xf6, 0xb8, 0x10, 0xf8, 0x27, 0x73, 0xf0, 0x00, | 471 | 0xf6, 0xb8, 0x10, 0xf8, 0x27, 0x73, 0xf0, 0x00, |
472 | 0x80, 0x00, 0x48, 0x08, 0x4e, 0xf8, 0x27, 0x74, | 472 | 0x80, 0x00, 0x48, 0x08, 0x4e, 0xf8, 0x27, 0x74, |
473 | 0x48, 0x08, 0xf0, 0xf9, 0x88, 0x11, 0xf4, 0x95, | 473 | 0x48, 0x08, 0xf0, 0xf9, 0x88, 0x11, 0xf4, 0x95, |
474 | 0xf4, 0x95, 0x71, 0xe1, 0x27, 0x7c, 0x27, 0x7a, | 474 | 0xf4, 0x95, 0x71, 0xe1, 0x27, 0x7c, 0x27, 0x7a, |
475 | 0xf7, 0xb8, 0x57, 0xf8, 0x27, 0x74, 0xf0, 0x62, | 475 | 0xf7, 0xb8, 0x57, 0xf8, 0x27, 0x74, 0xf0, 0x62, |
476 | 0xff, 0xff, 0xf0, 0x40, 0xff, 0x80, 0xf2, 0x80, | 476 | 0xff, 0xff, 0xf0, 0x40, 0xff, 0x80, 0xf2, 0x80, |
477 | 0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, 0x8a, 0x11, | 477 | 0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, 0x8a, 0x11, |
478 | 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfb, | 478 | 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfb, |
479 | 0x11, 0xf8, 0x27, 0x71, 0x09, 0xf8, 0x27, 0x73, | 479 | 0x11, 0xf8, 0x27, 0x71, 0x09, 0xf8, 0x27, 0x73, |
480 | 0x89, 0x11, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, | 480 | 0x89, 0x11, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, |
481 | 0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xed, 0xf2, 0x73, | 481 | 0xf6, 0xa9, 0xf8, 0x20, 0x08, 0xed, 0xf2, 0x73, |
482 | 0x09, 0x0e, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0x20, | 482 | 0x09, 0x0e, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0x20, |
483 | 0x76, 0x00, 0x00, 0x41, 0xf0, 0x74, 0x12, 0xee, | 483 | 0x76, 0x00, 0x00, 0x41, 0xf0, 0x74, 0x12, 0xee, |
484 | 0x88, 0x16, 0xf4, 0x95, 0xf7, 0xb8, 0x6d, 0x96, | 484 | 0x88, 0x16, 0xf4, 0x95, 0xf7, 0xb8, 0x6d, 0x96, |
485 | 0x10, 0xf8, 0x00, 0x16, 0xf8, 0x47, 0x09, 0x0a, | 485 | 0x10, 0xf8, 0x00, 0x16, 0xf8, 0x47, 0x09, 0x0a, |
486 | 0xe7, 0x61, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, | 486 | 0xe7, 0x61, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, |
487 | 0x00, 0x80, 0x76, 0x02, 0x00, 0xff, 0x76, 0x03, | 487 | 0x00, 0x80, 0x76, 0x02, 0x00, 0xff, 0x76, 0x03, |
488 | 0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, | 488 | 0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, |
489 | 0xe8, 0x00, 0x6c, 0xe9, 0xff, 0xff, 0x08, 0xfb, | 489 | 0xe8, 0x00, 0x6c, 0xe9, 0xff, 0xff, 0x08, 0xfb, |
490 | 0x73, 0x16, 0x00, 0x0e, 0xf0, 0x66, 0x00, 0x41, | 490 | 0x73, 0x16, 0x00, 0x0e, 0xf0, 0x66, 0x00, 0x41, |
491 | 0xee, 0x05, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, | 491 | 0xee, 0x05, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, |
492 | 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x13, | 492 | 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x13, |
493 | 0xf6, 0xb8, 0x77, 0x11, 0x7f, 0xff, 0x57, 0xf8, | 493 | 0xf6, 0xb8, 0x77, 0x11, 0x7f, 0xff, 0x57, 0xf8, |
494 | 0x27, 0x72, 0x48, 0x11, 0xf2, 0x80, 0xf0, 0x00, | 494 | 0x27, 0x72, 0x48, 0x11, 0xf2, 0x80, 0xf0, 0x00, |
495 | 0x80, 0x00, 0x88, 0x11, 0xf6, 0x40, 0xf0, 0xe0, | 495 | 0x80, 0x00, 0x88, 0x11, 0xf6, 0x40, 0xf0, 0xe0, |
496 | 0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, 0x80, 0xf8, | 496 | 0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, 0x80, 0xf8, |
497 | 0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x57, 0xf8, | 497 | 0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x57, 0xf8, |
498 | 0x27, 0x72, 0x48, 0x12, 0xf2, 0x80, 0x88, 0x12, | 498 | 0x27, 0x72, 0x48, 0x12, 0xf2, 0x80, 0x88, 0x12, |
499 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x09, 0x38, | 499 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x09, 0x38, |
500 | 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, | 500 | 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, |
501 | 0xf0, 0x73, 0x09, 0x3d, 0xf0, 0x20, 0x80, 0x01, | 501 | 0xf0, 0x73, 0x09, 0x3d, 0xf0, 0x20, 0x80, 0x01, |
502 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x70, 0x81, | 502 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x70, 0x81, |
503 | 0x00, 0x13, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, | 503 | 0x00, 0x13, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, |
504 | 0xf0, 0x30, 0x7f, 0xff, 0x11, 0xf8, 0x29, 0x86, | 504 | 0xf0, 0x30, 0x7f, 0xff, 0x11, 0xf8, 0x29, 0x86, |
505 | 0xf5, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11, | 505 | 0xf5, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11, |
506 | 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, | 506 | 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, |
507 | 0xf8, 0x20, 0x09, 0x54, 0xf2, 0x73, 0x09, 0x67, | 507 | 0xf8, 0x20, 0x09, 0x54, 0xf2, 0x73, 0x09, 0x67, |
508 | 0xf4, 0x95, 0xe8, 0x02, 0x6f, 0xf8, 0x27, 0x7a, | 508 | 0xf4, 0x95, 0xe8, 0x02, 0x6f, 0xf8, 0x27, 0x7a, |
509 | 0x0d, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11, | 509 | 0x0d, 0x20, 0xf3, 0x30, 0x7f, 0xff, 0x89, 0x11, |
510 | 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, | 510 | 0xf4, 0x95, 0x77, 0x10, 0x40, 0x00, 0xf6, 0xa9, |
511 | 0xf8, 0x20, 0x09, 0x64, 0xf2, 0x73, 0x09, 0x67, | 511 | 0xf8, 0x20, 0x09, 0x64, 0xf2, 0x73, 0x09, 0x67, |
512 | 0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x27, 0x7b, | 512 | 0xf4, 0x95, 0xe8, 0x01, 0x80, 0xf8, 0x27, 0x7b, |
513 | 0xe8, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, | 513 | 0xe8, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, |
514 | 0x11, 0xf8, 0x29, 0x86, 0xf5, 0x20, 0xf3, 0x30, | 514 | 0x11, 0xf8, 0x29, 0x86, 0xf5, 0x20, 0xf3, 0x30, |
515 | 0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, | 515 | 0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, |
516 | 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x7a, | 516 | 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x7a, |
517 | 0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x02, | 517 | 0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x02, |
518 | 0x6f, 0xf8, 0x27, 0x7a, 0x0d, 0x20, 0xf3, 0x30, | 518 | 0x6f, 0xf8, 0x27, 0x7a, 0x0d, 0x20, 0xf3, 0x30, |
519 | 0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, | 519 | 0x7f, 0xff, 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, |
520 | 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x8a, | 520 | 0x40, 0x00, 0xf6, 0xa9, 0xf8, 0x20, 0x09, 0x8a, |
521 | 0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x01, | 521 | 0xf2, 0x73, 0x09, 0x8d, 0xf4, 0x95, 0xe8, 0x01, |
522 | 0x80, 0xf8, 0x27, 0x79, 0xe8, 0x00, 0x8a, 0x11, | 522 | 0x80, 0xf8, 0x27, 0x79, 0xe8, 0x00, 0x8a, 0x11, |
523 | 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, | 523 | 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, |
524 | 0x00, 0x12, 0x88, 0x11, 0xf6, 0xb8, 0x57, 0xf8, | 524 | 0x00, 0x12, 0x88, 0x11, 0xf6, 0xb8, 0x57, 0xf8, |
525 | 0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80, | 525 | 0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80, |
526 | 0xf0, 0x00, 0x80, 0x00, 0x80, 0x81, 0x57, 0xf8, | 526 | 0xf0, 0x00, 0x80, 0x00, 0x80, 0x81, 0x57, 0xf8, |
527 | 0x27, 0x72, 0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, | 527 | 0x27, 0x72, 0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, |
528 | 0x80, 0xf8, 0x27, 0x78, 0x77, 0x11, 0x80, 0x00, | 528 | 0x80, 0xf8, 0x27, 0x78, 0x77, 0x11, 0x80, 0x00, |
529 | 0x48, 0x11, 0x57, 0xf8, 0x27, 0x72, 0xf2, 0x80, | 529 | 0x48, 0x11, 0x57, 0xf8, 0x27, 0x72, 0xf2, 0x80, |
530 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, | 530 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, |
531 | 0x09, 0xb5, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, | 531 | 0x09, 0xb5, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, |
532 | 0x00, 0x01, 0xf0, 0x73, 0x09, 0xba, 0xf0, 0x20, | 532 | 0x00, 0x01, 0xf0, 0x73, 0x09, 0xba, 0xf0, 0x20, |
533 | 0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, | 533 | 0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, |
534 | 0x45, 0xf8, 0x27, 0x71, 0x43, 0xf8, 0x27, 0x73, | 534 | 0x45, 0xf8, 0x27, 0x71, 0x43, 0xf8, 0x27, 0x73, |
535 | 0x83, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0xe7, 0x20, | 535 | 0x83, 0xf8, 0x00, 0x11, 0xf4, 0x95, 0xe7, 0x20, |
536 | 0xf6, 0xa9, 0xf8, 0x30, 0x09, 0xc9, 0xf2, 0x73, | 536 | 0xf6, 0xa9, 0xf8, 0x30, 0x09, 0xc9, 0xf2, 0x73, |
537 | 0x09, 0xe4, 0x77, 0x12, 0x00, 0x00, 0x57, 0xf8, | 537 | 0x09, 0xe4, 0x77, 0x12, 0x00, 0x00, 0x57, 0xf8, |
538 | 0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80, | 538 | 0x27, 0x72, 0xf0, 0x20, 0x7f, 0xff, 0xf2, 0x80, |
539 | 0x49, 0x12, 0xf5, 0x00, 0xf3, 0x00, 0x80, 0x00, | 539 | 0x49, 0x12, 0xf5, 0x00, 0xf3, 0x00, 0x80, 0x00, |
540 | 0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, 0xf8, 0x30, | 540 | 0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, 0xf8, 0x30, |
541 | 0x09, 0xdc, 0xf1, 0x20, 0x80, 0x00, 0xf5, 0x20, | 541 | 0x09, 0xdc, 0xf1, 0x20, 0x80, 0x00, 0xf5, 0x20, |
542 | 0x89, 0x12, 0xf4, 0x95, 0x48, 0x12, 0x6f, 0xf8, | 542 | 0x89, 0x12, 0xf4, 0x95, 0x48, 0x12, 0x6f, 0xf8, |
543 | 0x27, 0x73, 0x0d, 0x00, 0xf4, 0x95, 0x49, 0x0b, | 543 | 0x27, 0x73, 0x0d, 0x00, 0xf4, 0x95, 0x49, 0x0b, |
544 | 0x4f, 0xf8, 0x27, 0x72, 0x8a, 0x11, 0xfe, 0x00, | 544 | 0x4f, 0xf8, 0x27, 0x72, 0x8a, 0x11, 0xfe, 0x00, |
545 | 0x48, 0x12, 0xf4, 0x95, 0x4a, 0x11, 0x4a, 0x16, | 545 | 0x48, 0x12, 0xf4, 0x95, 0x4a, 0x11, 0x4a, 0x16, |
546 | 0x4a, 0x17, 0xee, 0xfc, 0xf4, 0x95, 0x71, 0x08, | 546 | 0x4a, 0x17, 0xee, 0xfc, 0xf4, 0x95, 0x71, 0x08, |
547 | 0x00, 0x16, 0x88, 0x17, 0xf0, 0x74, 0x08, 0x30, | 547 | 0x00, 0x16, 0x88, 0x17, 0xf0, 0x74, 0x08, 0x30, |
548 | 0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74, | 548 | 0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74, |
549 | 0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, | 549 | 0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, |
550 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0a, 0x0a, | 550 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0a, 0x0a, |
551 | 0xf2, 0x74, 0x08, 0xdb, 0xf4, 0x95, 0x48, 0x16, | 551 | 0xf2, 0x74, 0x08, 0xdb, 0xf4, 0x95, 0x48, 0x16, |
552 | 0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74, | 552 | 0x48, 0x18, 0x70, 0x00, 0x00, 0x16, 0xf2, 0x74, |
553 | 0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, | 553 | 0x09, 0x8f, 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, |
554 | 0x10, 0x02, 0x70, 0x01, 0x00, 0x11, 0x80, 0x00, | 554 | 0x10, 0x02, 0x70, 0x01, 0x00, 0x11, 0x80, 0x00, |
555 | 0xf2, 0x74, 0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, | 555 | 0xf2, 0x74, 0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, |
556 | 0x49, 0x11, 0x48, 0x17, 0xf6, 0x00, 0x88, 0x17, | 556 | 0x49, 0x11, 0x48, 0x17, 0xf6, 0x00, 0x88, 0x17, |
557 | 0xe7, 0x60, 0xf5, 0xa9, 0xf8, 0x20, 0x0a, 0x2d, | 557 | 0xe7, 0x60, 0xf5, 0xa9, 0xf8, 0x20, 0x0a, 0x2d, |
558 | 0x48, 0x16, 0xf6, 0x20, 0x88, 0x11, 0x48, 0x18, | 558 | 0x48, 0x16, 0xf6, 0x20, 0x88, 0x11, 0x48, 0x18, |
559 | 0x70, 0x00, 0x00, 0x11, 0xf2, 0x74, 0x09, 0x8f, | 559 | 0x70, 0x00, 0x00, 0x11, 0xf2, 0x74, 0x09, 0x8f, |
560 | 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 0x70, 0x01, | 560 | 0xf0, 0x00, 0x00, 0x02, 0x88, 0x11, 0x70, 0x01, |
561 | 0x00, 0x11, 0x10, 0x02, 0x80, 0x00, 0xf2, 0x74, | 561 | 0x00, 0x11, 0x10, 0x02, 0x80, 0x00, 0xf2, 0x74, |
562 | 0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, 0xee, 0x04, | 562 | 0x06, 0xce, 0xf4, 0x95, 0x48, 0x17, 0xee, 0x04, |
563 | 0x48, 0x16, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, | 563 | 0x48, 0x16, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, |
564 | 0xfc, 0x00, 0xee, 0xfd, 0xe8, 0x00, 0x4e, 0xf8, | 564 | 0xfc, 0x00, 0xee, 0xfd, 0xe8, 0x00, 0x4e, 0xf8, |
565 | 0x27, 0x70, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x72, | 565 | 0x27, 0x70, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x72, |
566 | 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, | 566 | 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x74, 0xe8, 0x00, |
567 | 0x4e, 0xf8, 0x27, 0x76, 0x76, 0xf8, 0x27, 0x79, | 567 | 0x4e, 0xf8, 0x27, 0x76, 0x76, 0xf8, 0x27, 0x79, |
568 | 0xff, 0xff, 0x76, 0xf8, 0x27, 0x7a, 0x00, 0x00, | 568 | 0xff, 0xff, 0x76, 0xf8, 0x27, 0x7a, 0x00, 0x00, |
569 | 0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, 0x76, 0xf8, | 569 | 0x76, 0xf8, 0x27, 0x7b, 0xff, 0xff, 0x76, 0xf8, |
570 | 0x27, 0x78, 0x00, 0x00, 0xe8, 0x00, 0x75, 0xf8, | 570 | 0x27, 0x78, 0x00, 0x00, 0xe8, 0x00, 0x75, 0xf8, |
571 | 0x00, 0x08, 0x00, 0x01, 0x76, 0x00, 0x00, 0x00, | 571 | 0x00, 0x08, 0x00, 0x01, 0x76, 0x00, 0x00, 0x00, |
572 | 0x76, 0x01, 0x02, 0x00, 0xf2, 0x74, 0x12, 0xdc, | 572 | 0x76, 0x01, 0x02, 0x00, 0xf2, 0x74, 0x12, 0xdc, |
573 | 0xf0, 0x20, 0x27, 0x7c, 0xee, 0x03, 0xfc, 0x00, | 573 | 0xf0, 0x20, 0x27, 0x7c, 0xee, 0x03, 0xfc, 0x00, |
574 | 0x4a, 0x11, 0xee, 0xfc, 0xf4, 0x95, 0x4e, 0x00, | 574 | 0x4a, 0x11, 0xee, 0xfc, 0xf4, 0x95, 0x4e, 0x00, |
575 | 0x77, 0x12, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x12, | 575 | 0x77, 0x12, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x12, |
576 | 0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x12, | 576 | 0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x12, |
577 | 0xf0, 0xe0, 0xf1, 0xf1, 0x4f, 0x02, 0xe9, 0x01, | 577 | 0xf0, 0xe0, 0xf1, 0xf1, 0x4f, 0x02, 0xe9, 0x01, |
578 | 0xf4, 0x95, 0x48, 0x0b, 0xf5, 0x40, 0x56, 0x02, | 578 | 0xf4, 0x95, 0x48, 0x0b, 0xf5, 0x40, 0x56, 0x02, |
579 | 0xf1, 0x80, 0x81, 0xf8, 0x27, 0x78, 0x77, 0x11, | 579 | 0xf1, 0x80, 0x81, 0xf8, 0x27, 0x78, 0x77, 0x11, |
580 | 0x80, 0x00, 0x56, 0x00, 0x49, 0x11, 0xf1, 0x80, | 580 | 0x80, 0x00, 0x56, 0x00, 0x49, 0x11, 0xf1, 0x80, |
581 | 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, | 581 | 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, |
582 | 0x0a, 0x81, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, | 582 | 0x0a, 0x81, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, |
583 | 0x00, 0x01, 0xf0, 0x73, 0x0a, 0x86, 0xf0, 0x20, | 583 | 0x00, 0x01, 0xf0, 0x73, 0x0a, 0x86, 0xf0, 0x20, |
584 | 0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, | 584 | 0x80, 0x01, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, |
585 | 0x10, 0x82, 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, | 585 | 0x10, 0x82, 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, |
586 | 0x4a, 0x11, 0xee, 0xfe, 0xf4, 0x95, 0x4e, 0x00, | 586 | 0x4a, 0x11, 0xee, 0xfe, 0xf4, 0x95, 0x4e, 0x00, |
587 | 0x77, 0x11, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x11, | 587 | 0x77, 0x11, 0x7f, 0xff, 0xf6, 0xb8, 0x49, 0x11, |
588 | 0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x11, | 588 | 0xf1, 0x80, 0xf3, 0x00, 0x80, 0x00, 0x89, 0x11, |
589 | 0xf0, 0xe0, 0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, | 589 | 0xf0, 0xe0, 0xf1, 0xf1, 0xe8, 0x01, 0xf2, 0x80, |
590 | 0x80, 0xf8, 0x27, 0x78, 0x56, 0x00, 0xf1, 0x20, | 590 | 0x80, 0xf8, 0x27, 0x78, 0x56, 0x00, 0xf1, 0x20, |
591 | 0x80, 0x00, 0xf1, 0x80, 0xf4, 0x95, 0x49, 0x0b, | 591 | 0x80, 0x00, 0xf1, 0x80, 0xf4, 0x95, 0x49, 0x0b, |
592 | 0xf8, 0x4d, 0x0a, 0xab, 0xf0, 0x20, 0x80, 0x01, | 592 | 0xf8, 0x4d, 0x0a, 0xab, 0xf0, 0x20, 0x80, 0x01, |
593 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf0, 0x73, | 593 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf0, 0x73, |
594 | 0x0a, 0xaf, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, | 594 | 0x0a, 0xaf, 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, |
595 | 0x00, 0x01, 0xee, 0x02, 0x48, 0x11, 0x8a, 0x11, | 595 | 0x00, 0x01, 0xee, 0x02, 0x48, 0x11, 0x8a, 0x11, |
596 | 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x12, 0x13, 0x02, | 596 | 0xfc, 0x00, 0x4a, 0x11, 0x88, 0x12, 0x13, 0x02, |
597 | 0x77, 0x11, 0x00, 0x00, 0xf8, 0x4d, 0x0a, 0xcb, | 597 | 0x77, 0x11, 0x00, 0x00, 0xf8, 0x4d, 0x0a, 0xcb, |
598 | 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 0xf4, 0x95, | 598 | 0xf3, 0x10, 0x00, 0x01, 0x89, 0x1a, 0xf4, 0x95, |
599 | 0xf0, 0x72, 0x0a, 0xca, 0x48, 0x11, 0x1c, 0xf8, | 599 | 0xf0, 0x72, 0x0a, 0xca, 0x48, 0x11, 0x1c, 0xf8, |
600 | 0x29, 0x7e, 0x88, 0x11, 0x11, 0xf8, 0x29, 0x7e, | 600 | 0x29, 0x7e, 0x88, 0x11, 0x11, 0xf8, 0x29, 0x7e, |
601 | 0xf2, 0x00, 0x00, 0x01, 0x80, 0xf8, 0x29, 0x7e, | 601 | 0xf2, 0x00, 0x00, 0x01, 0x80, 0xf8, 0x29, 0x7e, |
602 | 0x81, 0x92, 0x48, 0x11, 0x8a, 0x11, 0xfc, 0x00, | 602 | 0x81, 0x92, 0x48, 0x11, 0x8a, 0x11, 0xfc, 0x00, |
603 | 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x11, | 603 | 0x4a, 0x11, 0xf4, 0x95, 0x71, 0x02, 0x00, 0x11, |
604 | 0x88, 0x12, 0xf6, 0xb8, 0xf0, 0x20, 0x7f, 0xff, | 604 | 0x88, 0x12, 0xf6, 0xb8, 0xf0, 0x20, 0x7f, 0xff, |
605 | 0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0xf0, 0x00, | 605 | 0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0xf0, 0x00, |
606 | 0x80, 0x00, 0x80, 0x82, 0x57, 0xf8, 0x27, 0x70, | 606 | 0x80, 0x00, 0x80, 0x82, 0x57, 0xf8, 0x27, 0x70, |
607 | 0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, 0x80, 0xf8, | 607 | 0xe8, 0x01, 0xf3, 0xf1, 0xf2, 0x80, 0x80, 0xf8, |
608 | 0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x48, 0x12, | 608 | 0x27, 0x78, 0x77, 0x12, 0x80, 0x00, 0x48, 0x12, |
609 | 0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0x88, 0x12, | 609 | 0x57, 0xf8, 0x27, 0x70, 0xf2, 0x80, 0x88, 0x12, |
610 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x0a, 0xf4, | 610 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x82, 0x0a, 0xf4, |
611 | 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, | 611 | 0xe8, 0x00, 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, |
612 | 0xf0, 0x73, 0x0a, 0xf9, 0xf0, 0x20, 0x80, 0x01, | 612 | 0xf0, 0x73, 0x0a, 0xf9, 0xf0, 0x20, 0x80, 0x01, |
613 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x45, 0xf8, | 613 | 0x75, 0xf8, 0x00, 0x08, 0x00, 0x01, 0x45, 0xf8, |
614 | 0x27, 0x75, 0xe7, 0x10, 0x43, 0xf8, 0x27, 0x71, | 614 | 0x27, 0x75, 0xe7, 0x10, 0x43, 0xf8, 0x27, 0x71, |
615 | 0x83, 0xf8, 0x00, 0x12, 0x6d, 0xe8, 0x00, 0x04, | 615 | 0x83, 0xf8, 0x00, 0x12, 0x6d, 0xe8, 0x00, 0x04, |
616 | 0x6d, 0x8a, 0xf6, 0xaa, 0xf8, 0x30, 0x0b, 0x0a, | 616 | 0x6d, 0x8a, 0xf6, 0xaa, 0xf8, 0x30, 0x0b, 0x0a, |
617 | 0xf2, 0x73, 0x0b, 0x25, 0x77, 0x11, 0x00, 0x00, | 617 | 0xf2, 0x73, 0x0b, 0x25, 0x77, 0x11, 0x00, 0x00, |
618 | 0x57, 0xf8, 0x27, 0x70, 0xf0, 0x20, 0x7f, 0xff, | 618 | 0x57, 0xf8, 0x27, 0x70, 0xf0, 0x20, 0x7f, 0xff, |
619 | 0xf2, 0x80, 0x49, 0x11, 0xf5, 0x00, 0xf3, 0x00, | 619 | 0xf2, 0x80, 0x49, 0x11, 0xf5, 0x00, 0xf3, 0x00, |
620 | 0x80, 0x00, 0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, | 620 | 0x80, 0x00, 0x61, 0xf8, 0x00, 0x0b, 0x80, 0x00, |
621 | 0xf8, 0x30, 0x0b, 0x1d, 0xf1, 0x20, 0x80, 0x00, | 621 | 0xf8, 0x30, 0x0b, 0x1d, 0xf1, 0x20, 0x80, 0x00, |
622 | 0xf5, 0x20, 0x89, 0x11, 0xf4, 0x95, 0x48, 0x11, | 622 | 0xf5, 0x20, 0x89, 0x11, 0xf4, 0x95, 0x48, 0x11, |
623 | 0x6f, 0xf8, 0x27, 0x71, 0x0d, 0x00, 0xf4, 0x95, | 623 | 0x6f, 0xf8, 0x27, 0x71, 0x0d, 0x00, 0xf4, 0x95, |
624 | 0x49, 0x0b, 0x4f, 0xf8, 0x27, 0x70, 0x48, 0x11, | 624 | 0x49, 0x0b, 0x4f, 0xf8, 0x27, 0x70, 0x48, 0x11, |
625 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, | 625 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, |
626 | 0x4a, 0x17, 0xee, 0xf0, 0x88, 0x17, 0x10, 0x17, | 626 | 0x4a, 0x17, 0xee, 0xf0, 0x88, 0x17, 0x10, 0x17, |
627 | 0x80, 0x05, 0x10, 0x16, 0x80, 0x06, 0x10, 0x15, | 627 | 0x80, 0x05, 0x10, 0x16, 0x80, 0x06, 0x10, 0x15, |
628 | 0x80, 0x07, 0x71, 0x14, 0x00, 0x11, 0x10, 0x05, | 628 | 0x80, 0x07, 0x71, 0x14, 0x00, 0x11, 0x10, 0x05, |
629 | 0xf0, 0x30, 0x00, 0x01, 0x88, 0x10, 0x10, 0x06, | 629 | 0xf0, 0x30, 0x00, 0x01, 0x88, 0x10, 0x10, 0x06, |
630 | 0xf0, 0x30, 0x00, 0x01, 0x80, 0x08, 0x49, 0x11, | 630 | 0xf0, 0x30, 0x00, 0x01, 0x80, 0x08, 0x49, 0x11, |
631 | 0x10, 0x05, 0xf6, 0x01, 0x80, 0x09, 0x10, 0x06, | 631 | 0x10, 0x05, 0xf6, 0x01, 0x80, 0x09, 0x10, 0x06, |
632 | 0x61, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf8, 0x20, | 632 | 0x61, 0xf8, 0x00, 0x08, 0x00, 0x01, 0xf8, 0x20, |
633 | 0x0b, 0x4b, 0x10, 0x09, 0xf0, 0x00, 0x00, 0x01, | 633 | 0x0b, 0x4b, 0x10, 0x09, 0xf0, 0x00, 0x00, 0x01, |
634 | 0x80, 0x09, 0x71, 0x08, 0x00, 0x12, 0xf4, 0xaa, | 634 | 0x80, 0x09, 0x71, 0x08, 0x00, 0x12, 0xf4, 0xaa, |
635 | 0xf8, 0x30, 0x0b, 0x54, 0x10, 0x09, 0xf0, 0x00, | 635 | 0xf8, 0x30, 0x0b, 0x54, 0x10, 0x09, 0xf0, 0x00, |
636 | 0x00, 0x01, 0x80, 0x09, 0x12, 0x09, 0x49, 0x11, | 636 | 0x00, 0x01, 0x80, 0x09, 0x12, 0x09, 0x49, 0x11, |
637 | 0xf4, 0x7f, 0x80, 0x09, 0xf6, 0x20, 0x80, 0x0a, | 637 | 0xf4, 0x7f, 0x80, 0x09, 0xf6, 0x20, 0x80, 0x0a, |
638 | 0x56, 0xf8, 0x27, 0x70, 0x4e, 0x0c, 0x10, 0x09, | 638 | 0x56, 0xf8, 0x27, 0x70, 0x4e, 0x0c, 0x10, 0x09, |
639 | 0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, | 639 | 0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, |
640 | 0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, 0xf4, 0x95, | 640 | 0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, 0xf4, 0x95, |
641 | 0xf4, 0x95, 0x6c, 0x86, 0x0b, 0x6d, 0xf2, 0x73, | 641 | 0xf4, 0x95, 0x6c, 0x86, 0x0b, 0x6d, 0xf2, 0x73, |
642 | 0x0c, 0x59, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0xb8, | 642 | 0x0c, 0x59, 0xf4, 0x95, 0xe8, 0x00, 0xf6, 0xb8, |
643 | 0xf4, 0x95, 0x56, 0x0c, 0xf0, 0xf9, 0x88, 0x12, | 643 | 0xf4, 0x95, 0x56, 0x0c, 0xf0, 0xf9, 0x88, 0x12, |
644 | 0xf4, 0x95, 0xf4, 0x95, 0x70, 0xe2, 0x27, 0x7c, | 644 | 0xf4, 0x95, 0xf4, 0x95, 0x70, 0xe2, 0x27, 0x7c, |
645 | 0x29, 0x86, 0xe8, 0x00, 0x80, 0x0e, 0x48, 0x11, | 645 | 0x29, 0x86, 0xe8, 0x00, 0x80, 0x0e, 0x48, 0x11, |
646 | 0xf8, 0x45, 0x0b, 0xcc, 0x77, 0x10, 0x00, 0x01, | 646 | 0xf8, 0x45, 0x0b, 0xcc, 0x77, 0x10, 0x00, 0x01, |
647 | 0xf4, 0xa9, 0xf8, 0x30, 0x0b, 0x89, 0x6c, 0xe1, | 647 | 0xf4, 0xa9, 0xf8, 0x30, 0x0b, 0x89, 0x6c, 0xe1, |
648 | 0xff, 0xfd, 0x0b, 0x8b, 0x10, 0xe7, 0x00, 0x02, | 648 | 0xff, 0xfd, 0x0b, 0x8b, 0x10, 0xe7, 0x00, 0x02, |
649 | 0x80, 0x0e, 0xf0, 0x73, 0x0b, 0x8b, 0x10, 0x87, | 649 | 0x80, 0x0e, 0xf0, 0x73, 0x0b, 0x8b, 0x10, 0x87, |
650 | 0x80, 0x0e, 0xe7, 0x10, 0xf5, 0xae, 0xf8, 0x20, | 650 | 0x80, 0x0e, 0xe7, 0x10, 0xf5, 0xae, 0xf8, 0x20, |
651 | 0x0b, 0xb2, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, | 651 | 0x0b, 0xb2, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, |
652 | 0x00, 0x16, 0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, | 652 | 0x00, 0x16, 0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, |
653 | 0x48, 0x17, 0x49, 0x16, 0xf6, 0x00, 0x88, 0x17, | 653 | 0x48, 0x17, 0x49, 0x16, 0xf6, 0x00, 0x88, 0x17, |
654 | 0x48, 0x11, 0xf6, 0x20, 0x88, 0x11, 0x10, 0x09, | 654 | 0x48, 0x11, 0xf6, 0x20, 0x88, 0x11, 0x10, 0x09, |
655 | 0xf6, 0x20, 0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, | 655 | 0xf6, 0x20, 0x80, 0x00, 0x48, 0x18, 0xf2, 0x74, |
656 | 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, | 656 | 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x16, |
657 | 0x10, 0x04, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, | 657 | 0x10, 0x04, 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, |
658 | 0x00, 0x11, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11, | 658 | 0x00, 0x11, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11, |
659 | 0x00, 0x04, 0x80, 0x04, 0xf0, 0x73, 0x0b, 0xbc, | 659 | 0x00, 0x04, 0x80, 0x04, 0xf0, 0x73, 0x0b, 0xbc, |
660 | 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 0x00, 0x11, | 660 | 0x70, 0x00, 0x00, 0x17, 0x70, 0x01, 0x00, 0x11, |
661 | 0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11, | 661 | 0x10, 0x04, 0xf0, 0x74, 0x06, 0xce, 0x48, 0x11, |
662 | 0x00, 0x04, 0x80, 0x04, 0x49, 0x11, 0x48, 0x16, | 662 | 0x00, 0x04, 0x80, 0x04, 0x49, 0x11, 0x48, 0x16, |
663 | 0xf6, 0x20, 0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, | 663 | 0xf6, 0x20, 0x88, 0x16, 0xf4, 0x95, 0xf4, 0x95, |
664 | 0x6c, 0x86, 0x0b, 0xcc, 0x10, 0x0a, 0x80, 0x00, | 664 | 0x6c, 0x86, 0x0b, 0xcc, 0x10, 0x0a, 0x80, 0x00, |
665 | 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, | 665 | 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, |
666 | 0x00, 0x04, 0x88, 0x16, 0x12, 0x0a, 0xf8, 0x45, | 666 | 0x00, 0x04, 0x88, 0x16, 0x12, 0x0a, 0xf8, 0x45, |
667 | 0x0c, 0x33, 0x71, 0x0a, 0x00, 0x10, 0xf4, 0xae, | 667 | 0x0c, 0x33, 0x71, 0x0a, 0x00, 0x10, 0xf4, 0xae, |
668 | 0xf8, 0x30, 0x0c, 0x1c, 0x48, 0x16, 0xf0, 0xe1, | 668 | 0xf8, 0x30, 0x0c, 0x1c, 0x48, 0x16, 0xf0, 0xe1, |
669 | 0x88, 0x11, 0x12, 0x08, 0xf8, 0x45, 0x0b, 0xdb, | 669 | 0x88, 0x11, 0x12, 0x08, 0xf8, 0x45, 0x0b, 0xdb, |
670 | 0x6d, 0x89, 0x12, 0x07, 0xf8, 0x45, 0x0b, 0xe9, | 670 | 0x6d, 0x89, 0x12, 0x07, 0xf8, 0x45, 0x0b, 0xe9, |
671 | 0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11, | 671 | 0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11, |
672 | 0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74, | 672 | 0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74, |
673 | 0x06, 0xdc, 0xf0, 0x73, 0x0b, 0xef, 0x48, 0x11, | 673 | 0x06, 0xdc, 0xf0, 0x73, 0x0b, 0xef, 0x48, 0x11, |
674 | 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74, | 674 | 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74, |
675 | 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e, | 675 | 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e, |
676 | 0x10, 0x06, 0x49, 0x11, 0xf6, 0x00, 0x80, 0x06, | 676 | 0x10, 0x06, 0x49, 0x11, 0xf6, 0x00, 0x80, 0x06, |
677 | 0x10, 0x05, 0xf6, 0x20, 0x88, 0x11, 0xf0, 0x00, | 677 | 0x10, 0x05, 0xf6, 0x20, 0x88, 0x11, 0xf0, 0x00, |
678 | 0x00, 0x01, 0x48, 0x08, 0x6f, 0x00, 0x0c, 0x9f, | 678 | 0x00, 0x01, 0x48, 0x08, 0x6f, 0x00, 0x0c, 0x9f, |
679 | 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, | 679 | 0x48, 0x18, 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, |
680 | 0x00, 0x04, 0x12, 0x07, 0xf8, 0x45, 0x0c, 0x11, | 680 | 0x00, 0x04, 0x12, 0x07, 0xf8, 0x45, 0x0c, 0x11, |
681 | 0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11, | 681 | 0x10, 0x07, 0x80, 0x00, 0x70, 0x02, 0x00, 0x11, |
682 | 0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74, | 682 | 0x10, 0x06, 0x80, 0x01, 0x10, 0x04, 0xf0, 0x74, |
683 | 0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x17, 0x48, 0x11, | 683 | 0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x17, 0x48, 0x11, |
684 | 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74, | 684 | 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, 0xf0, 0x74, |
685 | 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e, | 685 | 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, 0x81, 0x0e, |
686 | 0xf0, 0x73, 0x0c, 0x33, 0x12, 0x07, 0xf8, 0x45, | 686 | 0xf0, 0x73, 0x0c, 0x33, 0x12, 0x07, 0xf8, 0x45, |
687 | 0x0c, 0x2a, 0x10, 0x07, 0x80, 0x00, 0x10, 0x06, | 687 | 0x0c, 0x2a, 0x10, 0x07, 0x80, 0x00, 0x10, 0x06, |
688 | 0x80, 0x01, 0x10, 0x05, 0x80, 0x02, 0x10, 0x04, | 688 | 0x80, 0x01, 0x10, 0x05, 0x80, 0x02, 0x10, 0x04, |
689 | 0xf0, 0x74, 0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x30, | 689 | 0xf0, 0x74, 0x06, 0xdc, 0xf0, 0x73, 0x0c, 0x30, |
690 | 0x12, 0x05, 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, | 690 | 0x12, 0x05, 0x6f, 0x00, 0x0c, 0x9f, 0x10, 0x04, |
691 | 0xf0, 0x74, 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, | 691 | 0xf0, 0x74, 0x0a, 0xb3, 0x11, 0x0e, 0xf1, 0xc0, |
692 | 0x81, 0x0e, 0x76, 0x00, 0x00, 0x01, 0x48, 0x18, | 692 | 0x81, 0x0e, 0x76, 0x00, 0x00, 0x01, 0x48, 0x18, |
693 | 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, | 693 | 0xf2, 0x74, 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, |
694 | 0x71, 0x04, 0x00, 0x11, 0x70, 0x81, 0x29, 0x86, | 694 | 0x71, 0x04, 0x00, 0x11, 0x70, 0x81, 0x29, 0x86, |
695 | 0x10, 0x0e, 0x1c, 0xf8, 0x29, 0x86, 0x80, 0x0e, | 695 | 0x10, 0x0e, 0x1c, 0xf8, 0x29, 0x86, 0x80, 0x0e, |
696 | 0x76, 0x00, 0x00, 0x01, 0x48, 0x18, 0xf2, 0x74, | 696 | 0x76, 0x00, 0x00, 0x01, 0x48, 0x18, 0xf2, 0x74, |
697 | 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x10, 0x0e, | 697 | 0x0a, 0xce, 0xf0, 0x00, 0x00, 0x04, 0x10, 0x0e, |
698 | 0x71, 0x04, 0x00, 0x11, 0x80, 0x81, 0x10, 0xf8, | 698 | 0x71, 0x04, 0x00, 0x11, 0x80, 0x81, 0x10, 0xf8, |
699 | 0x29, 0x86, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x30, | 699 | 0x29, 0x86, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x30, |
700 | 0x7f, 0xff, 0x80, 0xf8, 0x29, 0x86, 0x10, 0x09, | 700 | 0x7f, 0xff, 0x80, 0xf8, 0x29, 0x86, 0x10, 0x09, |
701 | 0xf0, 0x00, 0x00, 0x02, 0x80, 0x09, 0xee, 0x10, | 701 | 0xf0, 0x00, 0x00, 0x02, 0x80, 0x09, 0xee, 0x10, |
702 | 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, | 702 | 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, |
703 | 0x10, 0xf8, 0x27, 0x75, 0x08, 0xf8, 0x27, 0x71, | 703 | 0x10, 0xf8, 0x27, 0x75, 0x08, 0xf8, 0x27, 0x71, |
704 | 0xf0, 0x10, 0x00, 0x01, 0x48, 0x08, 0xfc, 0x00, | 704 | 0xf0, 0x10, 0x00, 0x01, 0x48, 0x08, 0xfc, 0x00, |
705 | 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xff, 0xf4, 0x95, | 705 | 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xff, 0xf4, 0x95, |
706 | 0x71, 0x04, 0x00, 0x16, 0xf0, 0x00, 0x00, 0x01, | 706 | 0x71, 0x04, 0x00, 0x16, 0xf0, 0x00, 0x00, 0x01, |
707 | 0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, 0x6d, 0xee, | 707 | 0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, 0x6d, 0xee, |
708 | 0xff, 0xfd, 0x48, 0x16, 0xf8, 0x45, 0x0c, 0x99, | 708 | 0xff, 0xfd, 0x48, 0x16, 0xf8, 0x45, 0x0c, 0x99, |
709 | 0x56, 0xf8, 0x29, 0x7c, 0xf0, 0x74, 0x0a, 0x5a, | 709 | 0x56, 0xf8, 0x29, 0x7c, 0xf0, 0x74, 0x0a, 0x5a, |
710 | 0x88, 0x11, 0x10, 0xf8, 0x29, 0x7d, 0xf0, 0x00, | 710 | 0x88, 0x11, 0x10, 0xf8, 0x29, 0x7d, 0xf0, 0x00, |
711 | 0x00, 0x01, 0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, | 711 | 0x00, 0x01, 0x48, 0x08, 0x4e, 0xf8, 0x29, 0x7c, |
712 | 0x10, 0xf8, 0x29, 0x82, 0xf0, 0x00, 0x00, 0x01, | 712 | 0x10, 0xf8, 0x29, 0x82, 0xf0, 0x00, 0x00, 0x01, |
713 | 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xa9, | 713 | 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xa9, |
714 | 0xfa, 0x30, 0x0c, 0x96, 0x80, 0xf8, 0x29, 0x82, | 714 | 0xfa, 0x30, 0x0c, 0x96, 0x80, 0xf8, 0x29, 0x82, |
715 | 0x56, 0xf8, 0x29, 0x80, 0xf0, 0x00, 0x00, 0x01, | 715 | 0x56, 0xf8, 0x29, 0x80, 0xf0, 0x00, 0x00, 0x01, |
716 | 0x4e, 0xf8, 0x29, 0x80, 0x73, 0x11, 0x29, 0x82, | 716 | 0x4e, 0xf8, 0x29, 0x80, 0x73, 0x11, 0x29, 0x82, |
717 | 0x6c, 0xee, 0xff, 0xff, 0x0c, 0x76, 0xee, 0x01, | 717 | 0x6c, 0xee, 0xff, 0xff, 0x0c, 0x76, 0xee, 0x01, |
718 | 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, | 718 | 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, |
719 | 0x76, 0xf8, 0x29, 0x84, 0x00, 0x00, 0x76, 0xf8, | 719 | 0x76, 0xf8, 0x29, 0x84, 0x00, 0x00, 0x76, 0xf8, |
720 | 0x29, 0x85, 0x00, 0x01, 0xe8, 0x00, 0x4e, 0xf8, | 720 | 0x29, 0x85, 0x00, 0x01, 0xe8, 0x00, 0x4e, 0xf8, |
721 | 0x2a, 0x0c, 0x76, 0xf8, 0x29, 0x86, 0x00, 0x00, | 721 | 0x2a, 0x0c, 0x76, 0xf8, 0x29, 0x86, 0x00, 0x00, |
722 | 0x76, 0xf8, 0x29, 0x87, 0x00, 0x00, 0x77, 0x11, | 722 | 0x76, 0xf8, 0x29, 0x87, 0x00, 0x00, 0x77, 0x11, |
723 | 0x29, 0x88, 0x76, 0x81, 0xaa, 0xaa, 0x76, 0xe1, | 723 | 0x29, 0x88, 0x76, 0x81, 0xaa, 0xaa, 0x76, 0xe1, |
724 | 0x00, 0x01, 0xaa, 0xaa, 0x76, 0xe1, 0x00, 0x02, | 724 | 0x00, 0x01, 0xaa, 0xaa, 0x76, 0xe1, 0x00, 0x02, |
725 | 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, | 725 | 0x00, 0x00, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, |
726 | 0xee, 0xfc, 0xf4, 0x95, 0x71, 0x06, 0x00, 0x14, | 726 | 0xee, 0xfc, 0xf4, 0x95, 0x71, 0x06, 0x00, 0x14, |
727 | 0x71, 0x07, 0x00, 0x13, 0x71, 0x08, 0x00, 0x12, | 727 | 0x71, 0x07, 0x00, 0x13, 0x71, 0x08, 0x00, 0x12, |
728 | 0x71, 0x09, 0x00, 0x15, 0x77, 0x10, 0x00, 0xff, | 728 | 0x71, 0x09, 0x00, 0x15, 0x77, 0x10, 0x00, 0xff, |
729 | 0xf4, 0xaa, 0xf8, 0x30, 0x0d, 0x44, 0x49, 0x13, | 729 | 0xf4, 0xaa, 0xf8, 0x30, 0x0d, 0x44, 0x49, 0x13, |
730 | 0x53, 0xf8, 0x2a, 0x0c, 0x4f, 0xf8, 0x2a, 0x0c, | 730 | 0x53, 0xf8, 0x2a, 0x0c, 0x4f, 0xf8, 0x2a, 0x0c, |
731 | 0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d, | 731 | 0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d, |
732 | 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x01, | 732 | 0x89, 0x11, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x01, |
733 | 0x71, 0xe1, 0x24, 0x00, 0x00, 0x11, 0xf4, 0xa9, | 733 | 0x71, 0xe1, 0x24, 0x00, 0x00, 0x11, 0xf4, 0xa9, |
734 | 0xf8, 0x30, 0x0d, 0x17, 0x77, 0x10, 0x00, 0x02, | 734 | 0xf8, 0x30, 0x0d, 0x17, 0x77, 0x10, 0x00, 0x02, |
735 | 0xf4, 0xa9, 0xf8, 0x30, 0x0c, 0xec, 0x77, 0x11, | 735 | 0xf4, 0xa9, 0xf8, 0x30, 0x0c, 0xec, 0x77, 0x11, |
736 | 0x29, 0x8a, 0x76, 0x81, 0x00, 0x00, 0xe8, 0x00, | 736 | 0x29, 0x8a, 0x76, 0x81, 0x00, 0x00, 0xe8, 0x00, |
737 | 0x77, 0x14, 0x00, 0x00, 0x77, 0x13, 0x00, 0x00, | 737 | 0x77, 0x14, 0x00, 0x00, 0x77, 0x13, 0x00, 0x00, |
738 | 0xf0, 0x73, 0x0d, 0x48, 0x6c, 0x83, 0x0c, 0xfa, | 738 | 0xf0, 0x73, 0x0d, 0x48, 0x6c, 0x83, 0x0c, 0xfa, |
739 | 0x77, 0x11, 0x29, 0x8a, 0x48, 0x12, 0xf0, 0xe8, | 739 | 0x77, 0x11, 0x29, 0x8a, 0x48, 0x12, 0xf0, 0xe8, |
740 | 0xf0, 0x40, 0x80, 0x00, 0x80, 0x81, 0xe8, 0x00, | 740 | 0xf0, 0x40, 0x80, 0x00, 0x80, 0x81, 0xe8, 0x00, |
741 | 0x77, 0x14, 0x00, 0x00, 0xf0, 0x73, 0x0d, 0x48, | 741 | 0x77, 0x14, 0x00, 0x00, 0xf0, 0x73, 0x0d, 0x48, |
742 | 0x49, 0x13, 0xf3, 0x40, 0x80, 0x00, 0x81, 0xf8, | 742 | 0x49, 0x13, 0xf3, 0x40, 0x80, 0x00, 0x81, 0xf8, |
743 | 0x29, 0x8a, 0x61, 0xf8, 0x00, 0x15, 0x00, 0x01, | 743 | 0x29, 0x8a, 0x61, 0xf8, 0x00, 0x15, 0x00, 0x01, |
744 | 0xf8, 0x20, 0x0d, 0x07, 0x69, 0xf8, 0x29, 0x8a, | 744 | 0xf8, 0x20, 0x0d, 0x07, 0x69, 0xf8, 0x29, 0x8a, |
745 | 0x40, 0x00, 0x61, 0xf8, 0x00, 0x14, 0x00, 0x01, | 745 | 0x40, 0x00, 0x61, 0xf8, 0x00, 0x14, 0x00, 0x01, |
746 | 0xf8, 0x20, 0x0d, 0x0f, 0x69, 0xf8, 0x29, 0x8a, | 746 | 0xf8, 0x20, 0x0d, 0x0f, 0x69, 0xf8, 0x29, 0x8a, |
747 | 0x20, 0x00, 0x77, 0x11, 0x29, 0x8a, 0x49, 0x12, | 747 | 0x20, 0x00, 0x77, 0x11, 0x29, 0x8a, 0x49, 0x12, |
748 | 0xf3, 0xe8, 0x1b, 0x81, 0x81, 0x81, 0xf0, 0x73, | 748 | 0xf3, 0xe8, 0x1b, 0x81, 0x81, 0x81, 0xf0, 0x73, |
749 | 0x0d, 0x48, 0x11, 0xf8, 0x29, 0x84, 0xf8, 0x4c, | 749 | 0x0d, 0x48, 0x11, 0xf8, 0x29, 0x84, 0xf8, 0x4c, |
750 | 0x0d, 0x37, 0x77, 0x11, 0x29, 0x88, 0x76, 0x81, | 750 | 0x0d, 0x37, 0x77, 0x11, 0x29, 0x88, 0x76, 0x81, |
751 | 0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, 0xf3, 0x10, | 751 | 0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, 0xf3, 0x10, |
752 | 0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, 0x81, 0xe1, | 752 | 0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, 0x81, 0xe1, |
753 | 0x00, 0x01, 0x76, 0x00, 0x00, 0x02, 0x80, 0x01, | 753 | 0x00, 0x01, 0x76, 0x00, 0x00, 0x02, 0x80, 0x01, |
754 | 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 0x00, 0x13, | 754 | 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, 0x00, 0x13, |
755 | 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0x48, 0x11, | 755 | 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0x48, 0x11, |
756 | 0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, 0xf0, 0x73, | 756 | 0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, 0xf0, 0x73, |
757 | 0x0d, 0x73, 0x76, 0x00, 0x00, 0x00, 0x80, 0x01, | 757 | 0x0d, 0x73, 0x76, 0x00, 0x00, 0x00, 0x80, 0x01, |
758 | 0x76, 0x02, 0x00, 0x00, 0x70, 0x03, 0x00, 0x13, | 758 | 0x76, 0x02, 0x00, 0x00, 0x70, 0x03, 0x00, 0x13, |
759 | 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0xe8, 0x00, | 759 | 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, 0xe8, 0x00, |
760 | 0xf0, 0x73, 0x0d, 0x73, 0x77, 0x11, 0x29, 0x8a, | 760 | 0xf0, 0x73, 0x0d, 0x73, 0x77, 0x11, 0x29, 0x8a, |
761 | 0x70, 0x81, 0x00, 0x13, 0x11, 0xf8, 0x29, 0x84, | 761 | 0x70, 0x81, 0x00, 0x13, 0x11, 0xf8, 0x29, 0x84, |
762 | 0xf8, 0x4c, 0x0d, 0x68, 0x77, 0x11, 0x29, 0x88, | 762 | 0xf8, 0x4c, 0x0d, 0x68, 0x77, 0x11, 0x29, 0x88, |
763 | 0x76, 0x81, 0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, | 763 | 0x76, 0x81, 0xaa, 0xaa, 0x11, 0xf8, 0x29, 0x85, |
764 | 0xf3, 0x10, 0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, | 764 | 0xf3, 0x10, 0x00, 0x01, 0xf3, 0x40, 0xaa, 0x00, |
765 | 0x81, 0xe1, 0x00, 0x01, 0x76, 0x00, 0x00, 0x03, | 765 | 0x81, 0xe1, 0x00, 0x01, 0x76, 0x00, 0x00, 0x03, |
766 | 0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, | 766 | 0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, |
767 | 0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, | 767 | 0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, |
768 | 0x48, 0x11, 0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, | 768 | 0x48, 0x11, 0x71, 0xf8, 0x29, 0x85, 0x29, 0x84, |
769 | 0xf0, 0x73, 0x0d, 0x73, 0x76, 0x00, 0x00, 0x01, | 769 | 0xf0, 0x73, 0x0d, 0x73, 0x76, 0x00, 0x00, 0x01, |
770 | 0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, | 770 | 0x80, 0x01, 0x70, 0x02, 0x00, 0x14, 0x70, 0x03, |
771 | 0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, | 771 | 0x00, 0x13, 0xf2, 0x74, 0x0b, 0x28, 0xf4, 0x95, |
772 | 0x48, 0x11, 0x6b, 0xf8, 0x29, 0x84, 0xff, 0xff, | 772 | 0x48, 0x11, 0x6b, 0xf8, 0x29, 0x84, 0xff, 0xff, |
773 | 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, | 773 | 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, |
774 | 0xf5, 0x40, 0xf4, 0x95, 0x48, 0x0b, 0xf4, 0x78, | 774 | 0xf5, 0x40, 0xf4, 0x95, 0x48, 0x0b, 0xf4, 0x78, |
775 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe1, | 775 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe1, |
776 | 0xff, 0xb9, 0x0d, 0x88, 0xf2, 0x73, 0x0d, 0xa5, | 776 | 0xff, 0xb9, 0x0d, 0x88, 0xf2, 0x73, 0x0d, 0xa5, |
777 | 0xf4, 0x95, 0xe8, 0x60, 0xf2, 0x00, 0x00, 0x06, | 777 | 0xf4, 0x95, 0xe8, 0x60, 0xf2, 0x00, 0x00, 0x06, |
778 | 0x61, 0xf8, 0x00, 0x11, 0x00, 0x20, 0xf8, 0x30, | 778 | 0x61, 0xf8, 0x00, 0x11, 0x00, 0x20, 0xf8, 0x30, |
779 | 0x0d, 0x98, 0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, | 779 | 0x0d, 0x98, 0x61, 0xf8, 0x00, 0x0b, 0x00, 0x01, |
780 | 0xf8, 0x20, 0x0d, 0xa3, 0xf2, 0x00, 0x00, 0x07, | 780 | 0xf8, 0x20, 0x0d, 0xa3, 0xf2, 0x00, 0x00, 0x07, |
781 | 0xf0, 0x73, 0x0d, 0xa3, 0x61, 0xf8, 0x00, 0x0b, | 781 | 0xf0, 0x73, 0x0d, 0xa3, 0x61, 0xf8, 0x00, 0x0b, |
782 | 0x00, 0x01, 0xf8, 0x20, 0x0d, 0xa1, 0xf2, 0x73, | 782 | 0x00, 0x01, 0xf8, 0x20, 0x0d, 0xa1, 0xf2, 0x73, |
783 | 0x0d, 0xa3, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00, | 783 | 0x0d, 0xa3, 0xf0, 0x00, 0x00, 0x01, 0xf0, 0x00, |
784 | 0x00, 0x02, 0x48, 0x08, 0xf4, 0x7f, 0x8a, 0x11, | 784 | 0x00, 0x02, 0x48, 0x08, 0xf4, 0x7f, 0x8a, 0x11, |
785 | 0xfc, 0x00, 0xee, 0xff, 0xf0, 0x74, 0x07, 0xfd, | 785 | 0xfc, 0x00, 0xee, 0xff, 0xf0, 0x74, 0x07, 0xfd, |
786 | 0xf0, 0x74, 0x07, 0x44, 0xf0, 0x74, 0x0d, 0xb4, | 786 | 0xf0, 0x74, 0x07, 0x44, 0xf0, 0x74, 0x0d, 0xb4, |
787 | 0xf0, 0x74, 0x02, 0x05, 0xf0, 0x74, 0x04, 0x60, | 787 | 0xf0, 0x74, 0x02, 0x05, 0xf0, 0x74, 0x04, 0x60, |
788 | 0xf0, 0x73, 0x0d, 0xaa, 0xee, 0xfd, 0x10, 0xf8, | 788 | 0xf0, 0x73, 0x0d, 0xaa, 0xee, 0xfd, 0x10, 0xf8, |
789 | 0x2a, 0xa3, 0xf8, 0x44, 0x0d, 0xcb, 0x10, 0xf8, | 789 | 0x2a, 0xa3, 0xf8, 0x44, 0x0d, 0xcb, 0x10, 0xf8, |
790 | 0x2a, 0xa4, 0xf8, 0x45, 0x0d, 0xd7, 0x76, 0x00, | 790 | 0x2a, 0xa4, 0xf8, 0x45, 0x0d, 0xd7, 0x76, 0x00, |
791 | 0x02, 0x00, 0xf2, 0x74, 0x09, 0xe8, 0xf0, 0x20, | 791 | 0x02, 0x00, 0xf2, 0x74, 0x09, 0xe8, 0xf0, 0x20, |
792 | 0x22, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00, | 792 | 0x22, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00, |
793 | 0x76, 0xf8, 0x2a, 0xa7, 0x00, 0x00, 0xf0, 0x73, | 793 | 0x76, 0xf8, 0x2a, 0xa7, 0x00, 0x00, 0xf0, 0x73, |
794 | 0x0d, 0xd7, 0x76, 0x00, 0x02, 0x00, 0xf2, 0x74, | 794 | 0x0d, 0xd7, 0x76, 0x00, 0x02, 0x00, 0xf2, 0x74, |
795 | 0x09, 0xe8, 0xf0, 0x20, 0x20, 0x00, 0x76, 0xf8, | 795 | 0x09, 0xe8, 0xf0, 0x20, 0x20, 0x00, 0x76, 0xf8, |
796 | 0x2a, 0xa3, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa7, | 796 | 0x2a, 0xa3, 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa7, |
797 | 0x00, 0x01, 0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, | 797 | 0x00, 0x01, 0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, |
798 | 0xf0, 0x10, 0x3a, 0x98, 0xf8, 0x47, 0x0d, 0xe1, | 798 | 0xf0, 0x10, 0x3a, 0x98, 0xf8, 0x47, 0x0d, 0xe1, |
799 | 0x76, 0xf8, 0x27, 0x6e, 0x00, 0x00, 0xee, 0x03, | 799 | 0x76, 0xf8, 0x27, 0x6e, 0x00, 0x00, 0xee, 0x03, |
800 | 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x77, 0x11, | 800 | 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, 0x77, 0x11, |
801 | 0x20, 0x00, 0x76, 0x00, 0xaa, 0xaa, 0x76, 0x01, | 801 | 0x20, 0x00, 0x76, 0x00, 0xaa, 0xaa, 0x76, 0x01, |
802 | 0x02, 0x00, 0xf2, 0x74, 0x06, 0x6c, 0xf4, 0x95, | 802 | 0x02, 0x00, 0xf2, 0x74, 0x06, 0x6c, 0xf4, 0x95, |
803 | 0x48, 0x11, 0x76, 0x00, 0x55, 0x55, 0x76, 0x01, | 803 | 0x48, 0x11, 0x76, 0x00, 0x55, 0x55, 0x76, 0x01, |
804 | 0x02, 0x00, 0x48, 0x11, 0xf2, 0x74, 0x06, 0x6c, | 804 | 0x02, 0x00, 0x48, 0x11, 0xf2, 0x74, 0x06, 0x6c, |
805 | 0xf0, 0x00, 0x02, 0x00, 0x76, 0xf8, 0x2a, 0xa3, | 805 | 0xf0, 0x00, 0x02, 0x00, 0x76, 0xf8, 0x2a, 0xa3, |
806 | 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00, | 806 | 0x00, 0x00, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x00, |
807 | 0xe8, 0x00, 0x4e, 0x00, 0xfb, 0x80, 0x15, 0x3e, | 807 | 0xe8, 0x00, 0x4e, 0x00, 0xfb, 0x80, 0x15, 0x3e, |
808 | 0xf4, 0x95, 0xe8, 0x04, 0x80, 0xf8, 0x2a, 0xa5, | 808 | 0xf4, 0x95, 0xe8, 0x04, 0x80, 0xf8, 0x2a, 0xa5, |
809 | 0x76, 0x00, 0x2a, 0xa8, 0xf9, 0x80, 0x14, 0x87, | 809 | 0x76, 0x00, 0x2a, 0xa8, 0xf9, 0x80, 0x14, 0x87, |
810 | 0x76, 0x00, 0x2a, 0xad, 0xfb, 0x80, 0x13, 0x62, | 810 | 0x76, 0x00, 0x2a, 0xad, 0xfb, 0x80, 0x13, 0x62, |
811 | 0xf4, 0x95, 0xe8, 0x02, 0x10, 0xf8, 0x2a, 0xa5, | 811 | 0xf4, 0x95, 0xe8, 0x02, 0x10, 0xf8, 0x2a, 0xa5, |
812 | 0xf9, 0x80, 0x14, 0x63, 0xfb, 0x80, 0x16, 0x66, | 812 | 0xf9, 0x80, 0x14, 0x63, 0xfb, 0x80, 0x16, 0x66, |
813 | 0xf4, 0x95, 0xe8, 0x1c, 0xfb, 0x80, 0x16, 0x87, | 813 | 0xf4, 0x95, 0xe8, 0x1c, 0xfb, 0x80, 0x16, 0x87, |
814 | 0xf4, 0x95, 0xe8, 0x1c, 0xe8, 0x01, 0x4e, 0x00, | 814 | 0xf4, 0x95, 0xe8, 0x1c, 0xe8, 0x01, 0x4e, 0x00, |
815 | 0xfb, 0x80, 0x17, 0xd6, 0xf4, 0x95, 0xe8, 0x00, | 815 | 0xfb, 0x80, 0x17, 0xd6, 0xf4, 0x95, 0xe8, 0x00, |
816 | 0x80, 0xf8, 0x2a, 0xa6, 0x76, 0x00, 0x2a, 0xb7, | 816 | 0x80, 0xf8, 0x2a, 0xa6, 0x76, 0x00, 0x2a, 0xb7, |
817 | 0xf9, 0x80, 0x16, 0xaa, 0x10, 0xf8, 0x2a, 0xa6, | 817 | 0xf9, 0x80, 0x16, 0xaa, 0x10, 0xf8, 0x2a, 0xa6, |
818 | 0xf9, 0x80, 0x17, 0x5c, 0x10, 0xf8, 0x2a, 0xa6, | 818 | 0xf9, 0x80, 0x17, 0x5c, 0x10, 0xf8, 0x2a, 0xa6, |
819 | 0xf9, 0x80, 0x17, 0x6f, 0xee, 0x02, 0x8a, 0x11, | 819 | 0xf9, 0x80, 0x17, 0x6f, 0xee, 0x02, 0x8a, 0x11, |
820 | 0xfc, 0x00, 0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, | 820 | 0xfc, 0x00, 0xf4, 0x95, 0x4a, 0x08, 0x4a, 0x09, |
821 | 0x4a, 0x0a, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, | 821 | 0x4a, 0x0a, 0x4a, 0x07, 0x4a, 0x1d, 0x68, 0xf8, |
822 | 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, | 822 | 0x00, 0x07, 0x7d, 0x3f, 0x69, 0xf8, 0x00, 0x07, |
823 | 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, | 823 | 0x40, 0x00, 0x68, 0xf8, 0x00, 0x1d, 0xff, 0xfc, |
824 | 0x10, 0xf8, 0x2a, 0xa7, 0xf8, 0x44, 0x0e, 0x4b, | 824 | 0x10, 0xf8, 0x2a, 0xa7, 0xf8, 0x44, 0x0e, 0x4b, |
825 | 0x76, 0xf8, 0x2a, 0xa3, 0x00, 0x01, 0xf0, 0x73, | 825 | 0x76, 0xf8, 0x2a, 0xa3, 0x00, 0x01, 0xf0, 0x73, |
826 | 0x0e, 0x4e, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x01, | 826 | 0x0e, 0x4e, 0x76, 0xf8, 0x2a, 0xa4, 0x00, 0x01, |
827 | 0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x0a, 0x8a, 0x09, | 827 | 0x8a, 0x1d, 0x8a, 0x07, 0x8a, 0x0a, 0x8a, 0x09, |
828 | 0x8a, 0x08, 0xf4, 0xeb, 0x4a, 0x11, 0x4a, 0x16, | 828 | 0x8a, 0x08, 0xf4, 0xeb, 0x4a, 0x11, 0x4a, 0x16, |
829 | 0x4a, 0x17, 0xee, 0xfe, 0x88, 0x0e, 0x71, 0x08, | 829 | 0x4a, 0x17, 0xee, 0xfe, 0x88, 0x0e, 0x71, 0x08, |
830 | 0x00, 0x16, 0x71, 0x06, 0x00, 0x17, 0x11, 0x07, | 830 | 0x00, 0x16, 0x71, 0x06, 0x00, 0x17, 0x11, 0x07, |
831 | 0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, 0x25, 0xa0, | 831 | 0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, 0x25, 0xa0, |
832 | 0x88, 0x11, 0x76, 0x01, 0x00, 0x06, 0x81, 0x00, | 832 | 0x88, 0x11, 0x76, 0x01, 0x00, 0x06, 0x81, 0x00, |
833 | 0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, 0x00, 0x01, | 833 | 0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, 0x00, 0x01, |
834 | 0x76, 0x01, 0x00, 0x06, 0x70, 0x00, 0x00, 0x16, | 834 | 0x76, 0x01, 0x00, 0x06, 0x70, 0x00, 0x00, 0x16, |
835 | 0x48, 0x11, 0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, | 835 | 0x48, 0x11, 0xf2, 0x74, 0x06, 0xce, 0xf0, 0x00, |
836 | 0x00, 0x07, 0x70, 0x81, 0x00, 0x17, 0xee, 0x02, | 836 | 0x00, 0x07, 0x70, 0x81, 0x00, 0x17, 0xee, 0x02, |
837 | 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, | 837 | 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xfc, 0x00, |
838 | 0x4a, 0x11, 0x88, 0x0e, 0x71, 0x02, 0x00, 0x12, | 838 | 0x4a, 0x11, 0x88, 0x0e, 0x71, 0x02, 0x00, 0x12, |
839 | 0x11, 0x03, 0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, | 839 | 0x11, 0x03, 0xf0, 0x66, 0x00, 0x0d, 0xf0, 0x00, |
840 | 0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x70, 0x81, | 840 | 0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, 0x70, 0x81, |
841 | 0x00, 0x12, 0x6e, 0xe2, 0xff, 0xfe, 0x0e, 0x8d, | 841 | 0x00, 0x12, 0x6e, 0xe2, 0xff, 0xfe, 0x0e, 0x8d, |
842 | 0xf4, 0x95, 0xe8, 0x00, 0xe8, 0x01, 0x80, 0xe1, | 842 | 0xf4, 0x95, 0xe8, 0x00, 0xe8, 0x01, 0x80, 0xe1, |
843 | 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, | 843 | 0x00, 0x02, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, |
844 | 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, | 844 | 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, |
845 | 0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0c, | 845 | 0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0c, |
846 | 0x00, 0x00, 0x81, 0xe1, 0x00, 0x01, 0x8a, 0x11, | 846 | 0x00, 0x00, 0x81, 0xe1, 0x00, 0x01, 0x8a, 0x11, |
847 | 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, 0x88, 0x0e, | 847 | 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, 0x88, 0x0e, |
848 | 0xf4, 0x95, 0xf1, 0x66, 0x00, 0x0d, 0xf3, 0x00, | 848 | 0xf4, 0x95, 0xf1, 0x66, 0x00, 0x0d, 0xf3, 0x00, |
849 | 0x24, 0x00, 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, | 849 | 0x24, 0x00, 0x89, 0x11, 0xf4, 0x95, 0xf4, 0x95, |
850 | 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, | 850 | 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, |
851 | 0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, | 851 | 0x00, 0x0b, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, |
852 | 0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, | 852 | 0x00, 0x01, 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, |
853 | 0x00, 0x00, 0x80, 0x02, 0x76, 0x03, 0x00, 0x00, | 853 | 0x00, 0x00, 0x80, 0x02, 0x76, 0x03, 0x00, 0x00, |
854 | 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0xe8, 0x00, | 854 | 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0xe8, 0x00, |
855 | 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, | 855 | 0xee, 0x04, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, |
856 | 0x88, 0x19, 0xf4, 0x95, 0x73, 0x19, 0x00, 0x0e, | 856 | 0x88, 0x19, 0xf4, 0x95, 0x73, 0x19, 0x00, 0x0e, |
857 | 0xf1, 0x66, 0x00, 0x0d, 0xf2, 0x00, 0x24, 0x00, | 857 | 0xf1, 0x66, 0x00, 0x0d, 0xf2, 0x00, 0x24, 0x00, |
858 | 0x77, 0x15, 0x25, 0xa0, 0x77, 0x14, 0x00, 0x00, | 858 | 0x77, 0x15, 0x25, 0xa0, 0x77, 0x14, 0x00, 0x00, |
859 | 0x77, 0x1a, 0x00, 0x1f, 0xf0, 0x72, 0x0f, 0x14, | 859 | 0x77, 0x1a, 0x00, 0x1f, 0xf0, 0x72, 0x0f, 0x14, |
860 | 0xf6, 0xb8, 0x49, 0x19, 0x09, 0x85, 0xf8, 0x4c, | 860 | 0xf6, 0xb8, 0x49, 0x19, 0x09, 0x85, 0xf8, 0x4c, |
861 | 0x0f, 0x13, 0xf1, 0x00, 0x00, 0x05, 0x89, 0x11, | 861 | 0x0f, 0x13, 0xf1, 0x00, 0x00, 0x05, 0x89, 0x11, |
862 | 0x49, 0x15, 0xf3, 0x00, 0x00, 0x01, 0x89, 0x13, | 862 | 0x49, 0x15, 0xf3, 0x00, 0x00, 0x01, 0x89, 0x13, |
863 | 0x49, 0x15, 0xf3, 0x00, 0x00, 0x07, 0x89, 0x12, | 863 | 0x49, 0x15, 0xf3, 0x00, 0x00, 0x07, 0x89, 0x12, |
864 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, | 864 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, |
865 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, | 865 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, |
866 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, | 866 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, |
867 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, | 867 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, |
868 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, | 868 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, |
869 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, | 869 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, |
870 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, | 870 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, |
871 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, | 871 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, |
872 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, | 872 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x10, |
873 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, | 873 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x80, 0x0f, 0x13, |
874 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x11, | 874 | 0x11, 0x93, 0x1d, 0x91, 0x19, 0x92, 0x89, 0x11, |
875 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0f, 0x13, | 875 | 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0x81, 0x0f, 0x13, |
876 | 0x6d, 0x94, 0x6d, 0xed, 0x00, 0x0d, 0x48, 0x14, | 876 | 0x6d, 0x94, 0x6d, 0xed, 0x00, 0x0d, 0x48, 0x14, |
877 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, | 877 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, |
878 | 0x4a, 0x17, 0xee, 0xf8, 0x88, 0x17, 0x10, 0x0d, | 878 | 0x4a, 0x17, 0xee, 0xf8, 0x88, 0x17, 0x10, 0x0d, |
879 | 0x80, 0x04, 0x10, 0x0c, 0x80, 0x05, 0x71, 0x0e, | 879 | 0x80, 0x04, 0x10, 0x0c, 0x80, 0x05, 0x71, 0x0e, |
880 | 0x00, 0x16, 0x73, 0x17, 0x00, 0x0e, 0xf0, 0x66, | 880 | 0x00, 0x16, 0x73, 0x17, 0x00, 0x0e, 0xf0, 0x66, |
881 | 0x00, 0x0d, 0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, | 881 | 0x00, 0x0d, 0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, |
882 | 0x10, 0xf8, 0x27, 0x63, 0xf8, 0x45, 0x0f, 0x32, | 882 | 0x10, 0xf8, 0x27, 0x63, 0xf8, 0x45, 0x0f, 0x32, |
883 | 0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, | 883 | 0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, |
884 | 0x10, 0xf8, 0x27, 0x60, 0xf8, 0x44, 0x0f, 0x3d, | 884 | 0x10, 0xf8, 0x27, 0x60, 0xf8, 0x44, 0x0f, 0x3d, |
885 | 0x60, 0xe1, 0x00, 0x02, 0x00, 0x01, 0xf8, 0x20, | 885 | 0x60, 0xe1, 0x00, 0x02, 0x00, 0x01, 0xf8, 0x20, |
886 | 0x0f, 0x6d, 0xf0, 0x73, 0x11, 0x33, 0x10, 0x04, | 886 | 0x0f, 0x6d, 0xf0, 0x73, 0x11, 0x33, 0x10, 0x04, |
887 | 0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f, | 887 | 0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f, |
888 | 0x11, 0x04, 0xf3, 0x00, 0x00, 0x01, 0x81, 0x04, | 888 | 0x11, 0x04, 0xf3, 0x00, 0x00, 0x01, 0x81, 0x04, |
889 | 0x6d, 0x8e, 0x77, 0x10, 0x00, 0x01, 0x71, 0xe1, | 889 | 0x6d, 0x8e, 0x77, 0x10, 0x00, 0x01, 0x71, 0xe1, |
890 | 0x00, 0x02, 0x00, 0x12, 0xf4, 0xaa, 0xf8, 0x30, | 890 | 0x00, 0x02, 0x00, 0x12, 0xf4, 0xaa, 0xf8, 0x30, |
891 | 0x0f, 0x62, 0x77, 0x10, 0x00, 0x02, 0xf4, 0xaa, | 891 | 0x0f, 0x62, 0x77, 0x10, 0x00, 0x02, 0xf4, 0xaa, |
892 | 0xf8, 0x30, 0x0f, 0x6d, 0x45, 0xe1, 0x00, 0x0b, | 892 | 0xf8, 0x30, 0x0f, 0x6d, 0x45, 0xe1, 0x00, 0x0b, |
893 | 0x88, 0x10, 0x43, 0xe1, 0x00, 0x0c, 0x83, 0xf8, | 893 | 0x88, 0x10, 0x43, 0xe1, 0x00, 0x0c, 0x83, 0xf8, |
894 | 0x00, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xaa, | 894 | 0x00, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xaa, |
895 | 0xf8, 0x30, 0x0f, 0x6d, 0xf0, 0x73, 0x0f, 0x96, | 895 | 0xf8, 0x30, 0x0f, 0x6d, 0xf0, 0x73, 0x0f, 0x96, |
896 | 0xf5, 0x00, 0x81, 0x04, 0x49, 0x16, 0xf5, 0x20, | 896 | 0xf5, 0x00, 0x81, 0x04, 0x49, 0x16, 0xf5, 0x20, |
897 | 0x89, 0x16, 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, | 897 | 0x89, 0x16, 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x00, |
898 | 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x48, 0x16, | 898 | 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x48, 0x16, |
899 | 0xf8, 0x45, 0x11, 0x33, 0xf7, 0xb8, 0x71, 0xe1, | 899 | 0xf8, 0x45, 0x11, 0x33, 0xf7, 0xb8, 0x71, 0xe1, |
900 | 0x00, 0x02, 0x00, 0x12, 0x10, 0xf8, 0x00, 0x12, | 900 | 0x00, 0x02, 0x00, 0x12, 0x10, 0xf8, 0x00, 0x12, |
901 | 0xf0, 0x10, 0x00, 0x03, 0xf8, 0x46, 0x0f, 0x8c, | 901 | 0xf0, 0x10, 0x00, 0x03, 0xf8, 0x46, 0x0f, 0x8c, |
902 | 0x10, 0xf8, 0x00, 0x12, 0xf0, 0x10, 0x00, 0x03, | 902 | 0x10, 0xf8, 0x00, 0x12, 0xf0, 0x10, 0x00, 0x03, |
903 | 0xf8, 0x45, 0x10, 0x16, 0x77, 0x10, 0x00, 0x01, | 903 | 0xf8, 0x45, 0x10, 0x16, 0x77, 0x10, 0x00, 0x01, |
904 | 0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0x9c, 0x77, 0x10, | 904 | 0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0x9c, 0x77, 0x10, |
905 | 0x00, 0x02, 0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0xa8, | 905 | 0x00, 0x02, 0xf4, 0xaa, 0xf8, 0x30, 0x0f, 0xa8, |
906 | 0xf0, 0x73, 0x0f, 0x96, 0x77, 0x10, 0x00, 0x04, | 906 | 0xf0, 0x73, 0x0f, 0x96, 0x77, 0x10, 0x00, 0x04, |
907 | 0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xb7, 0x77, 0x10, | 907 | 0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xb7, 0x77, 0x10, |
908 | 0x00, 0x05, 0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xbc, | 908 | 0x00, 0x05, 0xf4, 0xaa, 0xf8, 0x30, 0x10, 0xbc, |
909 | 0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, | 909 | 0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, |
910 | 0xf0, 0x73, 0x11, 0x31, 0x76, 0xe1, 0x00, 0x0c, | 910 | 0xf0, 0x73, 0x11, 0x31, 0x76, 0xe1, 0x00, 0x0c, |
911 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00, | 911 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00, |
912 | 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, | 912 | 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, |
913 | 0x00, 0x02, 0x00, 0x02, 0x11, 0xe1, 0x00, 0x0c, | 913 | 0x00, 0x02, 0x00, 0x02, 0x11, 0xe1, 0x00, 0x0c, |
914 | 0xe8, 0x03, 0xf6, 0x20, 0x89, 0x12, 0xf4, 0x95, | 914 | 0xe8, 0x03, 0xf6, 0x20, 0x89, 0x12, 0xf4, 0x95, |
915 | 0x77, 0x10, 0x00, 0x03, 0xf5, 0xaa, 0xf8, 0x30, | 915 | 0x77, 0x10, 0x00, 0x03, 0xf5, 0xaa, 0xf8, 0x30, |
916 | 0x0f, 0xb6, 0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, | 916 | 0x0f, 0xb6, 0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, |
917 | 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf5, 0xae, | 917 | 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, 0xf5, 0xae, |
918 | 0xf8, 0x20, 0x0f, 0xbd, 0x48, 0x16, 0x80, 0x06, | 918 | 0xf8, 0x20, 0x0f, 0xbd, 0x48, 0x16, 0x80, 0x06, |
919 | 0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x03, | 919 | 0x88, 0x13, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x03, |
920 | 0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xc8, 0x6b, 0xf8, | 920 | 0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xc8, 0x6b, 0xf8, |
921 | 0x27, 0x6f, 0x00, 0x01, 0x12, 0x06, 0xf8, 0x45, | 921 | 0x27, 0x6f, 0x00, 0x01, 0x12, 0x06, 0xf8, 0x45, |
922 | 0x10, 0x00, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00, | 922 | 0x10, 0x00, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00, |
923 | 0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02, | 923 | 0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02, |
924 | 0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74, | 924 | 0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74, |
925 | 0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06, | 925 | 0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06, |
926 | 0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04, | 926 | 0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04, |
927 | 0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, | 927 | 0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, |
928 | 0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04, | 928 | 0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04, |
929 | 0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, | 929 | 0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, |
930 | 0x88, 0x16, 0x89, 0x13, 0xf4, 0x95, 0x77, 0x10, | 930 | 0x88, 0x16, 0x89, 0x13, 0xf4, 0x95, 0x77, 0x10, |
931 | 0x00, 0x03, 0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xf5, | 931 | 0x00, 0x03, 0xf6, 0xab, 0xf8, 0x20, 0x0f, 0xf5, |
932 | 0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, 0x77, 0x10, | 932 | 0x6b, 0xf8, 0x27, 0x6f, 0x00, 0x01, 0x77, 0x10, |
933 | 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, | 933 | 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, |
934 | 0xf6, 0xab, 0xf8, 0x20, 0x10, 0x00, 0x6b, 0xf8, | 934 | 0xf6, 0xab, 0xf8, 0x20, 0x10, 0x00, 0x6b, 0xf8, |
935 | 0x27, 0x6f, 0x00, 0x01, 0x6c, 0xe2, 0xff, 0xfd, | 935 | 0x27, 0x6f, 0x00, 0x01, 0x6c, 0xe2, 0xff, 0xfd, |
936 | 0x11, 0x31, 0xf6, 0xb8, 0x6f, 0xe1, 0x00, 0x05, | 936 | 0x11, 0x31, 0xf6, 0xb8, 0x6f, 0xe1, 0x00, 0x05, |
937 | 0x0c, 0x48, 0x6f, 0xe1, 0x00, 0x06, 0x0c, 0x18, | 937 | 0x0c, 0x48, 0x6f, 0xe1, 0x00, 0x06, 0x0c, 0x18, |
938 | 0xf0, 0x30, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x03, | 938 | 0xf0, 0x30, 0x0f, 0xff, 0xf0, 0x00, 0x00, 0x03, |
939 | 0x80, 0xe1, 0x00, 0x0b, 0x76, 0xe1, 0x00, 0x02, | 939 | 0x80, 0xe1, 0x00, 0x0b, 0x76, 0xe1, 0x00, 0x02, |
940 | 0x00, 0x03, 0x48, 0x16, 0xf8, 0x45, 0x11, 0x33, | 940 | 0x00, 0x03, 0x48, 0x16, 0xf8, 0x45, 0x11, 0x33, |
941 | 0x71, 0xe1, 0x00, 0x0c, 0x00, 0x12, 0x10, 0xe1, | 941 | 0x71, 0xe1, 0x00, 0x0c, 0x00, 0x12, 0x10, 0xe1, |
942 | 0x00, 0x0b, 0x49, 0x12, 0xf6, 0x20, 0x88, 0x13, | 942 | 0x00, 0x0b, 0x49, 0x12, 0xf6, 0x20, 0x88, 0x13, |
943 | 0xe8, 0x0c, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95, | 943 | 0xe8, 0x0c, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95, |
944 | 0xf4, 0x95, 0xf5, 0xab, 0xf8, 0x20, 0x10, 0x27, | 944 | 0xf4, 0x95, 0xf5, 0xab, 0xf8, 0x20, 0x10, 0x27, |
945 | 0x48, 0x13, 0x80, 0x06, 0x88, 0x10, 0xf4, 0x95, | 945 | 0x48, 0x13, 0x80, 0x06, 0x88, 0x10, 0xf4, 0x95, |
946 | 0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0x30, | 946 | 0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0x30, |
947 | 0x70, 0x06, 0x00, 0x16, 0x12, 0x06, 0xf8, 0x45, | 947 | 0x70, 0x06, 0x00, 0x16, 0x12, 0x06, 0xf8, 0x45, |
948 | 0x10, 0x5f, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00, | 948 | 0x10, 0x5f, 0x10, 0xe1, 0x00, 0x04, 0x80, 0x00, |
949 | 0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02, | 949 | 0x10, 0x05, 0x80, 0x01, 0x10, 0x04, 0x80, 0x02, |
950 | 0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74, | 950 | 0x10, 0x06, 0x80, 0x03, 0x48, 0x11, 0xf2, 0x74, |
951 | 0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06, | 951 | 0x07, 0x1e, 0xf0, 0x00, 0x00, 0x05, 0x10, 0x06, |
952 | 0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04, | 952 | 0x00, 0xe1, 0x00, 0x04, 0x80, 0xe1, 0x00, 0x04, |
953 | 0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, | 953 | 0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, |
954 | 0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04, | 954 | 0x00, 0x0c, 0x88, 0x12, 0x11, 0x06, 0x10, 0x04, |
955 | 0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, | 955 | 0xf6, 0x00, 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, |
956 | 0x88, 0x16, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x0c, | 956 | 0x88, 0x16, 0xf4, 0x95, 0x77, 0x10, 0x00, 0x0c, |
957 | 0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, 0xf6, 0xab, | 957 | 0x71, 0xe1, 0x00, 0x04, 0x00, 0x13, 0xf6, 0xab, |
958 | 0xf8, 0x20, 0x10, 0x5f, 0x6b, 0xf8, 0x27, 0x6f, | 958 | 0xf8, 0x20, 0x10, 0x5f, 0x6b, 0xf8, 0x27, 0x6f, |
959 | 0x00, 0x01, 0x77, 0x10, 0x00, 0x0c, 0xf6, 0xaa, | 959 | 0x00, 0x01, 0x77, 0x10, 0x00, 0x0c, 0xf6, 0xaa, |
960 | 0xf8, 0x20, 0x10, 0x6b, 0xf2, 0x74, 0x0e, 0x9f, | 960 | 0xf8, 0x20, 0x10, 0x6b, 0xf2, 0x74, 0x0e, 0x9f, |
961 | 0xf4, 0x95, 0x48, 0x17, 0x71, 0xe1, 0x00, 0x0c, | 961 | 0xf4, 0x95, 0x48, 0x17, 0x71, 0xe1, 0x00, 0x0c, |
962 | 0x00, 0x12, 0x77, 0x10, 0x00, 0x0c, 0xf4, 0xaa, | 962 | 0x00, 0x12, 0x77, 0x10, 0x00, 0x0c, 0xf4, 0xaa, |
963 | 0xf8, 0x30, 0x10, 0x7c, 0x77, 0x10, 0x00, 0x0c, | 963 | 0xf8, 0x30, 0x10, 0x7c, 0x77, 0x10, 0x00, 0x0c, |
964 | 0x71, 0xe1, 0x00, 0x0b, 0x00, 0x13, 0xf6, 0xab, | 964 | 0x71, 0xe1, 0x00, 0x0b, 0x00, 0x13, 0xf6, 0xab, |
965 | 0xf8, 0x30, 0x10, 0xb4, 0xe7, 0x30, 0xf7, 0xaa, | 965 | 0xf8, 0x30, 0x10, 0xb4, 0xe7, 0x30, 0xf7, 0xaa, |
966 | 0xf8, 0x30, 0x10, 0xb4, 0xf2, 0x74, 0x0e, 0xc1, | 966 | 0xf8, 0x30, 0x10, 0xb4, 0xf2, 0x74, 0x0e, 0xc1, |
967 | 0xf4, 0x95, 0x48, 0x17, 0x88, 0x12, 0xf4, 0x95, | 967 | 0xf4, 0x95, 0x48, 0x17, 0x88, 0x12, 0xf4, 0x95, |
968 | 0xf4, 0x95, 0x6c, 0x82, 0x10, 0x8d, 0x76, 0xe1, | 968 | 0xf4, 0x95, 0x6c, 0x82, 0x10, 0x8d, 0x76, 0xe1, |
969 | 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, | 969 | 0x00, 0x04, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, |
970 | 0x00, 0x05, 0xf0, 0x73, 0x10, 0xb4, 0x76, 0xe1, | 970 | 0x00, 0x05, 0xf0, 0x73, 0x10, 0xb4, 0x76, 0xe1, |
971 | 0x00, 0x02, 0x00, 0x04, 0x77, 0x10, 0x00, 0x0c, | 971 | 0x00, 0x02, 0x00, 0x04, 0x77, 0x10, 0x00, 0x0c, |
972 | 0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf5, 0xaa, | 972 | 0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf5, 0xaa, |
973 | 0xf8, 0x20, 0x10, 0x9a, 0xf0, 0x73, 0x10, 0x9c, | 973 | 0xf8, 0x20, 0x10, 0x9a, 0xf0, 0x73, 0x10, 0x9c, |
974 | 0x77, 0x12, 0x00, 0x0c, 0x76, 0x00, 0x00, 0x00, | 974 | 0x77, 0x12, 0x00, 0x0c, 0x76, 0x00, 0x00, 0x00, |
975 | 0x70, 0x01, 0x00, 0x12, 0x70, 0x02, 0x00, 0x17, | 975 | 0x70, 0x01, 0x00, 0x12, 0x70, 0x02, 0x00, 0x17, |
976 | 0x76, 0x03, 0x00, 0x01, 0x48, 0x11, 0xf2, 0x74, | 976 | 0x76, 0x03, 0x00, 0x01, 0x48, 0x11, 0xf2, 0x74, |
977 | 0x0c, 0xb9, 0xf0, 0x00, 0x00, 0x05, 0x76, 0xe1, | 977 | 0x0c, 0xb9, 0xf0, 0x00, 0x00, 0x05, 0x76, 0xe1, |
978 | 0x00, 0x04, 0x00, 0x00, 0x77, 0x10, 0x00, 0x0c, | 978 | 0x00, 0x04, 0x00, 0x00, 0x77, 0x10, 0x00, 0x0c, |
979 | 0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf6, 0xaa, | 979 | 0x71, 0xe1, 0x00, 0x0b, 0x00, 0x12, 0xf6, 0xaa, |
980 | 0xf8, 0x20, 0x11, 0x1c, 0x48, 0x16, 0xf8, 0x45, | 980 | 0xf8, 0x20, 0x11, 0x1c, 0x48, 0x16, 0xf8, 0x45, |
981 | 0x11, 0x33, 0x60, 0xe1, 0x00, 0x02, 0x00, 0x05, | 981 | 0x11, 0x33, 0x60, 0xe1, 0x00, 0x02, 0x00, 0x05, |
982 | 0xf8, 0x20, 0x10, 0xdf, 0x10, 0xe1, 0x00, 0x0b, | 982 | 0xf8, 0x20, 0x10, 0xdf, 0x10, 0xe1, 0x00, 0x0b, |
983 | 0x08, 0xe1, 0x00, 0x0c, 0x11, 0xe1, 0x00, 0x04, | 983 | 0x08, 0xe1, 0x00, 0x0c, 0x11, 0xe1, 0x00, 0x04, |
984 | 0xf8, 0x4d, 0x10, 0xc7, 0x6b, 0xf8, 0x27, 0x6f, | 984 | 0xf8, 0x4d, 0x10, 0xc7, 0x6b, 0xf8, 0x27, 0x6f, |
985 | 0x00, 0x01, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, | 985 | 0x00, 0x01, 0x88, 0x10, 0xf4, 0x95, 0xf4, 0x95, |
986 | 0xf5, 0xae, 0xf8, 0x20, 0x10, 0xcf, 0x48, 0x16, | 986 | 0xf5, 0xae, 0xf8, 0x20, 0x10, 0xcf, 0x48, 0x16, |
987 | 0xf4, 0x95, 0x48, 0x08, 0xf8, 0x45, 0x11, 0x16, | 987 | 0xf4, 0x95, 0x48, 0x08, 0xf8, 0x45, 0x11, 0x16, |
988 | 0x6f, 0xe1, 0x00, 0x0c, 0x0d, 0x00, 0x81, 0xe1, | 988 | 0x6f, 0xe1, 0x00, 0x0c, 0x0d, 0x00, 0x81, 0xe1, |
989 | 0x00, 0x0c, 0x11, 0x04, 0xf5, 0x00, 0x81, 0x04, | 989 | 0x00, 0x0c, 0x11, 0x04, 0xf5, 0x00, 0x81, 0x04, |
990 | 0x49, 0x16, 0xf5, 0x20, 0x89, 0x16, 0xf0, 0x73, | 990 | 0x49, 0x16, 0xf5, 0x20, 0x89, 0x16, 0xf0, 0x73, |
991 | 0x11, 0x0e, 0x10, 0xe1, 0x00, 0x0b, 0x71, 0xe1, | 991 | 0x11, 0x0e, 0x10, 0xe1, 0x00, 0x0b, 0x71, 0xe1, |
992 | 0x00, 0x0c, 0x00, 0x12, 0x88, 0x10, 0xf4, 0x95, | 992 | 0x00, 0x0c, 0x00, 0x12, 0x88, 0x10, 0xf4, 0x95, |
993 | 0xf4, 0x95, 0xf6, 0xaa, 0xf8, 0x30, 0x11, 0x16, | 993 | 0xf4, 0x95, 0xf6, 0xaa, 0xf8, 0x30, 0x11, 0x16, |
994 | 0x49, 0x12, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95, | 994 | 0x49, 0x12, 0xf6, 0x20, 0x88, 0x10, 0xf4, 0x95, |
995 | 0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0xf3, | 995 | 0xf4, 0x95, 0xf5, 0xae, 0xf8, 0x20, 0x10, 0xf3, |
996 | 0x48, 0x16, 0x80, 0x06, 0x48, 0x08, 0xf8, 0x45, | 996 | 0x48, 0x16, 0x80, 0x06, 0x48, 0x08, 0xf8, 0x45, |
997 | 0x11, 0x16, 0x10, 0x04, 0x70, 0x02, 0x00, 0x17, | 997 | 0x11, 0x16, 0x10, 0x04, 0x70, 0x02, 0x00, 0x17, |
998 | 0x80, 0x00, 0x76, 0x03, 0x00, 0x00, 0x10, 0x06, | 998 | 0x80, 0x00, 0x76, 0x03, 0x00, 0x00, 0x10, 0x06, |
999 | 0x80, 0x01, 0x10, 0x05, 0xf0, 0x74, 0x0c, 0xb9, | 999 | 0x80, 0x01, 0x10, 0x05, 0xf0, 0x74, 0x0c, 0xb9, |
1000 | 0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, | 1000 | 0x10, 0x06, 0x00, 0xe1, 0x00, 0x0c, 0x80, 0xe1, |
1001 | 0x00, 0x0c, 0x11, 0x06, 0x10, 0x04, 0xf6, 0x00, | 1001 | 0x00, 0x0c, 0x11, 0x06, 0x10, 0x04, 0xf6, 0x00, |
1002 | 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 0x88, 0x16, | 1002 | 0x80, 0x04, 0x48, 0x16, 0xf6, 0x20, 0x88, 0x16, |
1003 | 0x10, 0xe1, 0x00, 0x0c, 0x08, 0xe1, 0x00, 0x0b, | 1003 | 0x10, 0xe1, 0x00, 0x0c, 0x08, 0xe1, 0x00, 0x0b, |
1004 | 0xf8, 0x45, 0x11, 0x1c, 0xf0, 0x73, 0x11, 0x31, | 1004 | 0xf8, 0x45, 0x11, 0x1c, 0xf0, 0x73, 0x11, 0x31, |
1005 | 0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, | 1005 | 0xf2, 0x74, 0x0e, 0x9f, 0xf4, 0x95, 0x48, 0x17, |
1006 | 0xf0, 0x73, 0x11, 0x33, 0x76, 0xe1, 0x00, 0x0c, | 1006 | 0xf0, 0x73, 0x11, 0x33, 0x76, 0xe1, 0x00, 0x0c, |
1007 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00, | 1007 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x00, |
1008 | 0x76, 0xe1, 0x00, 0x02, 0x00, 0x01, 0x10, 0x04, | 1008 | 0x76, 0xe1, 0x00, 0x02, 0x00, 0x01, 0x10, 0x04, |
1009 | 0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f, | 1009 | 0x80, 0x00, 0x10, 0x05, 0xf0, 0x74, 0x06, 0x9f, |
1010 | 0x88, 0x12, 0xf4, 0x95, 0x77, 0x10, 0x00, 0xff, | 1010 | 0x88, 0x12, 0xf4, 0x95, 0x77, 0x10, 0x00, 0xff, |
1011 | 0xf4, 0xaa, 0xf8, 0x30, 0x11, 0x33, 0x6c, 0x86, | 1011 | 0xf4, 0xaa, 0xf8, 0x30, 0x11, 0x33, 0x6c, 0x86, |
1012 | 0x0f, 0x70, 0xee, 0x08, 0x8a, 0x17, 0x8a, 0x16, | 1012 | 0x0f, 0x70, 0xee, 0x08, 0x8a, 0x17, 0x8a, 0x16, |
1013 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, | 1013 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfc, |
1014 | 0xf4, 0x95, 0x71, 0x06, 0x00, 0x12, 0x88, 0x11, | 1014 | 0xf4, 0x95, 0x71, 0x06, 0x00, 0x12, 0x88, 0x11, |
1015 | 0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d, | 1015 | 0x73, 0x12, 0x00, 0x0e, 0xf1, 0x66, 0x00, 0x0d, |
1016 | 0xf3, 0x00, 0x24, 0x00, 0x89, 0x14, 0x13, 0x81, | 1016 | 0xf3, 0x00, 0x24, 0x00, 0x89, 0x14, 0x13, 0x81, |
1017 | 0xf7, 0x7a, 0xf3, 0x30, 0x00, 0x01, 0x81, 0xf8, | 1017 | 0xf7, 0x7a, 0xf3, 0x30, 0x00, 0x01, 0x81, 0xf8, |
1018 | 0x27, 0x60, 0x13, 0xe1, 0x00, 0x01, 0xf7, 0x7c, | 1018 | 0x27, 0x60, 0x13, 0xe1, 0x00, 0x01, 0xf7, 0x7c, |
1019 | 0xf3, 0x30, 0x00, 0x03, 0x81, 0xf8, 0x27, 0x61, | 1019 | 0xf3, 0x30, 0x00, 0x03, 0x81, 0xf8, 0x27, 0x61, |
1020 | 0xe9, 0x0f, 0x19, 0xe1, 0x00, 0x01, 0x81, 0xf8, | 1020 | 0xe9, 0x0f, 0x19, 0xe1, 0x00, 0x01, 0x81, 0xf8, |
1021 | 0x27, 0x62, 0x71, 0xe4, 0x00, 0x03, 0x00, 0x13, | 1021 | 0x27, 0x62, 0x71, 0xe4, 0x00, 0x03, 0x00, 0x13, |
1022 | 0xf6, 0xb8, 0x49, 0x13, 0xf3, 0x00, 0x00, 0x01, | 1022 | 0xf6, 0xb8, 0x49, 0x13, 0xf3, 0x00, 0x00, 0x01, |
1023 | 0xf3, 0x30, 0x00, 0x0f, 0x49, 0x0b, 0x09, 0xf8, | 1023 | 0xf3, 0x30, 0x00, 0x0f, 0x49, 0x0b, 0x09, 0xf8, |
1024 | 0x27, 0x62, 0xf8, 0x4d, 0x11, 0x75, 0x77, 0x10, | 1024 | 0x27, 0x62, 0xf8, 0x4d, 0x11, 0x75, 0x77, 0x10, |
1025 | 0x00, 0xff, 0xf4, 0xab, 0xf8, 0x30, 0x11, 0x75, | 1025 | 0x00, 0xff, 0xf4, 0xab, 0xf8, 0x30, 0x11, 0x75, |
1026 | 0x57, 0xf8, 0x27, 0x6c, 0xf3, 0x00, 0x00, 0x01, | 1026 | 0x57, 0xf8, 0x27, 0x6c, 0xf3, 0x00, 0x00, 0x01, |
1027 | 0x4f, 0xf8, 0x27, 0x6c, 0x76, 0xf8, 0x27, 0x63, | 1027 | 0x4f, 0xf8, 0x27, 0x6c, 0x76, 0xf8, 0x27, 0x63, |
1028 | 0x00, 0x01, 0xf0, 0x73, 0x11, 0x78, 0x76, 0xf8, | 1028 | 0x00, 0x01, 0xf0, 0x73, 0x11, 0x78, 0x76, 0xf8, |
1029 | 0x27, 0x63, 0x00, 0x00, 0x70, 0xe4, 0x00, 0x03, | 1029 | 0x27, 0x63, 0x00, 0x00, 0x70, 0xe4, 0x00, 0x03, |
1030 | 0x27, 0x62, 0x76, 0xf8, 0x27, 0x64, 0x00, 0x00, | 1030 | 0x27, 0x62, 0x76, 0xf8, 0x27, 0x64, 0x00, 0x00, |
1031 | 0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, 0x00, 0x0b, | 1031 | 0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, 0x00, 0x0b, |
1032 | 0x00, 0x02, 0xf8, 0x20, 0x11, 0x8d, 0xe9, 0x01, | 1032 | 0x00, 0x02, 0xf8, 0x20, 0x11, 0x8d, 0xe9, 0x01, |
1033 | 0x6f, 0xe1, 0x00, 0x02, 0x0f, 0x18, 0x81, 0xf8, | 1033 | 0x6f, 0xe1, 0x00, 0x02, 0x0f, 0x18, 0x81, 0xf8, |
1034 | 0x27, 0x64, 0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, | 1034 | 0x27, 0x64, 0x11, 0xf8, 0x27, 0x61, 0x61, 0xf8, |
1035 | 0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, 0x11, 0xa9, | 1035 | 0x00, 0x0b, 0x00, 0x01, 0xf8, 0x20, 0x11, 0xa9, |
1036 | 0x10, 0xf8, 0x27, 0x64, 0xf1, 0x00, 0x00, 0x04, | 1036 | 0x10, 0xf8, 0x27, 0x64, 0xf1, 0x00, 0x00, 0x04, |
1037 | 0x89, 0x13, 0xe9, 0xb8, 0xf5, 0x20, 0x81, 0xf8, | 1037 | 0x89, 0x13, 0xe9, 0xb8, 0xf5, 0x20, 0x81, 0xf8, |
1038 | 0x27, 0x65, 0x60, 0x84, 0x00, 0x02, 0xf8, 0x20, | 1038 | 0x27, 0x65, 0x60, 0x84, 0x00, 0x02, 0xf8, 0x20, |
1039 | 0x11, 0xa9, 0x70, 0x00, 0x00, 0x11, 0x70, 0x01, | 1039 | 0x11, 0xa9, 0x70, 0x00, 0x00, 0x11, 0x70, 0x01, |
1040 | 0x00, 0x13, 0x70, 0x02, 0x27, 0x65, 0xf2, 0x74, | 1040 | 0x00, 0x13, 0x70, 0x02, 0x27, 0x65, 0xf2, 0x74, |
1041 | 0x0f, 0x18, 0xf4, 0x95, 0x48, 0x12, 0xee, 0x04, | 1041 | 0x0f, 0x18, 0xf4, 0x95, 0x48, 0x12, 0xee, 0x04, |
1042 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, | 1042 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, |
1043 | 0x4a, 0x17, 0xee, 0xfc, 0xe8, 0x00, 0x4e, 0xf8, | 1043 | 0x4a, 0x17, 0xee, 0xfc, 0xe8, 0x00, 0x4e, 0xf8, |
1044 | 0x27, 0x66, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x68, | 1044 | 0x27, 0x66, 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x68, |
1045 | 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x6c, 0xe8, 0x00, | 1045 | 0xe8, 0x00, 0x4e, 0xf8, 0x27, 0x6c, 0xe8, 0x00, |
1046 | 0x4e, 0xf8, 0x27, 0x6a, 0x77, 0x12, 0x27, 0x40, | 1046 | 0x4e, 0xf8, 0x27, 0x6a, 0x77, 0x12, 0x27, 0x40, |
1047 | 0x77, 0x11, 0x24, 0x00, 0x77, 0x1a, 0x00, 0x1f, | 1047 | 0x77, 0x11, 0x24, 0x00, 0x77, 0x1a, 0x00, 0x1f, |
1048 | 0xf0, 0x72, 0x11, 0xdb, 0x70, 0x92, 0x00, 0x11, | 1048 | 0xf0, 0x72, 0x11, 0xdb, 0x70, 0x92, 0x00, 0x11, |
1049 | 0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, 0x76, 0x81, | 1049 | 0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, 0x76, 0x81, |
1050 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 0x00, 0x00, | 1050 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, 0x00, 0x00, |
1051 | 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 0x76, 0xe1, | 1051 | 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, 0x76, 0xe1, |
1052 | 0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, | 1052 | 0x00, 0x0c, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, |
1053 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, | 1053 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, |
1054 | 0x6d, 0xe9, 0x00, 0x0d, 0xf0, 0x20, 0x25, 0xa0, | 1054 | 0x6d, 0xe9, 0x00, 0x0d, 0xf0, 0x20, 0x25, 0xa0, |
1055 | 0xf1, 0x00, 0x00, 0x07, 0x89, 0x11, 0xf1, 0x00, | 1055 | 0xf1, 0x00, 0x00, 0x07, 0x89, 0x11, 0xf1, 0x00, |
1056 | 0x00, 0x01, 0x81, 0x02, 0x88, 0x16, 0xf4, 0x95, | 1056 | 0x00, 0x01, 0x81, 0x02, 0x88, 0x16, 0xf4, 0x95, |
1057 | 0x77, 0x17, 0x00, 0x20, 0x76, 0x86, 0x00, 0xff, | 1057 | 0x77, 0x17, 0x00, 0x20, 0x76, 0x86, 0x00, 0xff, |
1058 | 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0x06, | 1058 | 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0x06, |
1059 | 0x10, 0x02, 0xf0, 0x74, 0x06, 0x6c, 0x76, 0x00, | 1059 | 0x10, 0x02, 0xf0, 0x74, 0x06, 0x6c, 0x76, 0x00, |
1060 | 0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74, | 1060 | 0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74, |
1061 | 0x06, 0x6c, 0xf4, 0x95, 0x48, 0x11, 0x10, 0x02, | 1061 | 0x06, 0x6c, 0xf4, 0x95, 0x48, 0x11, 0x10, 0x02, |
1062 | 0xf0, 0x00, 0x00, 0x0d, 0x80, 0x02, 0x6d, 0xe9, | 1062 | 0xf0, 0x00, 0x00, 0x0d, 0x80, 0x02, 0x6d, 0xe9, |
1063 | 0x00, 0x0d, 0x6d, 0xee, 0x00, 0x0d, 0x6c, 0xef, | 1063 | 0x00, 0x0d, 0x6d, 0xee, 0x00, 0x0d, 0x6c, 0xef, |
1064 | 0xff, 0xff, 0x11, 0xe8, 0xf0, 0x74, 0x0c, 0x9d, | 1064 | 0xff, 0xff, 0x11, 0xe8, 0xf0, 0x74, 0x0c, 0x9d, |
1065 | 0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, | 1065 | 0xee, 0x04, 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, |
1066 | 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, | 1066 | 0xfc, 0x00, 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, |
1067 | 0xee, 0xfa, 0x88, 0x11, 0x10, 0x0a, 0x49, 0x11, | 1067 | 0xee, 0xfa, 0x88, 0x11, 0x10, 0x0a, 0x49, 0x11, |
1068 | 0xf8, 0x4d, 0x12, 0x9f, 0x48, 0x08, 0xf8, 0x45, | 1068 | 0xf8, 0x4d, 0x12, 0x9f, 0x48, 0x08, 0xf8, 0x45, |
1069 | 0x12, 0x9f, 0x80, 0x04, 0x12, 0x81, 0xf5, 0x78, | 1069 | 0x12, 0x9f, 0x80, 0x04, 0x12, 0x81, 0xf5, 0x78, |
1070 | 0x89, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe2, | 1070 | 0x89, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x6c, 0xe2, |
1071 | 0xff, 0xb9, 0x12, 0x8a, 0x61, 0xf8, 0x00, 0x08, | 1071 | 0xff, 0xb9, 0x12, 0x8a, 0x61, 0xf8, 0x00, 0x08, |
1072 | 0x00, 0x80, 0xf8, 0x30, 0x12, 0x8a, 0x13, 0xe1, | 1072 | 0x00, 0x80, 0xf8, 0x30, 0x12, 0x8a, 0x13, 0xe1, |
1073 | 0x00, 0x01, 0xf0, 0xe8, 0xf7, 0x78, 0xf1, 0xa0, | 1073 | 0x00, 0x01, 0xf0, 0xe8, 0xf7, 0x78, 0xf1, 0xa0, |
1074 | 0xf2, 0x30, 0x1f, 0xff, 0x88, 0x17, 0xf4, 0x95, | 1074 | 0xf2, 0x30, 0x1f, 0xff, 0x88, 0x17, 0xf4, 0x95, |
1075 | 0x77, 0x12, 0x24, 0x00, 0x77, 0x16, 0x00, 0x00, | 1075 | 0x77, 0x12, 0x24, 0x00, 0x77, 0x16, 0x00, 0x00, |
1076 | 0x77, 0x13, 0x00, 0x20, 0xf6, 0xb8, 0x48, 0x17, | 1076 | 0x77, 0x13, 0x00, 0x20, 0xf6, 0xb8, 0x48, 0x17, |
1077 | 0x08, 0xe2, 0x00, 0x01, 0xf8, 0x45, 0x12, 0x42, | 1077 | 0x08, 0xe2, 0x00, 0x01, 0xf8, 0x45, 0x12, 0x42, |
1078 | 0x6d, 0xea, 0x00, 0x0d, 0x6d, 0x96, 0x6c, 0xeb, | 1078 | 0x6d, 0xea, 0x00, 0x0d, 0x6d, 0x96, 0x6c, 0xeb, |
1079 | 0xff, 0xff, 0x12, 0x34, 0xf0, 0x73, 0x12, 0x90, | 1079 | 0xff, 0xff, 0x12, 0x34, 0xf0, 0x73, 0x12, 0x90, |
1080 | 0x56, 0xf8, 0x27, 0x6a, 0xf0, 0x00, 0x00, 0x01, | 1080 | 0x56, 0xf8, 0x27, 0x6a, 0xf0, 0x00, 0x00, 0x01, |
1081 | 0x4e, 0xf8, 0x27, 0x6a, 0x60, 0x82, 0x00, 0x01, | 1081 | 0x4e, 0xf8, 0x27, 0x6a, 0x60, 0x82, 0x00, 0x01, |
1082 | 0xf8, 0x30, 0x12, 0x54, 0x70, 0x00, 0x00, 0x16, | 1082 | 0xf8, 0x30, 0x12, 0x54, 0x70, 0x00, 0x00, 0x16, |
1083 | 0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11, | 1083 | 0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11, |
1084 | 0xf0, 0x73, 0x12, 0x90, 0x70, 0x00, 0x00, 0x16, | 1084 | 0xf0, 0x73, 0x12, 0x90, 0x70, 0x00, 0x00, 0x16, |
1085 | 0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11, | 1085 | 0xf2, 0x74, 0x11, 0x38, 0xf4, 0x95, 0x48, 0x11, |
1086 | 0x72, 0x10, 0x2a, 0x9e, 0xf4, 0x95, 0xf4, 0xaf, | 1086 | 0x72, 0x10, 0x2a, 0x9e, 0xf4, 0x95, 0xf4, 0xaf, |
1087 | 0xf8, 0x30, 0x12, 0x6e, 0x76, 0x00, 0x00, 0x00, | 1087 | 0xf8, 0x30, 0x12, 0x6e, 0x76, 0x00, 0x00, 0x00, |
1088 | 0x76, 0x01, 0x00, 0xbc, 0x70, 0x02, 0x00, 0x16, | 1088 | 0x76, 0x01, 0x00, 0xbc, 0x70, 0x02, 0x00, 0x16, |
1089 | 0x76, 0x03, 0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, | 1089 | 0x76, 0x03, 0x00, 0x00, 0xf2, 0x74, 0x0c, 0xb9, |
1090 | 0xf4, 0x95, 0x48, 0x11, 0xf0, 0x73, 0x12, 0x90, | 1090 | 0xf4, 0x95, 0x48, 0x11, 0xf0, 0x73, 0x12, 0x90, |
1091 | 0x10, 0xf8, 0x27, 0x6e, 0xf8, 0x44, 0x12, 0x90, | 1091 | 0x10, 0xf8, 0x27, 0x6e, 0xf8, 0x44, 0x12, 0x90, |
1092 | 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0xbc, | 1092 | 0x76, 0x00, 0x00, 0x00, 0x76, 0x01, 0x00, 0xbc, |
1093 | 0x70, 0x02, 0x00, 0x16, 0x76, 0x03, 0x00, 0x00, | 1093 | 0x70, 0x02, 0x00, 0x16, 0x76, 0x03, 0x00, 0x00, |
1094 | 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0x48, 0x11, | 1094 | 0xf2, 0x74, 0x0c, 0xb9, 0xf4, 0x95, 0x48, 0x11, |
1095 | 0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, 0xf0, 0x10, | 1095 | 0xf0, 0x74, 0x0c, 0x5e, 0xf0, 0xe0, 0xf0, 0x10, |
1096 | 0x13, 0x88, 0xf8, 0x42, 0x12, 0x90, 0x76, 0xf8, | 1096 | 0x13, 0x88, 0xf8, 0x42, 0x12, 0x90, 0x76, 0xf8, |
1097 | 0x27, 0x6e, 0x00, 0x01, 0xf0, 0x73, 0x12, 0x90, | 1097 | 0x27, 0x6e, 0x00, 0x01, 0xf0, 0x73, 0x12, 0x90, |
1098 | 0x56, 0xf8, 0x27, 0x66, 0xf0, 0x00, 0x00, 0x01, | 1098 | 0x56, 0xf8, 0x27, 0x66, 0xf0, 0x00, 0x00, 0x01, |
1099 | 0x4e, 0xf8, 0x27, 0x66, 0x6d, 0xe9, 0x00, 0x5e, | 1099 | 0x4e, 0xf8, 0x27, 0x66, 0x6d, 0xe9, 0x00, 0x5e, |
1100 | 0x56, 0xf8, 0x27, 0x68, 0xf0, 0x00, 0x00, 0x01, | 1100 | 0x56, 0xf8, 0x27, 0x68, 0xf0, 0x00, 0x00, 0x01, |
1101 | 0x4e, 0xf8, 0x27, 0x68, 0x71, 0x04, 0x00, 0x12, | 1101 | 0x4e, 0xf8, 0x27, 0x68, 0x71, 0x04, 0x00, 0x12, |
1102 | 0x6e, 0xea, 0xff, 0xff, 0x12, 0x18, 0x70, 0x04, | 1102 | 0x6e, 0xea, 0xff, 0xff, 0x12, 0x18, 0x70, 0x04, |
1103 | 0x00, 0x12, 0xee, 0x06, 0x8a, 0x17, 0x8a, 0x16, | 1103 | 0x00, 0x12, 0xee, 0x06, 0x8a, 0x17, 0x8a, 0x16, |
1104 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, | 1104 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xee, 0xfe, |
1105 | 0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d, | 1105 | 0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d, |
1106 | 0xf0, 0x00, 0x25, 0xa0, 0x88, 0x11, 0xf4, 0x95, | 1106 | 0xf0, 0x00, 0x25, 0xa0, 0x88, 0x11, 0xf4, 0x95, |
1107 | 0xf4, 0x95, 0x76, 0x81, 0x00, 0xff, 0x76, 0x00, | 1107 | 0xf4, 0x95, 0x76, 0x81, 0x00, 0xff, 0x76, 0x00, |
1108 | 0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74, | 1108 | 0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0xf2, 0x74, |
1109 | 0x06, 0x6c, 0xf0, 0x00, 0x00, 0x01, 0x76, 0x00, | 1109 | 0x06, 0x6c, 0xf0, 0x00, 0x00, 0x01, 0x76, 0x00, |
1110 | 0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0x48, 0x11, | 1110 | 0x00, 0x00, 0x76, 0x01, 0x00, 0x06, 0x48, 0x11, |
1111 | 0xf2, 0x74, 0x06, 0x6c, 0xf0, 0x00, 0x00, 0x07, | 1111 | 0xf2, 0x74, 0x06, 0x6c, 0xf0, 0x00, 0x00, 0x07, |
1112 | 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, | 1112 | 0xee, 0x02, 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, |
1113 | 0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d, | 1113 | 0x88, 0x0e, 0xf4, 0x95, 0xf0, 0x66, 0x00, 0x0d, |
1114 | 0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, | 1114 | 0xf0, 0x00, 0x24, 0x00, 0x88, 0x11, 0xf4, 0x95, |
1115 | 0xf4, 0x95, 0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, | 1115 | 0xf4, 0x95, 0x76, 0xe1, 0x00, 0x01, 0xff, 0xff, |
1116 | 0x76, 0x81, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, | 1116 | 0x76, 0x81, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, |
1117 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, | 1117 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x03, 0x00, 0xff, |
1118 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, | 1118 | 0x8a, 0x11, 0xfc, 0x00, 0x4a, 0x11, 0xf4, 0x95, |
1119 | 0x13, 0x03, 0x88, 0x11, 0xfa, 0x4d, 0x12, 0xec, | 1119 | 0x13, 0x03, 0x88, 0x11, 0xfa, 0x4d, 0x12, 0xec, |
1120 | 0x71, 0x02, 0x00, 0x12, 0xf3, 0x10, 0x00, 0x01, | 1120 | 0x71, 0x02, 0x00, 0x12, 0xf3, 0x10, 0x00, 0x01, |
1121 | 0x89, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x12, 0xeb, | 1121 | 0x89, 0x1a, 0xf4, 0x95, 0xf0, 0x72, 0x12, 0xeb, |
1122 | 0x70, 0x91, 0x00, 0x12, 0x8a, 0x11, 0xfc, 0x00, | 1122 | 0x70, 0x91, 0x00, 0x12, 0x8a, 0x11, 0xfc, 0x00, |
1123 | 0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d, | 1123 | 0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d, |
1124 | 0xf7, 0xb8, 0xee, 0xfe, 0x10, 0xf8, 0x00, 0x08, | 1124 | 0xf7, 0xb8, 0xee, 0xfe, 0x10, 0xf8, 0x00, 0x08, |
1125 | 0x11, 0x06, 0xf1, 0xc0, 0x83, 0x00, 0xf4, 0x85, | 1125 | 0x11, 0x06, 0xf1, 0xc0, 0x83, 0x00, 0xf4, 0x85, |
1126 | 0x11, 0x06, 0xf7, 0x85, 0x81, 0x06, 0xf6, 0xb8, | 1126 | 0x11, 0x06, 0xf7, 0x85, 0x81, 0x06, 0xf6, 0xb8, |
1127 | 0xec, 0x0f, 0x1e, 0x06, 0x61, 0x00, 0x80, 0x00, | 1127 | 0xec, 0x0f, 0x1e, 0x06, 0x61, 0x00, 0x80, 0x00, |
1128 | 0xf8, 0x20, 0x13, 0x05, 0xf4, 0x84, 0xee, 0x02, | 1128 | 0xf8, 0x20, 0x13, 0x05, 0xf4, 0x84, 0xee, 0x02, |
1129 | 0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, | 1129 | 0x8a, 0x0d, 0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, |
1130 | 0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d, | 1130 | 0xf4, 0x95, 0x4a, 0x0b, 0x4a, 0x0c, 0x4a, 0x0d, |
1131 | 0xee, 0xfe, 0xf7, 0xb8, 0x80, 0x00, 0x10, 0xf8, | 1131 | 0xee, 0xfe, 0xf7, 0xb8, 0x80, 0x00, 0x10, 0xf8, |
1132 | 0x00, 0x08, 0xf4, 0x85, 0x11, 0x06, 0xf7, 0x85, | 1132 | 0x00, 0x08, 0xf4, 0x85, 0x11, 0x06, 0xf7, 0x85, |
1133 | 0x81, 0x06, 0xf6, 0xb8, 0xec, 0x0f, 0x1e, 0x06, | 1133 | 0x81, 0x06, 0xf6, 0xb8, 0xec, 0x0f, 0x1e, 0x06, |
1134 | 0xf0, 0xf0, 0x61, 0x00, 0x80, 0x00, 0xf8, 0x20, | 1134 | 0xf0, 0xf0, 0x61, 0x00, 0x80, 0x00, 0xf8, 0x20, |
1135 | 0x13, 0x20, 0xf4, 0x84, 0xee, 0x02, 0x8a, 0x0d, | 1135 | 0x13, 0x20, 0xf4, 0x84, 0xee, 0x02, 0x8a, 0x0d, |
1136 | 0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, 0x4a, 0x11, | 1136 | 0x8a, 0x0c, 0x8a, 0x0b, 0xfc, 0x00, 0x4a, 0x11, |
1137 | 0x77, 0x11, 0x00, 0x7b, 0x76, 0x81, 0x2e, 0xec, | 1137 | 0x77, 0x11, 0x00, 0x7b, 0x76, 0x81, 0x2e, 0xec, |
1138 | 0x77, 0x11, 0x00, 0x7b, 0xee, 0xff, 0x71, 0x81, | 1138 | 0x77, 0x11, 0x00, 0x7b, 0xee, 0xff, 0x71, 0x81, |
1139 | 0x00, 0x11, 0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, | 1139 | 0x00, 0x11, 0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, |
1140 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, | 1140 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x04, 0x00, 0x00, |
1141 | 0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1, | 1141 | 0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1, |
1142 | 0x00, 0x62, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x76, | 1142 | 0x00, 0x62, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x76, |
1143 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x92, 0x00, 0x00, | 1143 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x92, 0x00, 0x00, |
1144 | 0x76, 0xe1, 0x00, 0x94, 0x00, 0x00, 0x76, 0xe1, | 1144 | 0x76, 0xe1, 0x00, 0x94, 0x00, 0x00, 0x76, 0xe1, |
1145 | 0x00, 0xb0, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xb3, | 1145 | 0x00, 0xb0, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xb3, |
1146 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0xbe, 0x00, 0x00, | 1146 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0xbe, 0x00, 0x00, |
1147 | 0x76, 0xe1, 0x00, 0xbf, 0x00, 0x00, 0x76, 0xe1, | 1147 | 0x76, 0xe1, 0x00, 0xbf, 0x00, 0x00, 0x76, 0xe1, |
1148 | 0x00, 0xc1, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xc3, | 1148 | 0x00, 0xc1, 0x00, 0x00, 0x76, 0xe1, 0x00, 0xc3, |
1149 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0xc5, 0x00, 0x00, | 1149 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0xc5, 0x00, 0x00, |
1150 | 0x76, 0xe1, 0x00, 0xc7, 0x00, 0x00, 0x76, 0x81, | 1150 | 0x76, 0xe1, 0x00, 0xc7, 0x00, 0x00, 0x76, 0x81, |
1151 | 0x00, 0x00, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, | 1151 | 0x00, 0x00, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, |
1152 | 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xff, | 1152 | 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xff, |
1153 | 0xf4, 0x95, 0x71, 0x06, 0x00, 0x16, 0xfb, 0x80, | 1153 | 0xf4, 0x95, 0x71, 0x06, 0x00, 0x16, 0xfb, 0x80, |
1154 | 0x16, 0xa2, 0x88, 0x17, 0xf4, 0x95, 0xf7, 0xb8, | 1154 | 0x16, 0xa2, 0x88, 0x17, 0xf4, 0x95, 0xf7, 0xb8, |
1155 | 0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02, | 1155 | 0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02, |
1156 | 0xfa, 0x46, 0x13, 0x88, 0x77, 0x11, 0x00, 0x00, | 1156 | 0xfa, 0x46, 0x13, 0x88, 0x77, 0x11, 0x00, 0x00, |
1157 | 0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02, | 1157 | 0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x02, |
1158 | 0xf8, 0x45, 0x13, 0xf9, 0x10, 0xf8, 0x00, 0x17, | 1158 | 0xf8, 0x45, 0x13, 0xf9, 0x10, 0xf8, 0x00, 0x17, |
1159 | 0xf8, 0x45, 0x14, 0x39, 0x10, 0xf8, 0x00, 0x17, | 1159 | 0xf8, 0x45, 0x14, 0x39, 0x10, 0xf8, 0x00, 0x17, |
1160 | 0xf0, 0x10, 0x00, 0x01, 0xf8, 0x45, 0x14, 0x1f, | 1160 | 0xf0, 0x10, 0x00, 0x01, 0xf8, 0x45, 0x14, 0x1f, |
1161 | 0xf0, 0x73, 0x14, 0x52, 0x10, 0xf8, 0x00, 0x17, | 1161 | 0xf0, 0x73, 0x14, 0x52, 0x10, 0xf8, 0x00, 0x17, |
1162 | 0xf0, 0x10, 0x00, 0x03, 0xf8, 0x45, 0x13, 0xd3, | 1162 | 0xf0, 0x10, 0x00, 0x03, 0xf8, 0x45, 0x13, 0xd3, |
1163 | 0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x06, | 1163 | 0x10, 0xf8, 0x00, 0x17, 0xf0, 0x10, 0x00, 0x06, |
1164 | 0xf8, 0x44, 0x14, 0x52, 0x77, 0x12, 0x00, 0x7b, | 1164 | 0xf8, 0x44, 0x14, 0x52, 0x77, 0x12, 0x00, 0x7b, |
1165 | 0x71, 0x82, 0x00, 0x14, 0x61, 0xe4, 0x00, 0x07, | 1165 | 0x71, 0x82, 0x00, 0x14, 0x61, 0xe4, 0x00, 0x07, |
1166 | 0x00, 0x40, 0xf8, 0x30, 0x14, 0x52, 0x49, 0x14, | 1166 | 0x00, 0x40, 0xf8, 0x30, 0x14, 0x52, 0x49, 0x14, |
1167 | 0x48, 0x17, 0xf6, 0x00, 0x88, 0x12, 0xf4, 0x95, | 1167 | 0x48, 0x17, 0xf6, 0x00, 0x88, 0x12, 0xf4, 0x95, |
1168 | 0x77, 0x13, 0x00, 0x55, 0x77, 0x11, 0x00, 0x57, | 1168 | 0x77, 0x13, 0x00, 0x55, 0x77, 0x11, 0x00, 0x57, |
1169 | 0x6d, 0xea, 0x00, 0x3b, 0xe5, 0x01, 0x10, 0xe6, | 1169 | 0x6d, 0xea, 0x00, 0x3b, 0xe5, 0x01, 0x10, 0xe6, |
1170 | 0x00, 0x06, 0x80, 0x81, 0x48, 0x14, 0x00, 0xf8, | 1170 | 0x00, 0x06, 0x80, 0x81, 0x48, 0x14, 0x00, 0xf8, |
1171 | 0x00, 0x17, 0x88, 0x12, 0xf4, 0x95, 0x77, 0x11, | 1171 | 0x00, 0x17, 0x88, 0x12, 0xf4, 0x95, 0x77, 0x11, |
1172 | 0x00, 0x55, 0x10, 0xe2, 0x00, 0x40, 0x80, 0x81, | 1172 | 0x00, 0x55, 0x10, 0xe2, 0x00, 0x40, 0x80, 0x81, |
1173 | 0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x07, | 1173 | 0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x07, |
1174 | 0x80, 0x81, 0x77, 0x11, 0x00, 0x55, 0x10, 0xe2, | 1174 | 0x80, 0x81, 0x77, 0x11, 0x00, 0x55, 0x10, 0xe2, |
1175 | 0x00, 0x45, 0x80, 0x81, 0x10, 0xe6, 0x00, 0x08, | 1175 | 0x00, 0x45, 0x80, 0x81, 0x10, 0xe6, 0x00, 0x08, |
1176 | 0x77, 0x11, 0x00, 0x57, 0x80, 0x81, 0x77, 0x11, | 1176 | 0x77, 0x11, 0x00, 0x57, 0x80, 0x81, 0x77, 0x11, |
1177 | 0x00, 0x55, 0x10, 0xe2, 0x00, 0x4a, 0x80, 0x81, | 1177 | 0x00, 0x55, 0x10, 0xe2, 0x00, 0x4a, 0x80, 0x81, |
1178 | 0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x09, | 1178 | 0x77, 0x11, 0x00, 0x57, 0x10, 0xe6, 0x00, 0x09, |
1179 | 0x80, 0x81, 0xf2, 0x73, 0x14, 0x52, 0x77, 0x11, | 1179 | 0x80, 0x81, 0xf2, 0x73, 0x14, 0x52, 0x77, 0x11, |
1180 | 0x03, 0xc0, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82, | 1180 | 0x03, 0xc0, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82, |
1181 | 0xf0, 0x00, 0x00, 0x07, 0x88, 0x13, 0xf4, 0x95, | 1181 | 0xf0, 0x00, 0x00, 0x07, 0x88, 0x13, 0xf4, 0x95, |
1182 | 0xf4, 0x95, 0x96, 0x1b, 0xf8, 0x30, 0x14, 0x52, | 1182 | 0xf4, 0x95, 0x96, 0x1b, 0xf8, 0x30, 0x14, 0x52, |
1183 | 0x10, 0xe3, 0x00, 0x35, 0x77, 0x12, 0x00, 0x55, | 1183 | 0x10, 0xe3, 0x00, 0x35, 0x77, 0x12, 0x00, 0x55, |
1184 | 0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, | 1184 | 0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, |
1185 | 0x00, 0x04, 0x80, 0x82, 0x77, 0x12, 0x00, 0x55, | 1185 | 0x00, 0x04, 0x80, 0x82, 0x77, 0x12, 0x00, 0x55, |
1186 | 0x10, 0xe3, 0x00, 0x37, 0x80, 0x82, 0x77, 0x12, | 1186 | 0x10, 0xe3, 0x00, 0x37, 0x80, 0x82, 0x77, 0x12, |
1187 | 0x00, 0x57, 0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, | 1187 | 0x00, 0x57, 0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, |
1188 | 0x48, 0x11, 0xf0, 0x40, 0x00, 0x10, 0xf2, 0x73, | 1188 | 0x48, 0x11, 0xf0, 0x40, 0x00, 0x10, 0xf2, 0x73, |
1189 | 0x14, 0x50, 0xf0, 0x40, 0x00, 0x20, 0x77, 0x12, | 1189 | 0x14, 0x50, 0xf0, 0x40, 0x00, 0x20, 0x77, 0x12, |
1190 | 0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07, | 1190 | 0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07, |
1191 | 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0d, | 1191 | 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0d, |
1192 | 0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x34, | 1192 | 0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x34, |
1193 | 0x77, 0x13, 0x00, 0x55, 0x80, 0x83, 0x77, 0x13, | 1193 | 0x77, 0x13, 0x00, 0x55, 0x80, 0x83, 0x77, 0x13, |
1194 | 0x00, 0x57, 0x10, 0xe6, 0x00, 0x02, 0x80, 0x83, | 1194 | 0x00, 0x57, 0x10, 0xe6, 0x00, 0x02, 0x80, 0x83, |
1195 | 0x10, 0xe2, 0x00, 0x36, 0x77, 0x12, 0x00, 0x55, | 1195 | 0x10, 0xe2, 0x00, 0x36, 0x77, 0x12, 0x00, 0x55, |
1196 | 0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, | 1196 | 0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, |
1197 | 0x00, 0x03, 0x80, 0x82, 0x48, 0x11, 0xf0, 0x40, | 1197 | 0x00, 0x03, 0x80, 0x82, 0x48, 0x11, 0xf0, 0x40, |
1198 | 0x00, 0x04, 0xf2, 0x73, 0x14, 0x50, 0xf0, 0x40, | 1198 | 0x00, 0x04, 0xf2, 0x73, 0x14, 0x50, 0xf0, 0x40, |
1199 | 0x00, 0x08, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82, | 1199 | 0x00, 0x08, 0x77, 0x12, 0x00, 0x7b, 0x10, 0x82, |
1200 | 0xf0, 0x00, 0x00, 0x07, 0x88, 0x12, 0xf4, 0x95, | 1200 | 0xf0, 0x00, 0x00, 0x07, 0x88, 0x12, 0xf4, 0x95, |
1201 | 0xf4, 0x95, 0x96, 0x0e, 0xf8, 0x30, 0x14, 0x52, | 1201 | 0xf4, 0x95, 0x96, 0x0e, 0xf8, 0x30, 0x14, 0x52, |
1202 | 0x10, 0xe2, 0x00, 0x33, 0x77, 0x12, 0x00, 0x55, | 1202 | 0x10, 0xe2, 0x00, 0x33, 0x77, 0x12, 0x00, 0x55, |
1203 | 0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, | 1203 | 0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0x10, 0xe6, |
1204 | 0x00, 0x01, 0x80, 0x82, 0x48, 0x11, 0xf2, 0x73, | 1204 | 0x00, 0x01, 0x80, 0x82, 0x48, 0x11, 0xf2, 0x73, |
1205 | 0x14, 0x50, 0xf0, 0x40, 0x00, 0x02, 0x77, 0x12, | 1205 | 0x14, 0x50, 0xf0, 0x40, 0x00, 0x02, 0x77, 0x12, |
1206 | 0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07, | 1206 | 0x00, 0x7b, 0x10, 0x82, 0xf0, 0x00, 0x00, 0x07, |
1207 | 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0f, | 1207 | 0x88, 0x12, 0xf4, 0x95, 0xf4, 0x95, 0x96, 0x0f, |
1208 | 0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x32, | 1208 | 0xf8, 0x30, 0x14, 0x52, 0x10, 0xe2, 0x00, 0x32, |
1209 | 0x77, 0x12, 0x00, 0x55, 0x77, 0x13, 0x00, 0x57, | 1209 | 0x77, 0x12, 0x00, 0x55, 0x77, 0x13, 0x00, 0x57, |
1210 | 0x80, 0x82, 0x48, 0x11, 0xe7, 0x62, 0xf0, 0x40, | 1210 | 0x80, 0x82, 0x48, 0x11, 0xe7, 0x62, 0xf0, 0x40, |
1211 | 0x00, 0x01, 0xe5, 0x01, 0x88, 0x11, 0xf4, 0x95, | 1211 | 0x00, 0x01, 0xe5, 0x01, 0x88, 0x11, 0xf4, 0x95, |
1212 | 0x77, 0x12, 0x00, 0x7b, 0x48, 0x11, 0x71, 0x82, | 1212 | 0x77, 0x12, 0x00, 0x7b, 0x48, 0x11, 0x71, 0x82, |
1213 | 0x00, 0x12, 0x1a, 0xe2, 0x00, 0x07, 0x80, 0xe2, | 1213 | 0x00, 0x12, 0x1a, 0xe2, 0x00, 0x07, 0x80, 0xe2, |
1214 | 0x00, 0x07, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, | 1214 | 0x00, 0x07, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, |
1215 | 0x8a, 0x17, 0x48, 0x11, 0x8a, 0x16, 0x8a, 0x11, | 1215 | 0x8a, 0x17, 0x48, 0x11, 0x8a, 0x16, 0x8a, 0x11, |
1216 | 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0x77, 0x0e, | 1216 | 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0x77, 0x0e, |
1217 | 0x00, 0x05, 0x77, 0x12, 0x00, 0x55, 0xe8, 0x04, | 1217 | 0x00, 0x05, 0x77, 0x12, 0x00, 0x55, 0xe8, 0x04, |
1218 | 0xf6, 0xb8, 0x28, 0xe1, 0x00, 0x02, 0xee, 0xff, | 1218 | 0xf6, 0xb8, 0x28, 0xe1, 0x00, 0x02, 0xee, 0xff, |
1219 | 0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0xf0, 0x20, | 1219 | 0x80, 0x82, 0x77, 0x12, 0x00, 0x57, 0xf0, 0x20, |
1220 | 0x80, 0x00, 0xee, 0x01, 0x1a, 0x82, 0x77, 0x12, | 1220 | 0x80, 0x00, 0xee, 0x01, 0x1a, 0x82, 0x77, 0x12, |
1221 | 0x00, 0x57, 0x80, 0x82, 0xe8, 0x01, 0x32, 0xe1, | 1221 | 0x00, 0x57, 0x80, 0x82, 0xe8, 0x01, 0x32, 0xe1, |
1222 | 0x00, 0x02, 0xf5, 0x82, 0x77, 0x11, 0x00, 0x54, | 1222 | 0x00, 0x02, 0xf5, 0x82, 0x77, 0x11, 0x00, 0x54, |
1223 | 0xf6, 0x93, 0x18, 0x81, 0x77, 0x11, 0x00, 0x54, | 1223 | 0xf6, 0x93, 0x18, 0x81, 0x77, 0x11, 0x00, 0x54, |
1224 | 0xf2, 0xa0, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, | 1224 | 0xf2, 0xa0, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, |
1225 | 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, | 1225 | 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, |
1226 | 0x71, 0x04, 0x00, 0x11, 0xfb, 0x80, 0x16, 0xa2, | 1226 | 0x71, 0x04, 0x00, 0x11, 0xfb, 0x80, 0x16, 0xa2, |
1227 | 0x88, 0x16, 0xf4, 0x95, 0x77, 0x12, 0x00, 0x55, | 1227 | 0x88, 0x16, 0xf4, 0x95, 0x77, 0x12, 0x00, 0x55, |
1228 | 0x10, 0xe6, 0x00, 0x03, 0x80, 0x82, 0x77, 0x12, | 1228 | 0x10, 0xe6, 0x00, 0x03, 0x80, 0x82, 0x77, 0x12, |
1229 | 0x00, 0x56, 0x10, 0xe1, 0x00, 0x02, 0x77, 0x13, | 1229 | 0x00, 0x56, 0x10, 0xe1, 0x00, 0x02, 0x77, 0x13, |
1230 | 0x00, 0x56, 0x80, 0x82, 0x77, 0x12, 0x00, 0x56, | 1230 | 0x00, 0x56, 0x80, 0x82, 0x77, 0x12, 0x00, 0x56, |
1231 | 0x10, 0xe1, 0x00, 0x03, 0x80, 0x82, 0x10, 0xe1, | 1231 | 0x10, 0xe1, 0x00, 0x03, 0x80, 0x82, 0x10, 0xe1, |
1232 | 0x00, 0x04, 0x77, 0x12, 0x00, 0x56, 0x80, 0x82, | 1232 | 0x00, 0x04, 0x77, 0x12, 0x00, 0x56, 0x80, 0x82, |
1233 | 0x77, 0x12, 0x00, 0x56, 0x10, 0xe1, 0x00, 0x01, | 1233 | 0x77, 0x12, 0x00, 0x56, 0x10, 0xe1, 0x00, 0x01, |
1234 | 0x80, 0x82, 0xe7, 0x12, 0xe5, 0x01, 0xf9, 0x80, | 1234 | 0x80, 0x82, 0xe7, 0x12, 0xe5, 0x01, 0xf9, 0x80, |
1235 | 0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, | 1235 | 0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, |
1236 | 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xf9, | 1236 | 0x4a, 0x11, 0x4a, 0x16, 0x4a, 0x17, 0xee, 0xf9, |
1237 | 0x77, 0x11, 0x00, 0x7b, 0x76, 0x00, 0x00, 0x16, | 1237 | 0x77, 0x11, 0x00, 0x7b, 0x76, 0x00, 0x00, 0x16, |
1238 | 0x76, 0x01, 0x00, 0x17, 0x76, 0x02, 0x00, 0x1a, | 1238 | 0x76, 0x01, 0x00, 0x17, 0x76, 0x02, 0x00, 0x1a, |
1239 | 0x76, 0x03, 0x00, 0x1b, 0x76, 0x04, 0x00, 0x1c, | 1239 | 0x76, 0x03, 0x00, 0x1b, 0x76, 0x04, 0x00, 0x1c, |
1240 | 0x76, 0x05, 0x00, 0x1d, 0x71, 0x81, 0x00, 0x17, | 1240 | 0x76, 0x05, 0x00, 0x1d, 0x71, 0x81, 0x00, 0x17, |
1241 | 0x71, 0xe7, 0x00, 0x06, 0x00, 0x11, 0x10, 0x81, | 1241 | 0x71, 0xe7, 0x00, 0x06, 0x00, 0x11, 0x10, 0x81, |
1242 | 0xf8, 0x44, 0x14, 0xdf, 0xf9, 0x80, 0x16, 0x53, | 1242 | 0xf8, 0x44, 0x14, 0xdf, 0xf9, 0x80, 0x16, 0x53, |
1243 | 0xf6, 0xb8, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x20, | 1243 | 0xf6, 0xb8, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x20, |
1244 | 0xff, 0xff, 0xf6, 0xb8, 0xfb, 0x80, 0x16, 0x08, | 1244 | 0xff, 0xff, 0xf6, 0xb8, 0xfb, 0x80, 0x16, 0x08, |
1245 | 0xf0, 0x20, 0xff, 0xff, 0x77, 0x11, 0x00, 0x7b, | 1245 | 0xf0, 0x20, 0xff, 0xff, 0x77, 0x11, 0x00, 0x7b, |
1246 | 0x71, 0x81, 0x00, 0x17, 0x76, 0xe7, 0x00, 0x06, | 1246 | 0x71, 0x81, 0x00, 0x17, 0x76, 0xe7, 0x00, 0x06, |
1247 | 0x00, 0x01, 0x48, 0x17, 0x77, 0x16, 0x00, 0x00, | 1247 | 0x00, 0x01, 0x48, 0x17, 0x77, 0x16, 0x00, 0x00, |
1248 | 0x77, 0x10, 0x00, 0x04, 0x77, 0x15, 0x00, 0x03, | 1248 | 0x77, 0x10, 0x00, 0x04, 0x77, 0x15, 0x00, 0x03, |
1249 | 0x77, 0x14, 0x00, 0x02, 0x77, 0x13, 0x00, 0x01, | 1249 | 0x77, 0x14, 0x00, 0x02, 0x77, 0x13, 0x00, 0x01, |
1250 | 0xf0, 0x00, 0x00, 0x39, 0x76, 0xe7, 0x00, 0x08, | 1250 | 0xf0, 0x00, 0x00, 0x39, 0x76, 0xe7, 0x00, 0x08, |
1251 | 0x00, 0x1f, 0x76, 0xe7, 0x00, 0x07, 0x00, 0x00, | 1251 | 0x00, 0x1f, 0x76, 0xe7, 0x00, 0x07, 0x00, 0x00, |
1252 | 0x88, 0x0e, 0x77, 0x1a, 0x00, 0x05, 0x48, 0x17, | 1252 | 0x88, 0x0e, 0x77, 0x1a, 0x00, 0x05, 0x48, 0x17, |
1253 | 0xf0, 0x00, 0x00, 0x09, 0x88, 0x12, 0x48, 0x18, | 1253 | 0xf0, 0x00, 0x00, 0x09, 0x88, 0x12, 0x48, 0x18, |
1254 | 0x88, 0x19, 0xe8, 0x00, 0xf0, 0x72, 0x15, 0x2c, | 1254 | 0x88, 0x19, 0xe8, 0x00, 0xf0, 0x72, 0x15, 0x2c, |
1255 | 0x73, 0x19, 0x00, 0x11, 0x76, 0x82, 0x00, 0x00, | 1255 | 0x73, 0x19, 0x00, 0x11, 0x76, 0x82, 0x00, 0x00, |
1256 | 0x11, 0x91, 0x73, 0x11, 0x00, 0x19, 0x70, 0xe2, | 1256 | 0x11, 0x91, 0x73, 0x11, 0x00, 0x19, 0x70, 0xe2, |
1257 | 0x00, 0x03, 0x00, 0x16, 0x70, 0xe2, 0x00, 0x04, | 1257 | 0x00, 0x03, 0x00, 0x16, 0x70, 0xe2, 0x00, 0x04, |
1258 | 0x00, 0x13, 0x70, 0xe2, 0x00, 0x05, 0x00, 0x14, | 1258 | 0x00, 0x13, 0x70, 0xe2, 0x00, 0x05, 0x00, 0x14, |
1259 | 0x81, 0xe2, 0x00, 0x01, 0x70, 0xe2, 0x00, 0x06, | 1259 | 0x81, 0xe2, 0x00, 0x01, 0x70, 0xe2, 0x00, 0x06, |
1260 | 0x00, 0x15, 0x70, 0xe2, 0x00, 0x07, 0x00, 0x10, | 1260 | 0x00, 0x15, 0x70, 0xe2, 0x00, 0x07, 0x00, 0x10, |
1261 | 0x80, 0xe2, 0x00, 0x02, 0x73, 0x0e, 0x00, 0x11, | 1261 | 0x80, 0xe2, 0x00, 0x02, 0x73, 0x0e, 0x00, 0x11, |
1262 | 0xf1, 0x00, 0x00, 0x1e, 0x6d, 0xee, 0x00, 0x05, | 1262 | 0xf1, 0x00, 0x00, 0x1e, 0x6d, 0xee, 0x00, 0x05, |
1263 | 0x6d, 0xeb, 0x00, 0x05, 0x6d, 0xec, 0x00, 0x05, | 1263 | 0x6d, 0xeb, 0x00, 0x05, 0x6d, 0xec, 0x00, 0x05, |
1264 | 0x6d, 0xed, 0x00, 0x05, 0x6d, 0xe8, 0x00, 0x05, | 1264 | 0x6d, 0xed, 0x00, 0x05, 0x6d, 0xe8, 0x00, 0x05, |
1265 | 0xf0, 0x00, 0x00, 0x01, 0x81, 0x91, 0x6d, 0xea, | 1265 | 0xf0, 0x00, 0x00, 0x01, 0x81, 0x91, 0x6d, 0xea, |
1266 | 0x00, 0x08, 0x73, 0x11, 0x00, 0x0e, 0xee, 0x07, | 1266 | 0x00, 0x08, 0x73, 0x11, 0x00, 0x0e, 0xee, 0x07, |
1267 | 0x76, 0xe7, 0x00, 0x41, 0x00, 0x24, 0x76, 0xe7, | 1267 | 0x76, 0xe7, 0x00, 0x41, 0x00, 0x24, 0x76, 0xe7, |
1268 | 0x00, 0x46, 0x00, 0x25, 0x76, 0xe7, 0x00, 0x4b, | 1268 | 0x00, 0x46, 0x00, 0x25, 0x76, 0xe7, 0x00, 0x4b, |
1269 | 0x00, 0x26, 0x76, 0xe7, 0x00, 0x50, 0x00, 0x27, | 1269 | 0x00, 0x26, 0x76, 0xe7, 0x00, 0x50, 0x00, 0x27, |
1270 | 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, | 1270 | 0x8a, 0x17, 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, |
1271 | 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfe, 0x88, 0x11, | 1271 | 0x4a, 0x11, 0x4a, 0x16, 0xee, 0xfe, 0x88, 0x11, |
1272 | 0x56, 0x06, 0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, | 1272 | 0x56, 0x06, 0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, |
1273 | 0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, 0xf0, 0x10, | 1273 | 0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, 0xf0, 0x10, |
1274 | 0xff, 0xff, 0xfa, 0x45, 0x15, 0x60, 0x77, 0x16, | 1274 | 0xff, 0xff, 0xfa, 0x45, 0x15, 0x60, 0x77, 0x16, |
1275 | 0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, 0x49, 0x11, | 1275 | 0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, 0x49, 0x11, |
1276 | 0x10, 0x82, 0xf6, 0x03, 0xf0, 0x00, 0x00, 0x09, | 1276 | 0x10, 0x82, 0xf6, 0x03, 0xf0, 0x00, 0x00, 0x09, |
1277 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, | 1277 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, |
1278 | 0xf8, 0x44, 0x15, 0x71, 0xf2, 0x73, 0x15, 0x71, | 1278 | 0xf8, 0x44, 0x15, 0x71, 0xf2, 0x73, 0x15, 0x71, |
1279 | 0xf4, 0x95, 0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, | 1279 | 0xf4, 0x95, 0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, |
1280 | 0x10, 0x81, 0xf0, 0x00, 0x00, 0x09, 0x88, 0x11, | 1280 | 0x10, 0x81, 0xf0, 0x00, 0x00, 0x09, 0x88, 0x11, |
1281 | 0xf4, 0x95, 0x77, 0x12, 0x00, 0x06, 0x10, 0x81, | 1281 | 0xf4, 0x95, 0x77, 0x12, 0x00, 0x06, 0x10, 0x81, |
1282 | 0xf8, 0x45, 0x15, 0x5c, 0x6e, 0xea, 0xff, 0xff, | 1282 | 0xf8, 0x45, 0x15, 0x5c, 0x6e, 0xea, 0xff, 0xff, |
1283 | 0x15, 0x69, 0x6d, 0xe9, 0x00, 0x08, 0x76, 0x86, | 1283 | 0x15, 0x69, 0x6d, 0xe9, 0x00, 0x08, 0x76, 0x86, |
1284 | 0x00, 0x01, 0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, | 1284 | 0x00, 0x01, 0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, |
1285 | 0x10, 0xf8, 0x00, 0x0b, 0xf8, 0x45, 0x15, 0x7e, | 1285 | 0x10, 0xf8, 0x00, 0x0b, 0xf8, 0x45, 0x15, 0x7e, |
1286 | 0xfb, 0x80, 0x15, 0x85, 0xf4, 0x95, 0x48, 0x16, | 1286 | 0xfb, 0x80, 0x15, 0x85, 0xf4, 0x95, 0x48, 0x16, |
1287 | 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x02, 0x48, 0x16, | 1287 | 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x02, 0x48, 0x16, |
1288 | 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, | 1288 | 0x8a, 0x16, 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, |
1289 | 0xee, 0xff, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, | 1289 | 0xee, 0xff, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, |
1290 | 0xf4, 0x95, 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, | 1290 | 0xf4, 0x95, 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, |
1291 | 0xf8, 0x30, 0x15, 0xc4, 0x10, 0xe1, 0x00, 0x03, | 1291 | 0xf8, 0x30, 0x15, 0xc4, 0x10, 0xe1, 0x00, 0x03, |
1292 | 0x77, 0x12, 0x00, 0x55, 0x80, 0x82, 0x77, 0x12, | 1292 | 0x77, 0x12, 0x00, 0x55, 0x80, 0x82, 0x77, 0x12, |
1293 | 0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, | 1293 | 0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, |
1294 | 0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, | 1294 | 0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, |
1295 | 0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, | 1295 | 0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, |
1296 | 0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, | 1296 | 0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x77, 0x12, |
1297 | 0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, | 1297 | 0x00, 0x56, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, |
1298 | 0x00, 0x02, 0xf0, 0x00, 0x00, 0x08, 0x32, 0xf8, | 1298 | 0x00, 0x02, 0xf0, 0x00, 0x00, 0x08, 0x32, 0xf8, |
1299 | 0x00, 0x08, 0x77, 0x12, 0x00, 0x54, 0xe8, 0x01, | 1299 | 0x00, 0x08, 0x77, 0x12, 0x00, 0x54, 0xe8, 0x01, |
1300 | 0xf4, 0x82, 0xf4, 0x93, 0x18, 0x82, 0x77, 0x12, | 1300 | 0xf4, 0x82, 0xf4, 0x93, 0x18, 0x82, 0x77, 0x12, |
1301 | 0x00, 0x54, 0xf0, 0x40, 0x00, 0x00, 0x80, 0x82, | 1301 | 0x00, 0x54, 0xf0, 0x40, 0x00, 0x00, 0x80, 0x82, |
1302 | 0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x76, | 1302 | 0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x76, |
1303 | 0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x66, | 1303 | 0x10, 0xe1, 0x00, 0x01, 0xf9, 0x80, 0x16, 0x66, |
1304 | 0xf0, 0x73, 0x16, 0x03, 0x77, 0x11, 0x00, 0x7b, | 1304 | 0xf0, 0x73, 0x16, 0x03, 0x77, 0x11, 0x00, 0x7b, |
1305 | 0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, 0x00, 0x07, | 1305 | 0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, 0x00, 0x07, |
1306 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, | 1306 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, |
1307 | 0x00, 0x09, 0xf9, 0x80, 0x15, 0x85, 0x77, 0x11, | 1307 | 0x00, 0x09, 0xf9, 0x80, 0x15, 0x85, 0x77, 0x11, |
1308 | 0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, | 1308 | 0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, |
1309 | 0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, | 1309 | 0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, |
1310 | 0x00, 0x08, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81, | 1310 | 0x00, 0x08, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81, |
1311 | 0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80, | 1311 | 0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80, |
1312 | 0x15, 0x85, 0xf0, 0x00, 0x00, 0x10, 0x77, 0x11, | 1312 | 0x15, 0x85, 0xf0, 0x00, 0x00, 0x10, 0x77, 0x11, |
1313 | 0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, | 1313 | 0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, |
1314 | 0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, | 1314 | 0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, |
1315 | 0x00, 0x18, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81, | 1315 | 0x00, 0x18, 0x77, 0x11, 0x00, 0x7b, 0x71, 0x81, |
1316 | 0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80, | 1316 | 0x00, 0x11, 0x10, 0xe1, 0x00, 0x09, 0xfb, 0x80, |
1317 | 0x15, 0x85, 0xf0, 0x00, 0x00, 0x20, 0x77, 0x11, | 1317 | 0x15, 0x85, 0xf0, 0x00, 0x00, 0x20, 0x77, 0x11, |
1318 | 0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, | 1318 | 0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x10, 0xe1, |
1319 | 0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, | 1319 | 0x00, 0x09, 0xfb, 0x80, 0x15, 0x85, 0xf0, 0x00, |
1320 | 0x00, 0x28, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, | 1320 | 0x00, 0x28, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, |
1321 | 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, | 1321 | 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, |
1322 | 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, | 1322 | 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, |
1323 | 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, | 1323 | 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, |
1324 | 0x16, 0x41, 0x77, 0x11, 0x00, 0x55, 0x76, 0x81, | 1324 | 0x16, 0x41, 0x77, 0x11, 0x00, 0x55, 0x76, 0x81, |
1325 | 0x00, 0x1e, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, | 1325 | 0x00, 0x1e, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, |
1326 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, | 1326 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, |
1327 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, | 1327 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, |
1328 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, | 1328 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, |
1329 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, | 1329 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, |
1330 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, | 1330 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, |
1331 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, | 1331 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, |
1332 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, | 1332 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, |
1333 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, | 1333 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0x76, 0x81, |
1334 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0xf2, 0x73, | 1334 | 0x00, 0x00, 0x77, 0x11, 0x00, 0x56, 0xf2, 0x73, |
1335 | 0x16, 0x4e, 0x76, 0x81, 0x00, 0x00, 0x77, 0x11, | 1335 | 0x16, 0x4e, 0x76, 0x81, 0x00, 0x00, 0x77, 0x11, |
1336 | 0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, | 1336 | 0x00, 0x7b, 0x71, 0x81, 0x00, 0x11, 0x71, 0xe1, |
1337 | 0x00, 0x07, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, | 1337 | 0x00, 0x07, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, |
1338 | 0x10, 0xe1, 0x00, 0x39, 0xf9, 0x80, 0x16, 0x08, | 1338 | 0x10, 0xe1, 0x00, 0x39, 0xf9, 0x80, 0x16, 0x08, |
1339 | 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, | 1339 | 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, |
1340 | 0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, | 1340 | 0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, |
1341 | 0x10, 0x81, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x11, | 1341 | 0x10, 0x81, 0xf0, 0x00, 0x00, 0x04, 0x88, 0x11, |
1342 | 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, | 1342 | 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, |
1343 | 0x16, 0x63, 0xf4, 0x95, 0xee, 0xff, 0x76, 0x81, | 1343 | 0x16, 0x63, 0xf4, 0x95, 0xee, 0xff, 0x76, 0x81, |
1344 | 0x00, 0x01, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4, | 1344 | 0x00, 0x01, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4, |
1345 | 0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8, | 1345 | 0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8, |
1346 | 0x00, 0x08, 0xee, 0xff, 0x77, 0x11, 0x00, 0x01, | 1346 | 0x00, 0x08, 0xee, 0xff, 0x77, 0x11, 0x00, 0x01, |
1347 | 0xe8, 0x01, 0xee, 0x01, 0xf4, 0x82, 0x1a, 0x81, | 1347 | 0xe8, 0x01, 0xee, 0x01, 0xf4, 0x82, 0x1a, 0x81, |
1348 | 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, | 1348 | 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, |
1349 | 0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8, | 1349 | 0xf0, 0x10, 0x00, 0x10, 0x4a, 0x11, 0x32, 0xf8, |
1350 | 0x00, 0x08, 0xee, 0xff, 0xe8, 0x01, 0x77, 0x11, | 1350 | 0x00, 0x08, 0xee, 0xff, 0xe8, 0x01, 0x77, 0x11, |
1351 | 0x00, 0x00, 0xf4, 0x82, 0xee, 0x01, 0xf4, 0x93, | 1351 | 0x00, 0x00, 0xf4, 0x82, 0xee, 0x01, 0xf4, 0x93, |
1352 | 0x18, 0x81, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, | 1352 | 0x18, 0x81, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, |
1353 | 0xf4, 0xe4, 0x4a, 0x11, 0xf0, 0x10, 0x00, 0x10, | 1353 | 0xf4, 0xe4, 0x4a, 0x11, 0xf0, 0x10, 0x00, 0x10, |
1354 | 0x77, 0x11, 0x00, 0x00, 0x32, 0xf8, 0x00, 0x08, | 1354 | 0x77, 0x11, 0x00, 0x00, 0x32, 0xf8, 0x00, 0x08, |
1355 | 0xee, 0xff, 0x11, 0x81, 0xe8, 0x01, 0xee, 0x01, | 1355 | 0xee, 0xff, 0x11, 0x81, 0xe8, 0x01, 0xee, 0x01, |
1356 | 0x77, 0x11, 0x00, 0x00, 0xf4, 0x82, 0xf2, 0xa0, | 1356 | 0x77, 0x11, 0x00, 0x00, 0xf4, 0x82, 0xf2, 0xa0, |
1357 | 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, | 1357 | 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, |
1358 | 0xf2, 0x73, 0x16, 0x9e, 0xf6, 0xbb, 0xf4, 0x95, | 1358 | 0xf2, 0x73, 0x16, 0x9e, 0xf6, 0xbb, 0xf4, 0x95, |
1359 | 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4, | 1359 | 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4, |
1360 | 0xf2, 0x73, 0x16, 0xa6, 0xf7, 0xbb, 0xf4, 0x95, | 1360 | 0xf2, 0x73, 0x16, 0xa6, 0xf7, 0xbb, 0xf4, 0x95, |
1361 | 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4, | 1361 | 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0x95, 0xf4, 0xe4, |
1362 | 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 0x71, 0x04, | 1362 | 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, 0x71, 0x04, |
1363 | 0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, | 1363 | 0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, |
1364 | 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1364 | 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1365 | 0x76, 0x82, 0x00, 0x0e, 0x10, 0xe6, 0x00, 0x0e, | 1365 | 0x76, 0x82, 0x00, 0x0e, 0x10, 0xe6, 0x00, 0x0e, |
1366 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, | 1366 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, |
1367 | 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, | 1367 | 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, |
1368 | 0x00, 0x0d, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, | 1368 | 0x00, 0x0d, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, |
1369 | 0x10, 0xe6, 0x00, 0x0d, 0x80, 0x82, 0x71, 0xe1, | 1369 | 0x10, 0xe6, 0x00, 0x0d, 0x80, 0x82, 0x71, 0xe1, |
1370 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0c, | 1370 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0c, |
1371 | 0x10, 0xe6, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06, | 1371 | 0x10, 0xe6, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06, |
1372 | 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, | 1372 | 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, |
1373 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, 0x10, 0xe6, | 1373 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, 0x10, 0xe6, |
1374 | 0x00, 0x0b, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, | 1374 | 0x00, 0x0b, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, |
1375 | 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1375 | 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1376 | 0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06, | 1376 | 0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06, |
1377 | 0x00, 0x12, 0x10, 0xe6, 0x00, 0x0a, 0x80, 0x82, | 1377 | 0x00, 0x12, 0x10, 0xe6, 0x00, 0x0a, 0x80, 0x82, |
1378 | 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, | 1378 | 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, |
1379 | 0x00, 0x09, 0x10, 0xe6, 0x00, 0x09, 0x71, 0xe1, | 1379 | 0x00, 0x09, 0x10, 0xe6, 0x00, 0x09, 0x71, 0xe1, |
1380 | 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, | 1380 | 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, |
1381 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x08, | 1381 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x08, |
1382 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, | 1382 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, |
1383 | 0x00, 0x08, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, | 1383 | 0x00, 0x08, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, |
1384 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x07, 0x10, 0xe6, | 1384 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x07, 0x10, 0xe6, |
1385 | 0x00, 0x07, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, | 1385 | 0x00, 0x07, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, |
1386 | 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1386 | 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1387 | 0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06, | 1387 | 0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06, |
1388 | 0x00, 0x12, 0x10, 0xe6, 0x00, 0x06, 0x80, 0x82, | 1388 | 0x00, 0x12, 0x10, 0xe6, 0x00, 0x06, 0x80, 0x82, |
1389 | 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, | 1389 | 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, |
1390 | 0x00, 0x05, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, | 1390 | 0x00, 0x05, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, |
1391 | 0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, 0x71, 0xe1, | 1391 | 0x10, 0xe6, 0x00, 0x05, 0x80, 0x82, 0x71, 0xe1, |
1392 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x04, | 1392 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x04, |
1393 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, | 1393 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, |
1394 | 0x00, 0x04, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, | 1394 | 0x00, 0x04, 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, |
1395 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x03, 0x71, 0xe1, | 1395 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x03, 0x71, 0xe1, |
1396 | 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 0x00, 0x03, | 1396 | 0x00, 0x06, 0x00, 0x12, 0x10, 0xe6, 0x00, 0x03, |
1397 | 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1397 | 0x80, 0x82, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1398 | 0x76, 0x82, 0x00, 0x02, 0x10, 0xe6, 0x00, 0x02, | 1398 | 0x76, 0x82, 0x00, 0x02, 0x10, 0xe6, 0x00, 0x02, |
1399 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, | 1399 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, |
1400 | 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, | 1400 | 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, |
1401 | 0x00, 0x01, 0x10, 0xe6, 0x00, 0x01, 0x71, 0xe1, | 1401 | 0x00, 0x01, 0x10, 0xe6, 0x00, 0x01, 0x71, 0xe1, |
1402 | 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, | 1402 | 0x00, 0x06, 0x00, 0x12, 0x80, 0x82, 0x71, 0xe1, |
1403 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, | 1403 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, |
1404 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x13, 0xe7, 0x62, | 1404 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x13, 0xe7, 0x62, |
1405 | 0xe5, 0x01, 0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, | 1405 | 0xe5, 0x01, 0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, |
1406 | 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, | 1406 | 0x8a, 0x11, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, |
1407 | 0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, | 1407 | 0xf4, 0x95, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, |
1408 | 0x00, 0x12, 0xee, 0xff, 0x76, 0x82, 0x00, 0x00, | 1408 | 0x00, 0x12, 0xee, 0xff, 0x76, 0x82, 0x00, 0x00, |
1409 | 0xee, 0x01, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, | 1409 | 0xee, 0x01, 0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, |
1410 | 0x69, 0x81, 0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, | 1410 | 0x69, 0x81, 0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, |
1411 | 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95, | 1411 | 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xf4, 0x95, |
1412 | 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1412 | 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1413 | 0xee, 0xff, 0x76, 0x82, 0x00, 0x01, 0xee, 0x01, | 1413 | 0xee, 0xff, 0x76, 0x82, 0x00, 0x01, 0xee, 0x01, |
1414 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, 0x69, 0x81, | 1414 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x11, 0x69, 0x81, |
1415 | 0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, | 1415 | 0x00, 0x01, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, |
1416 | 0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, | 1416 | 0x4a, 0x11, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, |
1417 | 0xf0, 0x00, 0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, | 1417 | 0xf0, 0x00, 0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, |
1418 | 0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, 0x17, 0x9c, | 1418 | 0xf4, 0x95, 0x10, 0x81, 0xfa, 0x44, 0x17, 0x9c, |
1419 | 0xf4, 0x95, 0xee, 0xff, 0xf9, 0x80, 0x16, 0x53, | 1419 | 0xf4, 0x95, 0xee, 0xff, 0xf9, 0x80, 0x16, 0x53, |
1420 | 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, | 1420 | 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, |
1421 | 0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, | 1421 | 0x00, 0x94, 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, |
1422 | 0x76, 0x81, 0x00, 0x01, 0xee, 0x01, 0x76, 0xe1, | 1422 | 0x76, 0x81, 0x00, 0x01, 0xee, 0x01, 0x76, 0xe1, |
1423 | 0x00, 0x01, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, | 1423 | 0x00, 0x01, 0x00, 0x00, 0x76, 0xe1, 0x00, 0x02, |
1424 | 0x00, 0x21, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x20, | 1424 | 0x00, 0x21, 0x76, 0xe1, 0x00, 0x03, 0x00, 0x20, |
1425 | 0x76, 0xe1, 0x00, 0x04, 0x00, 0x23, 0x76, 0xe1, | 1425 | 0x76, 0xe1, 0x00, 0x04, 0x00, 0x23, 0x76, 0xe1, |
1426 | 0x00, 0x05, 0x00, 0x22, 0x76, 0xe1, 0x00, 0x06, | 1426 | 0x00, 0x05, 0x00, 0x22, 0x76, 0xe1, 0x00, 0x06, |
1427 | 0x00, 0x38, 0x76, 0xe1, 0x00, 0x07, 0x00, 0x39, | 1427 | 0x00, 0x38, 0x76, 0xe1, 0x00, 0x07, 0x00, 0x39, |
1428 | 0x76, 0xe1, 0x00, 0x08, 0x00, 0x15, 0x76, 0xe1, | 1428 | 0x76, 0xe1, 0x00, 0x08, 0x00, 0x15, 0x76, 0xe1, |
1429 | 0x00, 0x09, 0x00, 0x14, 0x76, 0xe1, 0x00, 0x0a, | 1429 | 0x00, 0x09, 0x00, 0x14, 0x76, 0xe1, 0x00, 0x0a, |
1430 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x41, | 1430 | 0x00, 0x00, 0x76, 0xe1, 0x00, 0x0b, 0x00, 0x41, |
1431 | 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x40, 0x76, 0xe1, | 1431 | 0x76, 0xe1, 0x00, 0x0c, 0x00, 0x40, 0x76, 0xe1, |
1432 | 0x00, 0x0d, 0x00, 0x43, 0x76, 0xe1, 0x00, 0x0e, | 1432 | 0x00, 0x0d, 0x00, 0x43, 0x76, 0xe1, 0x00, 0x0e, |
1433 | 0x00, 0x42, 0x76, 0xe1, 0x00, 0x0f, 0x00, 0x48, | 1433 | 0x00, 0x42, 0x76, 0xe1, 0x00, 0x0f, 0x00, 0x48, |
1434 | 0x76, 0xe1, 0x00, 0x10, 0x00, 0x49, 0x76, 0xe1, | 1434 | 0x76, 0xe1, 0x00, 0x10, 0x00, 0x49, 0x76, 0xe1, |
1435 | 0x00, 0x11, 0x00, 0x1b, 0x76, 0xe1, 0x00, 0x12, | 1435 | 0x00, 0x11, 0x00, 0x1b, 0x76, 0xe1, 0x00, 0x12, |
1436 | 0x00, 0x1a, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, | 1436 | 0x00, 0x1a, 0x8a, 0x11, 0xf4, 0x95, 0xf4, 0xe4, |
1437 | 0x4a, 0x11, 0xee, 0xfd, 0x88, 0x11, 0x56, 0x06, | 1437 | 0x4a, 0x11, 0xee, 0xfd, 0x88, 0x11, 0x56, 0x06, |
1438 | 0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, 0x77, 0x12, | 1438 | 0x4e, 0x00, 0xf9, 0x80, 0x16, 0xa2, 0x77, 0x12, |
1439 | 0x00, 0x7b, 0x77, 0x0e, 0x00, 0x09, 0x10, 0x82, | 1439 | 0x00, 0x7b, 0x77, 0x0e, 0x00, 0x09, 0x10, 0x82, |
1440 | 0x28, 0xf8, 0x00, 0x11, 0xf0, 0x00, 0x00, 0x95, | 1440 | 0x28, 0xf8, 0x00, 0x11, 0xf0, 0x00, 0x00, 0x95, |
1441 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, | 1441 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, |
1442 | 0xf8, 0x45, 0x17, 0xf0, 0xf2, 0x73, 0x17, 0xfd, | 1442 | 0xf8, 0x45, 0x17, 0xf0, 0xf2, 0x73, 0x17, 0xfd, |
1443 | 0x77, 0x11, 0xff, 0xff, 0x76, 0x81, 0x00, 0x01, | 1443 | 0x77, 0x11, 0xff, 0xff, 0x76, 0x81, 0x00, 0x01, |
1444 | 0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, 0x10, 0xf8, | 1444 | 0xe9, 0x01, 0x56, 0x00, 0xf1, 0x80, 0x10, 0xf8, |
1445 | 0x00, 0x0b, 0xf8, 0x45, 0x17, 0xfd, 0xfb, 0x80, | 1445 | 0x00, 0x0b, 0xf8, 0x45, 0x17, 0xfd, 0xfb, 0x80, |
1446 | 0x18, 0x10, 0xf4, 0x95, 0x48, 0x11, 0xf9, 0x80, | 1446 | 0x18, 0x10, 0xf4, 0x95, 0x48, 0x11, 0xf9, 0x80, |
1447 | 0x16, 0x9a, 0xee, 0x03, 0x48, 0x11, 0x8a, 0x11, | 1447 | 0x16, 0x9a, 0xee, 0x03, 0x48, 0x11, 0x8a, 0x11, |
1448 | 0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, | 1448 | 0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, |
1449 | 0xf4, 0x95, 0xee, 0xff, 0x71, 0xe1, 0x00, 0x01, | 1449 | 0xf4, 0x95, 0xee, 0xff, 0x71, 0xe1, 0x00, 0x01, |
1450 | 0x00, 0x11, 0xee, 0x01, 0x10, 0x81, 0x8a, 0x11, | 1450 | 0x00, 0x11, 0xee, 0x01, 0x10, 0x81, 0x8a, 0x11, |
1451 | 0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, | 1451 | 0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, |
1452 | 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, | 1452 | 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, |
1453 | 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, | 1453 | 0x77, 0x10, 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, |
1454 | 0x18, 0xc3, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1454 | 0x18, 0xc3, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1455 | 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 0x00, 0x06, | 1455 | 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, 0x00, 0x06, |
1456 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, | 1456 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, |
1457 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x01, | 1457 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x01, |
1458 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, | 1458 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, |
1459 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1459 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1460 | 0x76, 0x82, 0x00, 0x02, 0x71, 0xe1, 0x00, 0x06, | 1460 | 0x76, 0x82, 0x00, 0x02, 0x71, 0xe1, 0x00, 0x06, |
1461 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, | 1461 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, |
1462 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x03, | 1462 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x03, |
1463 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, | 1463 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, |
1464 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1464 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1465 | 0x76, 0x82, 0x00, 0x04, 0x71, 0xe1, 0x00, 0x06, | 1465 | 0x76, 0x82, 0x00, 0x04, 0x71, 0xe1, 0x00, 0x06, |
1466 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, | 1466 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, |
1467 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x05, | 1467 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x05, |
1468 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, | 1468 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, |
1469 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1469 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1470 | 0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06, | 1470 | 0x76, 0x82, 0x00, 0x06, 0x71, 0xe1, 0x00, 0x06, |
1471 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x01, 0x71, 0xe1, | 1471 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x01, 0x71, 0xe1, |
1472 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x07, | 1472 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x07, |
1473 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, | 1473 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, |
1474 | 0x20, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1474 | 0x20, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1475 | 0x76, 0x82, 0x00, 0x08, 0x71, 0xe1, 0x00, 0x06, | 1475 | 0x76, 0x82, 0x00, 0x08, 0x71, 0xe1, 0x00, 0x06, |
1476 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, | 1476 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, |
1477 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x09, | 1477 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x09, |
1478 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, | 1478 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, |
1479 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1479 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1480 | 0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06, | 1480 | 0x76, 0x82, 0x00, 0x0a, 0x71, 0xe1, 0x00, 0x06, |
1481 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, | 1481 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, |
1482 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, | 1482 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0b, |
1483 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, | 1483 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, |
1484 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1484 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1485 | 0x76, 0x82, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06, | 1485 | 0x76, 0x82, 0x00, 0x0c, 0x71, 0xe1, 0x00, 0x06, |
1486 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, | 1486 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x71, 0xe1, |
1487 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0d, | 1487 | 0x00, 0x05, 0x00, 0x12, 0x76, 0x82, 0x00, 0x0d, |
1488 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, | 1488 | 0x71, 0xe1, 0x00, 0x06, 0x00, 0x12, 0x76, 0x82, |
1489 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, | 1489 | 0x00, 0x00, 0x71, 0xe1, 0x00, 0x05, 0x00, 0x12, |
1490 | 0x76, 0x82, 0x00, 0x0e, 0x71, 0xe1, 0x00, 0x06, | 1490 | 0x76, 0x82, 0x00, 0x0e, 0x71, 0xe1, 0x00, 0x06, |
1491 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, | 1491 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x00, 0x10, 0xe1, |
1492 | 0x00, 0x07, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1, | 1492 | 0x00, 0x07, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1, |
1493 | 0x00, 0x08, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1, | 1493 | 0x00, 0x08, 0xf9, 0x80, 0x16, 0x76, 0x10, 0xe1, |
1494 | 0x00, 0x07, 0xf9, 0x80, 0x16, 0x66, 0x10, 0xe1, | 1494 | 0x00, 0x07, 0xf9, 0x80, 0x16, 0x66, 0x10, 0xe1, |
1495 | 0x00, 0x08, 0xf9, 0x80, 0x16, 0x66, 0xf0, 0x73, | 1495 | 0x00, 0x08, 0xf9, 0x80, 0x16, 0x66, 0xf0, 0x73, |
1496 | 0x18, 0xd1, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, | 1496 | 0x18, 0xd1, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, |
1497 | 0xfb, 0x80, 0x18, 0x10, 0xf0, 0x00, 0x00, 0x95, | 1497 | 0xfb, 0x80, 0x18, 0x10, 0xf0, 0x00, 0x00, 0x95, |
1498 | 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xfb, 0x80, | 1498 | 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, 0xfb, 0x80, |
1499 | 0x18, 0x10, 0xf0, 0x00, 0x00, 0x9e, 0xf9, 0x80, | 1499 | 0x18, 0x10, 0xf0, 0x00, 0x00, 0x9e, 0xf9, 0x80, |
1500 | 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4, | 1500 | 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, 0xf4, 0xe4, |
1501 | 0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, 0xf4, 0x95, | 1501 | 0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, 0xf4, 0x95, |
1502 | 0x10, 0x04, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x11, | 1502 | 0x10, 0x04, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x11, |
1503 | 0xee, 0x01, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, | 1503 | 0xee, 0x01, 0x80, 0x81, 0x8a, 0x11, 0xf4, 0x95, |
1504 | 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, | 1504 | 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, 0xf4, 0x95, |
1505 | 0x71, 0x04, 0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, | 1505 | 0x71, 0x04, 0x00, 0x16, 0xfb, 0x80, 0x16, 0xa2, |
1506 | 0x88, 0x11, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x02, | 1506 | 0x88, 0x11, 0xf4, 0x95, 0x71, 0xe1, 0x00, 0x02, |
1507 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x10, 0x10, 0xe6, | 1507 | 0x00, 0x12, 0x76, 0x82, 0x00, 0x10, 0x10, 0xe6, |
1508 | 0x00, 0x01, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, | 1508 | 0x00, 0x01, 0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, |
1509 | 0x80, 0x82, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12, | 1509 | 0x80, 0x82, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12, |
1510 | 0x10, 0xe6, 0x00, 0x02, 0x80, 0x82, 0xe7, 0x62, | 1510 | 0x10, 0xe6, 0x00, 0x02, 0x80, 0x82, 0xe7, 0x62, |
1511 | 0x71, 0xe1, 0x00, 0x02, 0x00, 0x13, 0xe5, 0x01, | 1511 | 0x71, 0xe1, 0x00, 0x02, 0x00, 0x13, 0xe5, 0x01, |
1512 | 0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, | 1512 | 0xf9, 0x80, 0x16, 0x9a, 0x8a, 0x16, 0x8a, 0x11, |
1513 | 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, | 1513 | 0xf4, 0xe4, 0x4a, 0x11, 0x88, 0x11, 0xee, 0xff, |
1514 | 0xee, 0x01, 0x10, 0xe1, 0x00, 0x01, 0x8a, 0x11, | 1514 | 0xee, 0x01, 0x10, 0xe1, 0x00, 0x01, 0x8a, 0x11, |
1515 | 0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, | 1515 | 0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x77, 0x11, |
1516 | 0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, | 1516 | 0x00, 0x7b, 0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, |
1517 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, | 1517 | 0x88, 0x11, 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, |
1518 | 0xfa, 0x44, 0x19, 0x2a, 0xf4, 0x95, 0xee, 0xff, | 1518 | 0xfa, 0x44, 0x19, 0x2a, 0xf4, 0x95, 0xee, 0xff, |
1519 | 0xf9, 0x80, 0x16, 0x53, 0x77, 0x11, 0x00, 0x7b, | 1519 | 0xf9, 0x80, 0x16, 0x53, 0x77, 0x11, 0x00, 0x7b, |
1520 | 0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, 0x88, 0x11, | 1520 | 0x10, 0x81, 0xf0, 0x00, 0x00, 0xb3, 0x88, 0x11, |
1521 | 0xf4, 0x95, 0xf4, 0x95, 0x76, 0x81, 0x00, 0x01, | 1521 | 0xf4, 0x95, 0xf4, 0x95, 0x76, 0x81, 0x00, 0x01, |
1522 | 0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, 0x00, 0x00, | 1522 | 0xee, 0x01, 0x76, 0xe1, 0x00, 0x01, 0x00, 0x00, |
1523 | 0x76, 0xe1, 0x00, 0x02, 0x00, 0x13, 0x76, 0xe1, | 1523 | 0x76, 0xe1, 0x00, 0x02, 0x00, 0x13, 0x76, 0xe1, |
1524 | 0x00, 0x03, 0x00, 0x26, 0x76, 0xe1, 0x00, 0x04, | 1524 | 0x00, 0x03, 0x00, 0x26, 0x76, 0xe1, 0x00, 0x04, |
1525 | 0x00, 0x25, 0x76, 0xe1, 0x00, 0x05, 0x00, 0x24, | 1525 | 0x00, 0x25, 0x76, 0xe1, 0x00, 0x05, 0x00, 0x24, |
1526 | 0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1, | 1526 | 0x76, 0xe1, 0x00, 0x06, 0x00, 0x00, 0x76, 0xe1, |
1527 | 0x00, 0x07, 0x00, 0x17, 0x76, 0xe1, 0x00, 0x08, | 1527 | 0x00, 0x07, 0x00, 0x17, 0x76, 0xe1, 0x00, 0x08, |
1528 | 0x00, 0x32, 0x76, 0xe1, 0x00, 0x09, 0x00, 0x31, | 1528 | 0x00, 0x32, 0x76, 0xe1, 0x00, 0x09, 0x00, 0x31, |
1529 | 0x76, 0xe1, 0x00, 0x0a, 0x00, 0x30, 0x8a, 0x11, | 1529 | 0x76, 0xe1, 0x00, 0x0a, 0x00, 0x30, 0x8a, 0x11, |
1530 | 0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, | 1530 | 0xf4, 0x95, 0xf4, 0xe4, 0x4a, 0x11, 0x4a, 0x16, |
1531 | 0x4a, 0x17, 0xee, 0xff, 0xf4, 0x95, 0x71, 0x06, | 1531 | 0x4a, 0x17, 0xee, 0xff, 0xf4, 0x95, 0x71, 0x06, |
1532 | 0x00, 0x17, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, | 1532 | 0x00, 0x17, 0xfb, 0x80, 0x16, 0xa2, 0x88, 0x11, |
1533 | 0xf4, 0x95, 0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, | 1533 | 0xf4, 0x95, 0xf7, 0xb8, 0x10, 0xf8, 0x00, 0x11, |
1534 | 0xf0, 0x10, 0xff, 0xff, 0xfa, 0x45, 0x19, 0x73, | 1534 | 0xf0, 0x10, 0xff, 0xff, 0xfa, 0x45, 0x19, 0x73, |
1535 | 0x77, 0x16, 0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, | 1535 | 0x77, 0x16, 0xff, 0xff, 0x77, 0x12, 0x00, 0x7b, |
1536 | 0x77, 0x0e, 0x00, 0x05, 0x10, 0x82, 0x28, 0xf8, | 1536 | 0x77, 0x0e, 0x00, 0x05, 0x10, 0x82, 0x28, 0xf8, |
1537 | 0x00, 0x11, 0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, | 1537 | 0x00, 0x11, 0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, |
1538 | 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf8, 0x44, | 1538 | 0xf4, 0x95, 0xf4, 0x95, 0x10, 0x81, 0xf8, 0x44, |
1539 | 0x19, 0x84, 0xf2, 0x73, 0x19, 0x84, 0xf4, 0x95, | 1539 | 0x19, 0x84, 0xf2, 0x73, 0x19, 0x84, 0xf4, 0x95, |
1540 | 0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, | 1540 | 0xe7, 0x16, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, |
1541 | 0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, 0xf4, 0x95, | 1541 | 0xf0, 0x00, 0x00, 0xb4, 0x88, 0x11, 0xf4, 0x95, |
1542 | 0x77, 0x12, 0x00, 0x02, 0x10, 0x81, 0xf8, 0x45, | 1542 | 0x77, 0x12, 0x00, 0x02, 0x10, 0x81, 0xf8, 0x45, |
1543 | 0x19, 0x6f, 0x6e, 0xea, 0xff, 0xff, 0x19, 0x7c, | 1543 | 0x19, 0x6f, 0x6e, 0xea, 0xff, 0xff, 0x19, 0x7c, |
1544 | 0x6d, 0xe9, 0x00, 0x05, 0x61, 0xf8, 0x00, 0x17, | 1544 | 0x6d, 0xe9, 0x00, 0x05, 0x61, 0xf8, 0x00, 0x17, |
1545 | 0x00, 0x01, 0xfa, 0x20, 0x19, 0x8f, 0x76, 0x86, | 1545 | 0x00, 0x01, 0xfa, 0x20, 0x19, 0x8f, 0x76, 0x86, |
1546 | 0x00, 0x01, 0xfb, 0x80, 0x19, 0x97, 0xf4, 0x95, | 1546 | 0x00, 0x01, 0xfb, 0x80, 0x19, 0x97, 0xf4, 0x95, |
1547 | 0x48, 0x16, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, | 1547 | 0x48, 0x16, 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, |
1548 | 0x8a, 0x17, 0x48, 0x16, 0x8a, 0x16, 0x8a, 0x11, | 1548 | 0x8a, 0x17, 0x48, 0x16, 0x8a, 0x16, 0x8a, 0x11, |
1549 | 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 0xfb, 0x80, | 1549 | 0xf4, 0xe4, 0x4a, 0x11, 0xee, 0xff, 0xfb, 0x80, |
1550 | 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, | 1550 | 0x16, 0xa2, 0x88, 0x11, 0xf4, 0x95, 0x77, 0x10, |
1551 | 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 0x19, 0xcc, | 1551 | 0xff, 0xff, 0xf4, 0xa9, 0xf8, 0x30, 0x19, 0xcc, |
1552 | 0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, 0x69, 0x82, | 1552 | 0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, 0x69, 0x82, |
1553 | 0x00, 0x10, 0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, | 1553 | 0x00, 0x10, 0x71, 0xe1, 0x00, 0x02, 0x00, 0x12, |
1554 | 0x68, 0x82, 0xf7, 0xff, 0x71, 0xe1, 0x00, 0x02, | 1554 | 0x68, 0x82, 0xf7, 0xff, 0x71, 0xe1, 0x00, 0x02, |
1555 | 0x00, 0x12, 0x68, 0x82, 0xfb, 0xff, 0x71, 0xe1, | 1555 | 0x00, 0x12, 0x68, 0x82, 0xfb, 0xff, 0x71, 0xe1, |
1556 | 0x00, 0x02, 0x00, 0x12, 0x68, 0x82, 0xff, 0xf0, | 1556 | 0x00, 0x02, 0x00, 0x12, 0x68, 0x82, 0xff, 0xf0, |
1557 | 0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, 0x76, 0x82, | 1557 | 0x71, 0xe1, 0x00, 0x03, 0x00, 0x12, 0x76, 0x82, |
1558 | 0xff, 0xff, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12, | 1558 | 0xff, 0xff, 0x71, 0xe1, 0x00, 0x04, 0x00, 0x12, |
1559 | 0x76, 0x82, 0xff, 0xff, 0x71, 0xe1, 0x00, 0x02, | 1559 | 0x76, 0x82, 0xff, 0xff, 0x71, 0xe1, 0x00, 0x02, |
1560 | 0x00, 0x12, 0x69, 0x82, 0x00, 0x20, 0x71, 0xe1, | 1560 | 0x00, 0x12, 0x69, 0x82, 0x00, 0x20, 0x71, 0xe1, |
1561 | 0x00, 0x02, 0x00, 0x11, 0xf2, 0x73, 0x19, 0xda, | 1561 | 0x00, 0x02, 0x00, 0x11, 0xf2, 0x73, 0x19, 0xda, |
1562 | 0x68, 0x81, 0xff, 0xef, 0x77, 0x11, 0x00, 0x7b, | 1562 | 0x68, 0x81, 0xff, 0xef, 0x77, 0x11, 0x00, 0x7b, |
1563 | 0x10, 0x81, 0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, | 1563 | 0x10, 0x81, 0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, |
1564 | 0x00, 0xb4, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, | 1564 | 0x00, 0xb4, 0x77, 0x11, 0x00, 0x7b, 0x10, 0x81, |
1565 | 0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, 0x00, 0xb9, | 1565 | 0xfb, 0x80, 0x19, 0x97, 0xf0, 0x00, 0x00, 0xb9, |
1566 | 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, | 1566 | 0xf9, 0x80, 0x16, 0x9a, 0xee, 0x01, 0x8a, 0x11, |
1567 | 0xf4, 0xe4, 0x00, 0xa4, 0x00, 0x00, 0x19, 0xdf, | 1567 | 0xf4, 0xe4, 0x00, 0xa4, 0x00, 0x00, 0x19, 0xdf, |
1568 | 0x00, 0x01, 0x2a, 0xe6, 0x00, 0x00, 0x00, 0x01, | 1568 | 0x00, 0x01, 0x2a, 0xe6, 0x00, 0x00, 0x00, 0x01, |
1569 | 0x2a, 0xe7, 0x00, 0x00, 0x00, 0x03, 0x2a, 0x12, | 1569 | 0x2a, 0xe7, 0x00, 0x00, 0x00, 0x03, 0x2a, 0x12, |
1570 | 0x0c, 0x01, 0xc3, 0x4f, 0x00, 0x00, 0x00, 0x01, | 1570 | 0x0c, 0x01, 0xc3, 0x4f, 0x00, 0x00, 0x00, 0x01, |
1571 | 0x2a, 0x15, 0x00, 0x00, 0x00, 0x02, 0x2a, 0x16, | 1571 | 0x2a, 0x15, 0x00, 0x00, 0x00, 0x02, 0x2a, 0x16, |
1572 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x2a, 0x5d, | 1572 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x19, 0x2a, 0x5d, |
1573 | 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, | 1573 | 0x00, 0x43, 0x00, 0x6f, 0x00, 0x70, 0x00, 0x79, |
1574 | 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, | 1574 | 0x00, 0x72, 0x00, 0x69, 0x00, 0x67, 0x00, 0x68, |
1575 | 0x00, 0x74, 0x00, 0x20, 0x00, 0x54, 0x00, 0x65, | 1575 | 0x00, 0x74, 0x00, 0x20, 0x00, 0x54, 0x00, 0x65, |
1576 | 0x00, 0x63, 0x00, 0x68, 0x00, 0x6e, 0x00, 0x6f, | 1576 | 0x00, 0x63, 0x00, 0x68, 0x00, 0x6e, 0x00, 0x6f, |
1577 | 0x00, 0x54, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, | 1577 | 0x00, 0x54, 0x00, 0x72, 0x00, 0x65, 0x00, 0x6e, |
1578 | 0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x47, | 1578 | 0x00, 0x64, 0x00, 0x20, 0x00, 0x41, 0x00, 0x47, |
1579 | 0x00, 0x00, 0x00, 0x04, 0x2a, 0x76, 0x00, 0x30, | 1579 | 0x00, 0x00, 0x00, 0x04, 0x2a, 0x76, 0x00, 0x30, |
1580 | 0x00, 0x2e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0c, | 1580 | 0x00, 0x2e, 0x00, 0x30, 0x00, 0x00, 0x00, 0x0c, |
1581 | 0x2a, 0x7a, 0x00, 0x46, 0x00, 0x65, 0x00, 0x62, | 1581 | 0x2a, 0x7a, 0x00, 0x46, 0x00, 0x65, 0x00, 0x62, |
1582 | 0x00, 0x20, 0x00, 0x32, 0x00, 0x37, 0x00, 0x20, | 1582 | 0x00, 0x20, 0x00, 0x32, 0x00, 0x37, 0x00, 0x20, |
1583 | 0x00, 0x32, 0x00, 0x30, 0x00, 0x30, 0x00, 0x31, | 1583 | 0x00, 0x32, 0x00, 0x30, 0x00, 0x30, 0x00, 0x31, |
1584 | 0x00, 0x00, 0x00, 0x09, 0x2a, 0x86, 0x00, 0x31, | 1584 | 0x00, 0x00, 0x00, 0x09, 0x2a, 0x86, 0x00, 0x31, |
1585 | 0x00, 0x34, 0x00, 0x3a, 0x00, 0x33, 0x00, 0x35, | 1585 | 0x00, 0x34, 0x00, 0x3a, 0x00, 0x33, 0x00, 0x35, |
1586 | 0x00, 0x3a, 0x00, 0x33, 0x00, 0x33, 0x00, 0x00, | 1586 | 0x00, 0x3a, 0x00, 0x33, 0x00, 0x33, 0x00, 0x00, |
1587 | 0x00, 0x0f, 0x2a, 0x8f, 0x00, 0x00, 0x00, 0x00, | 1587 | 0x00, 0x0f, 0x2a, 0x8f, 0x00, 0x00, 0x00, 0x00, |
1588 | 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, | 1588 | 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, |
1589 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 1589 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
1590 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 1590 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
1591 | 0x00, 0x00, 0x00, 0x01, 0x2a, 0x9e, 0x00, 0x00, | 1591 | 0x00, 0x00, 0x00, 0x01, 0x2a, 0x9e, 0x00, 0x00, |
1592 | 0x00, 0x01, 0x2a, 0x9f, 0x00, 0x00, 0x00, 0x01, | 1592 | 0x00, 0x01, 0x2a, 0x9f, 0x00, 0x00, 0x00, 0x01, |
1593 | 0x2a, 0xa0, 0x00, 0x00, 0x00, 0x01, 0x2a, 0xa1, | 1593 | 0x2a, 0xa0, 0x00, 0x00, 0x00, 0x01, 0x2a, 0xa1, |
1594 | 0x00, 0x00, 0x00, 0x01, 0x2a, 0xa2, 0x00, 0x00, | 1594 | 0x00, 0x00, 0x00, 0x01, 0x2a, 0xa2, 0x00, 0x00, |
1595 | 0x00, 0x01, 0x29, 0x7e, 0x00, 0x00, 0x00, 0x02, | 1595 | 0x00, 0x01, 0x29, 0x7e, 0x00, 0x00, 0x00, 0x02, |
1596 | 0x29, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, | 1596 | 0x29, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, |
1597 | 0x29, 0x82, 0xff, 0xff, 0x00, 0x01, 0x2a, 0xa7, | 1597 | 0x29, 0x82, 0xff, 0xff, 0x00, 0x01, 0x2a, 0xa7, |
1598 | 0x00, 0x00, 0x00, 0x05, 0x2a, 0xa8, 0x71, 0x41, | 1598 | 0x00, 0x00, 0x00, 0x05, 0x2a, 0xa8, 0x71, 0x41, |
1599 | 0x20, 0x00, 0x20, 0x00, 0x00, 0x23, 0x04, 0x00, | 1599 | 0x20, 0x00, 0x20, 0x00, 0x00, 0x23, 0x04, 0x00, |
1600 | 0x00, 0x0a, 0x2a, 0xad, 0x00, 0x00, 0x00, 0x00, | 1600 | 0x00, 0x0a, 0x2a, 0xad, 0x00, 0x00, 0x00, 0x00, |
1601 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 1601 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
1602 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 1602 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
1603 | 0x00, 0x0f, 0x2a, 0xb7, 0x00, 0x00, 0x00, 0x00, | 1603 | 0x00, 0x0f, 0x2a, 0xb7, 0x00, 0x00, 0x00, 0x00, |
1604 | 0x00, 0x00, 0x00, 0x40, 0x00, 0xa0, 0x82, 0x40, | 1604 | 0x00, 0x00, 0x00, 0x40, 0x00, 0xa0, 0x82, 0x40, |
1605 | 0x00, 0x08, 0x30, 0x7f, 0x00, 0x80, 0x01, 0x80, | 1605 | 0x00, 0x08, 0x30, 0x7f, 0x00, 0x80, 0x01, 0x80, |
1606 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, | 1606 | 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, |
1607 | 0x00, 0x00, 0x00, 0x01, 0x27, 0x6e, 0x00, 0x00, | 1607 | 0x00, 0x00, 0x00, 0x01, 0x27, 0x6e, 0x00, 0x00, |
1608 | 0x00, 0x01, 0x27, 0x6f, 0x00, 0x00, 0x00, 0x00, | 1608 | 0x00, 0x01, 0x27, 0x6f, 0x00, 0x00, 0x00, 0x00, |
1609 | 0x00, 0x09, 0x00, 0x00, 0x1a, 0x83, 0x04, 0xe8, | 1609 | 0x00, 0x09, 0x00, 0x00, 0x1a, 0x83, 0x04, 0xe8, |
1610 | 0x04, 0xcf, 0x04, 0xc5, 0x04, 0xba, 0x04, 0xb0, | 1610 | 0x04, 0xcf, 0x04, 0xc5, 0x04, 0xba, 0x04, 0xb0, |
1611 | 0x04, 0xac, 0x04, 0x9c, 0x04, 0x8c, 0x04, 0x81, | 1611 | 0x04, 0xac, 0x04, 0x9c, 0x04, 0x8c, 0x04, 0x81, |
1612 | 0x00, 0x78, 0x00, 0x00, 0x01, 0x00, 0xf2, 0x73, | 1612 | 0x00, 0x78, 0x00, 0x00, 0x01, 0x00, 0xf2, 0x73, |
1613 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1613 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1614 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1614 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1615 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1615 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1616 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1616 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1617 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1617 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1618 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1618 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1619 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1619 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1620 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1620 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1621 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1621 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1622 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1622 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1623 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1623 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1624 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1624 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1625 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1625 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1626 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1626 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1627 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1627 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1628 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1628 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1629 | 0x07, 0xaa, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1629 | 0x07, 0xaa, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1630 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1630 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1631 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1631 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1632 | 0x02, 0x23, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1632 | 0x02, 0x23, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1633 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1633 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1634 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1634 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1635 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1635 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1636 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1636 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1637 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1637 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1638 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1638 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1639 | 0x05, 0xe5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1639 | 0x05, 0xe5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1640 | 0x02, 0xb5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1640 | 0x02, 0xb5, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1641 | 0x0e, 0x33, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, | 1641 | 0x0e, 0x33, 0xf4, 0x95, 0xf4, 0x95, 0xf2, 0x73, |
1642 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0x00, 0x00, | 1642 | 0x07, 0xef, 0xf4, 0x95, 0xf4, 0x95, 0x00, 0x00, |
1643 | }; | 1643 | }; |
1644 | 1644 | ||
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c index 832d179f26fa..8abc21890129 100644 --- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c +++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c | |||
@@ -1203,7 +1203,7 @@ static int ttusb_init_rc(struct ttusb_dec *dec) | |||
1203 | input_dev->keycode = rc_keys; | 1203 | input_dev->keycode = rc_keys; |
1204 | 1204 | ||
1205 | for (i = 0; i < ARRAY_SIZE(rc_keys); i++) | 1205 | for (i = 0; i < ARRAY_SIZE(rc_keys); i++) |
1206 | set_bit(rc_keys[i], input_dev->keybit); | 1206 | set_bit(rc_keys[i], input_dev->keybit); |
1207 | 1207 | ||
1208 | input_register_device(input_dev); | 1208 | input_register_device(input_dev); |
1209 | 1209 | ||
@@ -1529,7 +1529,7 @@ static void ttusb_dec_exit_rc(struct ttusb_dec *dec) | |||
1529 | usb_free_urb(dec->irq_urb); | 1529 | usb_free_urb(dec->irq_urb); |
1530 | 1530 | ||
1531 | usb_buffer_free(dec->udev,IRQ_PACKET_SIZE, | 1531 | usb_buffer_free(dec->udev,IRQ_PACKET_SIZE, |
1532 | dec->irq_buffer, dec->irq_dma_handle); | 1532 | dec->irq_buffer, dec->irq_dma_handle); |
1533 | 1533 | ||
1534 | if (dec->rc_input_dev) { | 1534 | if (dec->rc_input_dev) { |
1535 | input_unregister_device(dec->rc_input_dev); | 1535 | input_unregister_device(dec->rc_input_dev); |
diff --git a/drivers/media/video/Kconfig b/drivers/media/video/Kconfig index cc4a723e24db..fc87efc5049c 100644 --- a/drivers/media/video/Kconfig +++ b/drivers/media/video/Kconfig | |||
@@ -188,7 +188,7 @@ config VIDEO_ZORAN | |||
188 | 188 | ||
189 | To compile this driver as a module, choose M here: the | 189 | To compile this driver as a module, choose M here: the |
190 | module will be called zr36067. | 190 | module will be called zr36067. |
191 | 191 | ||
192 | config VIDEO_ZORAN_BUZ | 192 | config VIDEO_ZORAN_BUZ |
193 | tristate "Iomega Buz support" | 193 | tristate "Iomega Buz support" |
194 | depends on VIDEO_ZORAN | 194 | depends on VIDEO_ZORAN |
@@ -204,8 +204,8 @@ config VIDEO_ZORAN_DC10 | |||
204 | 204 | ||
205 | config VIDEO_ZORAN_DC30 | 205 | config VIDEO_ZORAN_DC30 |
206 | tristate "Pinnacle/Miro DC30(+) support" | 206 | tristate "Pinnacle/Miro DC30(+) support" |
207 | depends on VIDEO_ZORAN | 207 | depends on VIDEO_ZORAN |
208 | help | 208 | help |
209 | Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback | 209 | Support for the Pinnacle/Miro DC30(+) MJPEG capture/playback |
210 | card. This also supports really old DC10 cards based on the | 210 | card. This also supports really old DC10 cards based on the |
211 | zr36050 MJPEG codec and zr36016 VFE. | 211 | zr36050 MJPEG codec and zr36016 VFE. |
@@ -260,7 +260,7 @@ config VIDEO_MXB | |||
260 | ---help--- | 260 | ---help--- |
261 | This is a video4linux driver for the 'Multimedia eXtension Board' | 261 | This is a video4linux driver for the 'Multimedia eXtension Board' |
262 | TV card by Siemens-Nixdorf. | 262 | TV card by Siemens-Nixdorf. |
263 | 263 | ||
264 | To compile this driver as a module, choose M here: the | 264 | To compile this driver as a module, choose M here: the |
265 | module will be called mxb. | 265 | module will be called mxb. |
266 | 266 | ||
@@ -274,7 +274,7 @@ config VIDEO_DPC | |||
274 | for SAA7146 bases boards, so if you have some unsupported | 274 | for SAA7146 bases boards, so if you have some unsupported |
275 | saa7146 based, analog video card, chances are good that it | 275 | saa7146 based, analog video card, chances are good that it |
276 | will work with this skeleton driver. | 276 | will work with this skeleton driver. |
277 | 277 | ||
278 | To compile this driver as a module, choose M here: the | 278 | To compile this driver as a module, choose M here: the |
279 | module will be called dpc7146. | 279 | module will be called dpc7146. |
280 | 280 | ||
@@ -285,7 +285,7 @@ config VIDEO_HEXIUM_ORION | |||
285 | ---help--- | 285 | ---help--- |
286 | This is a video4linux driver for the Hexium HV-PCI6 and | 286 | This is a video4linux driver for the Hexium HV-PCI6 and |
287 | Orion frame grabber cards by Hexium. | 287 | Orion frame grabber cards by Hexium. |
288 | 288 | ||
289 | To compile this driver as a module, choose M here: the | 289 | To compile this driver as a module, choose M here: the |
290 | module will be called hexium_orion. | 290 | module will be called hexium_orion. |
291 | 291 | ||
@@ -297,7 +297,7 @@ config VIDEO_HEXIUM_GEMINI | |||
297 | This is a video4linux driver for the Hexium Gemini frame | 297 | This is a video4linux driver for the Hexium Gemini frame |
298 | grabber card by Hexium. Please note that the Gemini Dual | 298 | grabber card by Hexium. Please note that the Gemini Dual |
299 | card is *not* fully supported. | 299 | card is *not* fully supported. |
300 | 300 | ||
301 | To compile this driver as a module, choose M here: the | 301 | To compile this driver as a module, choose M here: the |
302 | module will be called hexium_gemini. | 302 | module will be called hexium_gemini. |
303 | 303 | ||
diff --git a/drivers/media/video/bt832.c b/drivers/media/video/bt832.c index e4063950ae57..3ca1d768bfd3 100644 --- a/drivers/media/video/bt832.c +++ b/drivers/media/video/bt832.c | |||
@@ -231,18 +231,18 @@ bt832_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
231 | 231 | ||
232 | static struct i2c_driver driver = { | 232 | static struct i2c_driver driver = { |
233 | .owner = THIS_MODULE, | 233 | .owner = THIS_MODULE, |
234 | .name = "i2c bt832 driver", | 234 | .name = "i2c bt832 driver", |
235 | .id = -1, /* FIXME */ | 235 | .id = -1, /* FIXME */ |
236 | .flags = I2C_DF_NOTIFY, | 236 | .flags = I2C_DF_NOTIFY, |
237 | .attach_adapter = bt832_probe, | 237 | .attach_adapter = bt832_probe, |
238 | .detach_client = bt832_detach, | 238 | .detach_client = bt832_detach, |
239 | .command = bt832_command, | 239 | .command = bt832_command, |
240 | }; | 240 | }; |
241 | static struct i2c_client client_template = | 241 | static struct i2c_client client_template = |
242 | { | 242 | { |
243 | .name = "bt832", | 243 | .name = "bt832", |
244 | .flags = I2C_CLIENT_ALLOW_USE, | 244 | .flags = I2C_CLIENT_ALLOW_USE, |
245 | .driver = &driver, | 245 | .driver = &driver, |
246 | }; | 246 | }; |
247 | 247 | ||
248 | 248 | ||
diff --git a/drivers/media/video/bttv-driver.c b/drivers/media/video/bttv-driver.c index 3c58a2a68906..1ddf9ba613ef 100644 --- a/drivers/media/video/bttv-driver.c +++ b/drivers/media/video/bttv-driver.c | |||
@@ -727,71 +727,71 @@ void free_btres(struct bttv *btv, struct bttv_fh *fh, int bits) | |||
727 | 727 | ||
728 | static void set_pll_freq(struct bttv *btv, unsigned int fin, unsigned int fout) | 728 | static void set_pll_freq(struct bttv *btv, unsigned int fin, unsigned int fout) |
729 | { | 729 | { |
730 | unsigned char fl, fh, fi; | 730 | unsigned char fl, fh, fi; |
731 | 731 | ||
732 | /* prevent overflows */ | 732 | /* prevent overflows */ |
733 | fin/=4; | 733 | fin/=4; |
734 | fout/=4; | 734 | fout/=4; |
735 | 735 | ||
736 | fout*=12; | 736 | fout*=12; |
737 | fi=fout/fin; | 737 | fi=fout/fin; |
738 | 738 | ||
739 | fout=(fout%fin)*256; | 739 | fout=(fout%fin)*256; |
740 | fh=fout/fin; | 740 | fh=fout/fin; |
741 | 741 | ||
742 | fout=(fout%fin)*256; | 742 | fout=(fout%fin)*256; |
743 | fl=fout/fin; | 743 | fl=fout/fin; |
744 | 744 | ||
745 | btwrite(fl, BT848_PLL_F_LO); | 745 | btwrite(fl, BT848_PLL_F_LO); |
746 | btwrite(fh, BT848_PLL_F_HI); | 746 | btwrite(fh, BT848_PLL_F_HI); |
747 | btwrite(fi|BT848_PLL_X, BT848_PLL_XCI); | 747 | btwrite(fi|BT848_PLL_X, BT848_PLL_XCI); |
748 | } | 748 | } |
749 | 749 | ||
750 | static void set_pll(struct bttv *btv) | 750 | static void set_pll(struct bttv *btv) |
751 | { | 751 | { |
752 | int i; | 752 | int i; |
753 | 753 | ||
754 | if (!btv->pll.pll_crystal) | 754 | if (!btv->pll.pll_crystal) |
755 | return; | 755 | return; |
756 | 756 | ||
757 | if (btv->pll.pll_ofreq == btv->pll.pll_current) { | 757 | if (btv->pll.pll_ofreq == btv->pll.pll_current) { |
758 | dprintk("bttv%d: PLL: no change required\n",btv->c.nr); | 758 | dprintk("bttv%d: PLL: no change required\n",btv->c.nr); |
759 | return; | 759 | return; |
760 | } | 760 | } |
761 | 761 | ||
762 | if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) { | 762 | if (btv->pll.pll_ifreq == btv->pll.pll_ofreq) { |
763 | /* no PLL needed */ | 763 | /* no PLL needed */ |
764 | if (btv->pll.pll_current == 0) | 764 | if (btv->pll.pll_current == 0) |
765 | return; | 765 | return; |
766 | bttv_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n", | 766 | bttv_printk(KERN_INFO "bttv%d: PLL can sleep, using XTAL (%d).\n", |
767 | btv->c.nr,btv->pll.pll_ifreq); | 767 | btv->c.nr,btv->pll.pll_ifreq); |
768 | btwrite(0x00,BT848_TGCTRL); | 768 | btwrite(0x00,BT848_TGCTRL); |
769 | btwrite(0x00,BT848_PLL_XCI); | 769 | btwrite(0x00,BT848_PLL_XCI); |
770 | btv->pll.pll_current = 0; | 770 | btv->pll.pll_current = 0; |
771 | return; | 771 | return; |
772 | } | 772 | } |
773 | 773 | ||
774 | bttv_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr, | 774 | bttv_printk(KERN_INFO "bttv%d: PLL: %d => %d ",btv->c.nr, |
775 | btv->pll.pll_ifreq, btv->pll.pll_ofreq); | 775 | btv->pll.pll_ifreq, btv->pll.pll_ofreq); |
776 | set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq); | 776 | set_pll_freq(btv, btv->pll.pll_ifreq, btv->pll.pll_ofreq); |
777 | 777 | ||
778 | for (i=0; i<10; i++) { | 778 | for (i=0; i<10; i++) { |
779 | /* Let other people run while the PLL stabilizes */ | 779 | /* Let other people run while the PLL stabilizes */ |
780 | bttv_printk("."); | 780 | bttv_printk("."); |
781 | msleep(10); | 781 | msleep(10); |
782 | 782 | ||
783 | if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) { | 783 | if (btread(BT848_DSTATUS) & BT848_DSTATUS_PLOCK) { |
784 | btwrite(0,BT848_DSTATUS); | 784 | btwrite(0,BT848_DSTATUS); |
785 | } else { | 785 | } else { |
786 | btwrite(0x08,BT848_TGCTRL); | 786 | btwrite(0x08,BT848_TGCTRL); |
787 | btv->pll.pll_current = btv->pll.pll_ofreq; | 787 | btv->pll.pll_current = btv->pll.pll_ofreq; |
788 | bttv_printk(" ok\n"); | 788 | bttv_printk(" ok\n"); |
789 | return; | 789 | return; |
790 | } | 790 | } |
791 | } | 791 | } |
792 | btv->pll.pll_current = -1; | 792 | btv->pll.pll_current = -1; |
793 | bttv_printk("failed\n"); | 793 | bttv_printk("failed\n"); |
794 | return; | 794 | return; |
795 | } | 795 | } |
796 | 796 | ||
797 | /* used to switch between the bt848's analog/digital video capture modes */ | 797 | /* used to switch between the bt848's analog/digital video capture modes */ |
@@ -1964,7 +1964,7 @@ static int setup_window(struct bttv_fh *fh, struct bttv *btv, | |||
1964 | } | 1964 | } |
1965 | 1965 | ||
1966 | down(&fh->cap.lock); | 1966 | down(&fh->cap.lock); |
1967 | kfree(fh->ov.clips); | 1967 | kfree(fh->ov.clips); |
1968 | fh->ov.clips = clips; | 1968 | fh->ov.clips = clips; |
1969 | fh->ov.nclips = n; | 1969 | fh->ov.nclips = n; |
1970 | 1970 | ||
@@ -2758,7 +2758,7 @@ static int bttv_do_ioctl(struct inode *inode, struct file *file, | |||
2758 | fh->ov.w.height = fb->fmt.height; | 2758 | fh->ov.w.height = fb->fmt.height; |
2759 | btv->init.ov.w.width = fb->fmt.width; | 2759 | btv->init.ov.w.width = fb->fmt.width; |
2760 | btv->init.ov.w.height = fb->fmt.height; | 2760 | btv->init.ov.w.height = fb->fmt.height; |
2761 | kfree(fh->ov.clips); | 2761 | kfree(fh->ov.clips); |
2762 | fh->ov.clips = NULL; | 2762 | fh->ov.clips = NULL; |
2763 | fh->ov.nclips = 0; | 2763 | fh->ov.nclips = 0; |
2764 | 2764 | ||
diff --git a/drivers/media/video/bttvp.h b/drivers/media/video/bttvp.h index 3aa9c6e4fc33..1e6a5632c3c7 100644 --- a/drivers/media/video/bttvp.h +++ b/drivers/media/video/bttvp.h | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <media/tveeprom.h> | 45 | #include <media/tveeprom.h> |
46 | #include <media/ir-common.h> | 46 | #include <media/ir-common.h> |
47 | 47 | ||
48 | |||
48 | #include "bt848.h" | 49 | #include "bt848.h" |
49 | #include "bttv.h" | 50 | #include "bttv.h" |
50 | #include "btcx-risc.h" | 51 | #include "btcx-risc.h" |
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c index aea3f038cff6..5b93723a1768 100644 --- a/drivers/media/video/cx25840/cx25840-core.c +++ b/drivers/media/video/cx25840/cx25840-core.c | |||
@@ -333,24 +333,30 @@ static int set_input(struct i2c_client *client, enum cx25840_input input) | |||
333 | 333 | ||
334 | static int set_v4lstd(struct i2c_client *client, v4l2_std_id std) | 334 | static int set_v4lstd(struct i2c_client *client, v4l2_std_id std) |
335 | { | 335 | { |
336 | u8 fmt; | 336 | u8 fmt=0; /* zero is autodetect */ |
337 | 337 | ||
338 | switch (std) { | 338 | /* First tests should be against specific std */ |
339 | /* zero is autodetect */ | 339 | if (std & V4L2_STD_NTSC_M_JP) { |
340 | case 0: fmt = 0x0; break; | 340 | fmt=0x2; |
341 | /* default ntsc to ntsc-m */ | 341 | } else if (std & V4L2_STD_NTSC_443) { |
342 | case V4L2_STD_NTSC: | 342 | fmt=0x3; |
343 | case V4L2_STD_NTSC_M: fmt = 0x1; break; | 343 | } else if (std & V4L2_STD_PAL_M) { |
344 | case V4L2_STD_NTSC_M_JP: fmt = 0x2; break; | 344 | fmt=0x5; |
345 | case V4L2_STD_NTSC_443: fmt = 0x3; break; | 345 | } else if (std & V4L2_STD_PAL_N) { |
346 | case V4L2_STD_PAL: fmt = 0x4; break; | 346 | fmt=0x6; |
347 | case V4L2_STD_PAL_M: fmt = 0x5; break; | 347 | } else if (std & V4L2_STD_PAL_Nc) { |
348 | case V4L2_STD_PAL_N: fmt = 0x6; break; | 348 | fmt=0x7; |
349 | case V4L2_STD_PAL_Nc: fmt = 0x7; break; | 349 | } else if (std & V4L2_STD_PAL_60) { |
350 | case V4L2_STD_PAL_60: fmt = 0x8; break; | 350 | fmt=0x8; |
351 | case V4L2_STD_SECAM: fmt = 0xc; break; | 351 | } else { |
352 | default: | 352 | /* Then, test against generic ones */ |
353 | return -ERANGE; | 353 | if (std & V4L2_STD_NTSC) { |
354 | fmt=0x1; | ||
355 | } else if (std & V4L2_STD_PAL) { | ||
356 | fmt=0x4; | ||
357 | } else if (std & V4L2_STD_SECAM) { | ||
358 | fmt=0xc; | ||
359 | } | ||
354 | } | 360 | } |
355 | 361 | ||
356 | cx25840_and_or(client, 0x400, ~0xf, fmt); | 362 | cx25840_and_or(client, 0x400, ~0xf, fmt); |
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c index 4ae3f78cccf2..74e57a53116f 100644 --- a/drivers/media/video/cx88/cx88-blackbird.c +++ b/drivers/media/video/cx88/cx88-blackbird.c | |||
@@ -616,6 +616,8 @@ static int blackbird_load_firmware(struct cx8802_dev *dev) | |||
616 | 616 | ||
617 | retval = request_firmware(&firmware, BLACKBIRD_FIRM_ENC_FILENAME, | 617 | retval = request_firmware(&firmware, BLACKBIRD_FIRM_ENC_FILENAME, |
618 | &dev->pci->dev); | 618 | &dev->pci->dev); |
619 | |||
620 | |||
619 | if (retval != 0) { | 621 | if (retval != 0) { |
620 | dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n", | 622 | dprintk(0, "ERROR: Hotplug firmware request failed (%s).\n", |
621 | BLACKBIRD_FIRM_ENC_FILENAME); | 623 | BLACKBIRD_FIRM_ENC_FILENAME); |
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c index 38b12ebaa49e..461019dca901 100644 --- a/drivers/media/video/cx88/cx88-input.c +++ b/drivers/media/video/cx88/cx88-input.c | |||
@@ -453,7 +453,6 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci) | |||
453 | input_dev->id.product = pci->device; | 453 | input_dev->id.product = pci->device; |
454 | } | 454 | } |
455 | input_dev->cdev.dev = &pci->dev; | 455 | input_dev->cdev.dev = &pci->dev; |
456 | |||
457 | /* record handles to ourself */ | 456 | /* record handles to ourself */ |
458 | ir->core = core; | 457 | ir->core = core; |
459 | core->ir = ir; | 458 | core->ir = ir; |
@@ -586,7 +585,6 @@ void cx88_ir_irq(struct cx88_core *core) | |||
586 | MODULE_AUTHOR("Gerd Knorr, Pavel Machek, Chris Pascoe"); | 585 | MODULE_AUTHOR("Gerd Knorr, Pavel Machek, Chris Pascoe"); |
587 | MODULE_DESCRIPTION("input driver for cx88 GPIO-based IR remote controls"); | 586 | MODULE_DESCRIPTION("input driver for cx88 GPIO-based IR remote controls"); |
588 | MODULE_LICENSE("GPL"); | 587 | MODULE_LICENSE("GPL"); |
589 | |||
590 | /* | 588 | /* |
591 | * Local variables: | 589 | * Local variables: |
592 | * c-basic-offset: 8 | 590 | * c-basic-offset: 8 |
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h index 27fb080fd7aa..77beafc5c327 100644 --- a/drivers/media/video/cx88/cx88.h +++ b/drivers/media/video/cx88/cx88.h | |||
@@ -411,7 +411,6 @@ struct cx8802_dev { | |||
411 | struct videobuf_dvb dvb; | 411 | struct videobuf_dvb dvb; |
412 | void* fe_handle; | 412 | void* fe_handle; |
413 | int (*fe_release)(void *handle); | 413 | int (*fe_release)(void *handle); |
414 | |||
415 | /* for switching modulation types */ | 414 | /* for switching modulation types */ |
416 | unsigned char ts_gen_cntrl; | 415 | unsigned char ts_gen_cntrl; |
417 | 416 | ||
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c index 9f6e5e5355a1..0cfe75416ec6 100644 --- a/drivers/media/video/em28xx/em28xx-core.c +++ b/drivers/media/video/em28xx/em28xx-core.c | |||
@@ -116,47 +116,6 @@ void em28xx_print_ioctl(char *name, unsigned int cmd) | |||
116 | } | 116 | } |
117 | } | 117 | } |
118 | 118 | ||
119 | static void *rvmalloc(size_t size) | ||
120 | { | ||
121 | void *mem; | ||
122 | unsigned long adr; | ||
123 | |||
124 | size = PAGE_ALIGN(size); | ||
125 | |||
126 | mem = vmalloc_32((unsigned long)size); | ||
127 | if (!mem) | ||
128 | return NULL; | ||
129 | |||
130 | memset(mem, 0, size); | ||
131 | |||
132 | adr = (unsigned long)mem; | ||
133 | while (size > 0) { | ||
134 | SetPageReserved(vmalloc_to_page((void *)adr)); | ||
135 | adr += PAGE_SIZE; | ||
136 | size -= PAGE_SIZE; | ||
137 | } | ||
138 | |||
139 | return mem; | ||
140 | } | ||
141 | |||
142 | static void rvfree(void *mem, size_t size) | ||
143 | { | ||
144 | unsigned long adr; | ||
145 | |||
146 | if (!mem) | ||
147 | return; | ||
148 | |||
149 | size = PAGE_ALIGN(size); | ||
150 | |||
151 | adr = (unsigned long)mem; | ||
152 | while (size > 0) { | ||
153 | ClearPageReserved(vmalloc_to_page((void *)adr)); | ||
154 | adr += PAGE_SIZE; | ||
155 | size -= PAGE_SIZE; | ||
156 | } | ||
157 | |||
158 | vfree(mem); | ||
159 | } | ||
160 | 119 | ||
161 | /* | 120 | /* |
162 | * em28xx_request_buffers() | 121 | * em28xx_request_buffers() |
@@ -167,14 +126,16 @@ u32 em28xx_request_buffers(struct em28xx *dev, u32 count) | |||
167 | const size_t imagesize = PAGE_ALIGN(dev->frame_size); /*needs to be page aligned cause the buffers can be mapped individually! */ | 126 | const size_t imagesize = PAGE_ALIGN(dev->frame_size); /*needs to be page aligned cause the buffers can be mapped individually! */ |
168 | void *buff = NULL; | 127 | void *buff = NULL; |
169 | u32 i; | 128 | u32 i; |
170 | em28xx_coredbg("requested %i buffers with size %i", count, imagesize); | 129 | em28xx_coredbg("requested %i buffers with size %zd", count, imagesize); |
171 | if (count > EM28XX_NUM_FRAMES) | 130 | if (count > EM28XX_NUM_FRAMES) |
172 | count = EM28XX_NUM_FRAMES; | 131 | count = EM28XX_NUM_FRAMES; |
173 | 132 | ||
174 | dev->num_frames = count; | 133 | dev->num_frames = count; |
175 | while (dev->num_frames > 0) { | 134 | while (dev->num_frames > 0) { |
176 | if ((buff = rvmalloc(dev->num_frames * imagesize))) | 135 | if ((buff = vmalloc_32(dev->num_frames * imagesize))) { |
136 | memset(buff, 0, dev->num_frames * imagesize); | ||
177 | break; | 137 | break; |
138 | } | ||
178 | dev->num_frames--; | 139 | dev->num_frames--; |
179 | } | 140 | } |
180 | 141 | ||
@@ -217,8 +178,7 @@ void em28xx_queue_unusedframes(struct em28xx *dev) | |||
217 | void em28xx_release_buffers(struct em28xx *dev) | 178 | void em28xx_release_buffers(struct em28xx *dev) |
218 | { | 179 | { |
219 | if (dev->num_frames) { | 180 | if (dev->num_frames) { |
220 | rvfree(dev->frame[0].bufmem, | 181 | vfree(dev->frame[0].bufmem); |
221 | dev->num_frames * PAGE_ALIGN(dev->frame[0].buf.length)); | ||
222 | dev->num_frames = 0; | 182 | dev->num_frames = 0; |
223 | } | 183 | } |
224 | } | 184 | } |
diff --git a/drivers/media/video/em28xx/em28xx-i2c.c b/drivers/media/video/em28xx/em28xx-i2c.c index b32d9852f34c..7f5603054f02 100644 --- a/drivers/media/video/em28xx/em28xx-i2c.c +++ b/drivers/media/video/em28xx/em28xx-i2c.c | |||
@@ -41,7 +41,7 @@ module_param(i2c_debug, int, 0644); | |||
41 | MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]"); | 41 | MODULE_PARM_DESC(i2c_debug, "enable debug messages [i2c]"); |
42 | 42 | ||
43 | #define dprintk1(lvl,fmt, args...) if (i2c_debug>=lvl) do {\ | 43 | #define dprintk1(lvl,fmt, args...) if (i2c_debug>=lvl) do {\ |
44 | printk(fmt , ##args); } while (0) | 44 | printk(fmt, ##args); } while (0) |
45 | #define dprintk2(lvl,fmt, args...) if (i2c_debug>=lvl) do{ \ | 45 | #define dprintk2(lvl,fmt, args...) if (i2c_debug>=lvl) do{ \ |
46 | printk(KERN_DEBUG "%s at %s: " fmt, \ | 46 | printk(KERN_DEBUG "%s at %s: " fmt, \ |
47 | dev->name, __FUNCTION__ , ##args); } while (0) | 47 | dev->name, __FUNCTION__ , ##args); } while (0) |
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c index abec32c175aa..06d76879bde2 100644 --- a/drivers/media/video/em28xx/em28xx-video.c +++ b/drivers/media/video/em28xx/em28xx-video.c | |||
@@ -189,16 +189,6 @@ static DECLARE_RWSEM(em28xx_disconnect); | |||
189 | 189 | ||
190 | /********************* v4l2 interface ******************************************/ | 190 | /********************* v4l2 interface ******************************************/ |
191 | 191 | ||
192 | static inline unsigned long kvirt_to_pa(unsigned long adr) | ||
193 | { | ||
194 | unsigned long kva, ret; | ||
195 | |||
196 | kva = (unsigned long)page_address(vmalloc_to_page((void *)adr)); | ||
197 | kva |= adr & (PAGE_SIZE - 1); | ||
198 | ret = __pa(kva); | ||
199 | return ret; | ||
200 | } | ||
201 | |||
202 | /* | 192 | /* |
203 | * em28xx_config() | 193 | * em28xx_config() |
204 | * inits registers with sane defaults | 194 | * inits registers with sane defaults |
@@ -616,7 +606,8 @@ static struct vm_operations_struct em28xx_vm_ops = { | |||
616 | static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma) | 606 | static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma) |
617 | { | 607 | { |
618 | unsigned long size = vma->vm_end - vma->vm_start, | 608 | unsigned long size = vma->vm_end - vma->vm_start, |
619 | start = vma->vm_start, pos, page; | 609 | start = vma->vm_start; |
610 | void *pos; | ||
620 | u32 i; | 611 | u32 i; |
621 | 612 | ||
622 | struct em28xx *dev = filp->private_data; | 613 | struct em28xx *dev = filp->private_data; |
@@ -657,12 +648,10 @@ static int em28xx_v4l2_mmap(struct file *filp, struct vm_area_struct *vma) | |||
657 | vma->vm_flags |= VM_IO; | 648 | vma->vm_flags |= VM_IO; |
658 | vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */ | 649 | vma->vm_flags |= VM_RESERVED; /* avoid to swap out this VMA */ |
659 | 650 | ||
660 | pos = (unsigned long)dev->frame[i].bufmem; | 651 | pos = dev->frame[i].bufmem; |
661 | while (size > 0) { /* size is page-aligned */ | 652 | while (size > 0) { /* size is page-aligned */ |
662 | page = vmalloc_to_pfn((void *)pos); | 653 | if (vm_insert_page(vma, start, vmalloc_to_page(pos))) { |
663 | if (remap_pfn_range(vma, start, page, PAGE_SIZE, | 654 | em28xx_videodbg("mmap: vm_insert_page failed\n"); |
664 | vma->vm_page_prot)) { | ||
665 | em28xx_videodbg("mmap: rename page map failed\n"); | ||
666 | up(&dev->fileop_lock); | 655 | up(&dev->fileop_lock); |
667 | return -EAGAIN; | 656 | return -EAGAIN; |
668 | } | 657 | } |
diff --git a/drivers/media/video/ir-kbd-gpio.c b/drivers/media/video/ir-kbd-gpio.c index 6345e29e4951..de1385e5d05e 100644 --- a/drivers/media/video/ir-kbd-gpio.c +++ b/drivers/media/video/ir-kbd-gpio.c | |||
@@ -291,13 +291,12 @@ struct IR { | |||
291 | u32 mask_keycode; | 291 | u32 mask_keycode; |
292 | u32 mask_keydown; | 292 | u32 mask_keydown; |
293 | u32 mask_keyup; | 293 | u32 mask_keyup; |
294 | u32 polling; | 294 | u32 polling; |
295 | u32 last_gpio; | 295 | u32 last_gpio; |
296 | struct work_struct work; | 296 | struct work_struct work; |
297 | struct timer_list timer; | 297 | struct timer_list timer; |
298 | 298 | ||
299 | /* RC5 gpio */ | 299 | /* RC5 gpio */ |
300 | |||
301 | u32 rc5_gpio; | 300 | u32 rc5_gpio; |
302 | struct timer_list timer_end; /* timer_end for code completion */ | 301 | struct timer_list timer_end; /* timer_end for code completion */ |
303 | struct timer_list timer_keyup; /* timer_end for key release */ | 302 | struct timer_list timer_keyup; /* timer_end for key release */ |
@@ -647,7 +646,7 @@ static int ir_probe(struct device *dev) | |||
647 | driver.any_irq = ir_rc5_irq; | 646 | driver.any_irq = ir_rc5_irq; |
648 | driver.gpio_irq = NULL; | 647 | driver.gpio_irq = NULL; |
649 | ir->rc5_gpio = 1; | 648 | ir->rc5_gpio = 1; |
650 | break; | 649 | break; |
651 | } | 650 | } |
652 | if (NULL == ir_codes) { | 651 | if (NULL == ir_codes) { |
653 | kfree(ir); | 652 | kfree(ir); |
@@ -657,7 +656,7 @@ static int ir_probe(struct device *dev) | |||
657 | 656 | ||
658 | if (ir->rc5_gpio) { | 657 | if (ir->rc5_gpio) { |
659 | u32 gpio; | 658 | u32 gpio; |
660 | /* enable remote irq */ | 659 | /* enable remote irq */ |
661 | bttv_gpio_inout(sub->core, (1 << 4), 1 << 4); | 660 | bttv_gpio_inout(sub->core, (1 << 4), 1 << 4); |
662 | gpio = bttv_gpio_read(sub->core); | 661 | gpio = bttv_gpio_read(sub->core); |
663 | bttv_gpio_write(sub->core, gpio & ~(1 << 4)); | 662 | bttv_gpio_write(sub->core, gpio & ~(1 << 4)); |
@@ -726,6 +725,7 @@ static int ir_remove(struct device *dev) | |||
726 | del_timer(&ir->timer); | 725 | del_timer(&ir->timer); |
727 | flush_scheduled_work(); | 726 | flush_scheduled_work(); |
728 | } | 727 | } |
728 | |||
729 | if (ir->rc5_gpio) { | 729 | if (ir->rc5_gpio) { |
730 | u32 gpio; | 730 | u32 gpio; |
731 | 731 | ||
diff --git a/drivers/media/video/ir-kbd-i2c.c b/drivers/media/video/ir-kbd-i2c.c index 124c502ea1f3..740e543311af 100644 --- a/drivers/media/video/ir-kbd-i2c.c +++ b/drivers/media/video/ir-kbd-i2c.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <linux/i2c.h> | 40 | #include <linux/i2c.h> |
41 | #include <linux/workqueue.h> | 41 | #include <linux/workqueue.h> |
42 | #include <asm/semaphore.h> | 42 | #include <asm/semaphore.h> |
43 | |||
43 | #include <media/ir-common.h> | 44 | #include <media/ir-common.h> |
44 | #include <media/ir-kbd-i2c.h> | 45 | #include <media/ir-kbd-i2c.h> |
45 | 46 | ||
@@ -278,7 +279,7 @@ static int ir_probe(struct i2c_adapter *adap); | |||
278 | 279 | ||
279 | static struct i2c_driver driver = { | 280 | static struct i2c_driver driver = { |
280 | .name = "ir remote kbd driver", | 281 | .name = "ir remote kbd driver", |
281 | .id = I2C_DRIVERID_I2C_IR, | 282 | .id = I2C_DRIVERID_INFRARED, |
282 | .flags = I2C_DF_NOTIFY, | 283 | .flags = I2C_DF_NOTIFY, |
283 | .attach_adapter = ir_probe, | 284 | .attach_adapter = ir_probe, |
284 | .detach_client = ir_detach, | 285 | .detach_client = ir_detach, |
@@ -296,15 +297,15 @@ static int ir_attach(struct i2c_adapter *adap, int addr, | |||
296 | IR_KEYTAB_TYPE *ir_codes = NULL; | 297 | IR_KEYTAB_TYPE *ir_codes = NULL; |
297 | char *name; | 298 | char *name; |
298 | int ir_type; | 299 | int ir_type; |
299 | struct IR_i2c *ir; | 300 | struct IR_i2c *ir; |
300 | struct input_dev *input_dev; | 301 | struct input_dev *input_dev; |
301 | 302 | ||
302 | ir = kzalloc(sizeof(struct IR_i2c), GFP_KERNEL); | 303 | ir = kzalloc(sizeof(struct IR_i2c),GFP_KERNEL); |
303 | input_dev = input_allocate_device(); | 304 | input_dev = input_allocate_device(); |
304 | if (!ir || !input_dev) { | 305 | if (!ir || !input_dev) { |
305 | kfree(ir); | 306 | kfree(ir); |
306 | input_free_device(input_dev); | 307 | input_free_device(input_dev); |
307 | return -ENOMEM; | 308 | return -ENOMEM; |
308 | } | 309 | } |
309 | 310 | ||
310 | ir->c = client_template; | 311 | ir->c = client_template; |
@@ -360,7 +361,7 @@ static int ir_attach(struct i2c_adapter *adap, int addr, | |||
360 | /* register i2c device | 361 | /* register i2c device |
361 | * At device register, IR codes may be changed to be | 362 | * At device register, IR codes may be changed to be |
362 | * board dependent. | 363 | * board dependent. |
363 | */ | 364 | */ |
364 | i2c_attach_client(&ir->c); | 365 | i2c_attach_client(&ir->c); |
365 | 366 | ||
366 | /* If IR not supported or disabled, unregisters driver */ | 367 | /* If IR not supported or disabled, unregisters driver */ |
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c index a23fb0338986..d86f8e92e534 100644 --- a/drivers/media/video/msp3400.c +++ b/drivers/media/video/msp3400.c | |||
@@ -134,7 +134,7 @@ struct msp3400c { | |||
134 | int rxsubchans; | 134 | int rxsubchans; |
135 | 135 | ||
136 | int muted; | 136 | int muted; |
137 | int left, right; /* volume */ | 137 | int left, right; /* volume */ |
138 | int bass, treble; | 138 | int bass, treble; |
139 | 139 | ||
140 | /* shadow register set */ | 140 | /* shadow register set */ |
@@ -882,6 +882,7 @@ static void watch_stereo(struct i2c_client *client) | |||
882 | msp->watch_stereo = 0; | 882 | msp->watch_stereo = 0; |
883 | } | 883 | } |
884 | 884 | ||
885 | |||
885 | static int msp3400c_thread(void *data) | 886 | static int msp3400c_thread(void *data) |
886 | { | 887 | { |
887 | struct i2c_client *client = data; | 888 | struct i2c_client *client = data; |
@@ -889,6 +890,7 @@ static int msp3400c_thread(void *data) | |||
889 | struct CARRIER_DETECT *cd; | 890 | struct CARRIER_DETECT *cd; |
890 | int count, max1,max2,val1,val2, val,this; | 891 | int count, max1,max2,val1,val2, val,this; |
891 | 892 | ||
893 | |||
892 | msp3400_info("msp3400 daemon started\n"); | 894 | msp3400_info("msp3400 daemon started\n"); |
893 | for (;;) { | 895 | for (;;) { |
894 | msp3400_dbg_mediumvol("msp3400 thread: sleep\n"); | 896 | msp3400_dbg_mediumvol("msp3400 thread: sleep\n"); |
@@ -1162,6 +1164,7 @@ static int msp3410d_thread(void *data) | |||
1162 | int mode,val,i,std; | 1164 | int mode,val,i,std; |
1163 | 1165 | ||
1164 | msp3400_info("msp3410 daemon started\n"); | 1166 | msp3400_info("msp3410 daemon started\n"); |
1167 | |||
1165 | for (;;) { | 1168 | for (;;) { |
1166 | msp3400_dbg_mediumvol("msp3410 thread: sleep\n"); | 1169 | msp3400_dbg_mediumvol("msp3410 thread: sleep\n"); |
1167 | msp34xx_sleep(msp,-1); | 1170 | msp34xx_sleep(msp,-1); |
@@ -1384,6 +1387,7 @@ static int msp34xxg_thread(void *data) | |||
1384 | int val, std, i; | 1387 | int val, std, i; |
1385 | 1388 | ||
1386 | msp3400_info("msp34xxg daemon started\n"); | 1389 | msp3400_info("msp34xxg daemon started\n"); |
1390 | |||
1387 | msp->source = 1; /* default */ | 1391 | msp->source = 1; /* default */ |
1388 | for (;;) { | 1392 | for (;;) { |
1389 | msp3400_dbg_mediumvol("msp34xxg thread: sleep\n"); | 1393 | msp3400_dbg_mediumvol("msp34xxg thread: sleep\n"); |
@@ -1559,11 +1563,11 @@ static void msp_wake_thread(struct i2c_client *client); | |||
1559 | static struct i2c_driver driver = { | 1563 | static struct i2c_driver driver = { |
1560 | .owner = THIS_MODULE, | 1564 | .owner = THIS_MODULE, |
1561 | .name = "msp3400", | 1565 | .name = "msp3400", |
1562 | .id = I2C_DRIVERID_MSP3400, | 1566 | .id = I2C_DRIVERID_MSP3400, |
1563 | .flags = I2C_DF_NOTIFY, | 1567 | .flags = I2C_DF_NOTIFY, |
1564 | .attach_adapter = msp_probe, | 1568 | .attach_adapter = msp_probe, |
1565 | .detach_client = msp_detach, | 1569 | .detach_client = msp_detach, |
1566 | .command = msp_command, | 1570 | .command = msp_command, |
1567 | .driver = { | 1571 | .driver = { |
1568 | .suspend = msp_suspend, | 1572 | .suspend = msp_suspend, |
1569 | .resume = msp_resume, | 1573 | .resume = msp_resume, |
@@ -1574,7 +1578,7 @@ static struct i2c_client client_template = | |||
1574 | { | 1578 | { |
1575 | .name = "(unset)", | 1579 | .name = "(unset)", |
1576 | .flags = I2C_CLIENT_ALLOW_USE, | 1580 | .flags = I2C_CLIENT_ALLOW_USE, |
1577 | .driver = &driver, | 1581 | .driver = &driver, |
1578 | }; | 1582 | }; |
1579 | 1583 | ||
1580 | static int msp_attach(struct i2c_adapter *adap, int addr, int kind) | 1584 | static int msp_attach(struct i2c_adapter *adap, int addr, int kind) |
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c index dca3ddfd510f..923322503e8f 100644 --- a/drivers/media/video/saa6588.c +++ b/drivers/media/video/saa6588.c | |||
@@ -422,7 +422,6 @@ static int saa6588_attach(struct i2c_adapter *adap, int addr, int kind) | |||
422 | s->timer.function = saa6588_timer; | 422 | s->timer.function = saa6588_timer; |
423 | s->timer.data = (unsigned long)s; | 423 | s->timer.data = (unsigned long)s; |
424 | schedule_work(&s->work); | 424 | schedule_work(&s->work); |
425 | |||
426 | return 0; | 425 | return 0; |
427 | } | 426 | } |
428 | 427 | ||
diff --git a/drivers/media/video/saa711x.c b/drivers/media/video/saa711x.c index 59e13fdea780..31f7b950b01c 100644 --- a/drivers/media/video/saa711x.c +++ b/drivers/media/video/saa711x.c | |||
@@ -59,7 +59,7 @@ MODULE_PARM_DESC(debug, " Set the default Debug level. Default: 0 (Off) - (0-1) | |||
59 | #define dprintk(num, format, args...) \ | 59 | #define dprintk(num, format, args...) \ |
60 | do { \ | 60 | do { \ |
61 | if (debug >= num) \ | 61 | if (debug >= num) \ |
62 | printk(format , ##args); \ | 62 | printk(format, ##args); \ |
63 | } while (0) | 63 | } while (0) |
64 | 64 | ||
65 | /* ----------------------------------------------------------------------- */ | 65 | /* ----------------------------------------------------------------------- */ |
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c index cdd1ed9c8065..a61d24f588f7 100644 --- a/drivers/media/video/saa7134/saa6752hs.c +++ b/drivers/media/video/saa7134/saa6752hs.c | |||
@@ -523,7 +523,8 @@ static int saa6752hs_attach(struct i2c_adapter *adap, int addr, int kind) | |||
523 | h->standard = 0; | 523 | h->standard = 0; |
524 | 524 | ||
525 | i2c_set_clientdata(&h->client, h); | 525 | i2c_set_clientdata(&h->client, h); |
526 | i2c_attach_client(&h->client); | 526 | i2c_attach_client(&h->client); |
527 | |||
527 | return 0; | 528 | return 0; |
528 | } | 529 | } |
529 | 530 | ||
@@ -597,19 +598,19 @@ saa6752hs_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
597 | 598 | ||
598 | static struct i2c_driver driver = { | 599 | static struct i2c_driver driver = { |
599 | .owner = THIS_MODULE, | 600 | .owner = THIS_MODULE, |
600 | .name = "i2c saa6752hs MPEG encoder", | 601 | .name = "i2c saa6752hs MPEG encoder", |
601 | .id = I2C_DRIVERID_SAA6752HS, | 602 | .id = I2C_DRIVERID_SAA6752HS, |
602 | .flags = I2C_DF_NOTIFY, | 603 | .flags = I2C_DF_NOTIFY, |
603 | .attach_adapter = saa6752hs_probe, | 604 | .attach_adapter = saa6752hs_probe, |
604 | .detach_client = saa6752hs_detach, | 605 | .detach_client = saa6752hs_detach, |
605 | .command = saa6752hs_command, | 606 | .command = saa6752hs_command, |
606 | }; | 607 | }; |
607 | 608 | ||
608 | static struct i2c_client client_template = | 609 | static struct i2c_client client_template = |
609 | { | 610 | { |
610 | .name = "saa6752hs", | 611 | .name = "saa6752hs", |
611 | .flags = I2C_CLIENT_ALLOW_USE, | 612 | .flags = I2C_CLIENT_ALLOW_USE, |
612 | .driver = &driver, | 613 | .driver = &driver, |
613 | }; | 614 | }; |
614 | 615 | ||
615 | static int __init saa6752hs_init_module(void) | 616 | static int __init saa6752hs_init_module(void) |
diff --git a/drivers/media/video/saa7134/saa7134-alsa.c b/drivers/media/video/saa7134/saa7134-alsa.c index 263c6e2e3e8e..953d5fec82d5 100644 --- a/drivers/media/video/saa7134/saa7134-alsa.c +++ b/drivers/media/video/saa7134/saa7134-alsa.c | |||
@@ -51,6 +51,7 @@ MODULE_PARM_DESC(debug,"enable debug messages [alsa]"); | |||
51 | #define MIXER_ADDR_LINE2 2 | 51 | #define MIXER_ADDR_LINE2 2 |
52 | #define MIXER_ADDR_LAST 2 | 52 | #define MIXER_ADDR_LAST 2 |
53 | 53 | ||
54 | |||
54 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ | 55 | static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ |
55 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ | 56 | static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ |
56 | static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0}; | 57 | static int enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0}; |
@@ -59,11 +60,14 @@ module_param_array(index, int, NULL, 0444); | |||
59 | MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s)."); | 60 | MODULE_PARM_DESC(index, "Index value for SAA7134 capture interface(s)."); |
60 | 61 | ||
61 | #define dprintk(fmt, arg...) if (debug) \ | 62 | #define dprintk(fmt, arg...) if (debug) \ |
62 | printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ## arg) | 63 | printk(KERN_DEBUG "%s/alsa: " fmt, dev->name , ##arg) |
64 | |||
65 | |||
63 | 66 | ||
64 | /* | 67 | /* |
65 | * Main chip structure | 68 | * Main chip structure |
66 | */ | 69 | */ |
70 | |||
67 | typedef struct snd_card_saa7134 { | 71 | typedef struct snd_card_saa7134 { |
68 | snd_card_t *card; | 72 | snd_card_t *card; |
69 | spinlock_t mixer_lock; | 73 | spinlock_t mixer_lock; |
@@ -208,8 +212,8 @@ static void saa7134_irq_alsa_done(struct saa7134_dev *dev, | |||
208 | 212 | ||
209 | static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs) | 213 | static irqreturn_t saa7134_alsa_irq(int irq, void *dev_id, struct pt_regs *regs) |
210 | { | 214 | { |
211 | struct saa7134_dmasound *dmasound = dev_id; | 215 | struct saa7134_dmasound *dmasound = dev_id; |
212 | struct saa7134_dev *dev = dmasound->priv_data; | 216 | struct saa7134_dev *dev = dmasound->priv_data; |
213 | 217 | ||
214 | unsigned long report, status; | 218 | unsigned long report, status; |
215 | int loop, handled = 0; | 219 | int loop, handled = 0; |
@@ -985,7 +989,7 @@ static int saa7134_alsa_init(void) | |||
985 | struct saa7134_dev *dev = NULL; | 989 | struct saa7134_dev *dev = NULL; |
986 | struct list_head *list; | 990 | struct list_head *list; |
987 | 991 | ||
988 | printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n"); | 992 | printk(KERN_INFO "saa7134 ALSA driver for DMA sound loaded\n"); |
989 | 993 | ||
990 | list_for_each(list,&saa7134_devlist) { | 994 | list_for_each(list,&saa7134_devlist) { |
991 | dev = list_entry(list, struct saa7134_dev, devlist); | 995 | dev = list_entry(list, struct saa7134_dev, devlist); |
@@ -1004,6 +1008,7 @@ static int saa7134_alsa_init(void) | |||
1004 | printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n"); | 1008 | printk(KERN_INFO "saa7134 ALSA: no saa7134 cards found\n"); |
1005 | 1009 | ||
1006 | return 0; | 1010 | return 0; |
1011 | |||
1007 | } | 1012 | } |
1008 | 1013 | ||
1009 | /* | 1014 | /* |
@@ -1027,3 +1032,6 @@ module_init(saa7134_alsa_init); | |||
1027 | module_exit(saa7134_alsa_exit); | 1032 | module_exit(saa7134_alsa_exit); |
1028 | MODULE_LICENSE("GPL"); | 1033 | MODULE_LICENSE("GPL"); |
1029 | MODULE_AUTHOR("Ricardo Cerqueira"); | 1034 | MODULE_AUTHOR("Ricardo Cerqueira"); |
1035 | |||
1036 | |||
1037 | |||
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c index 75abc20b0ccd..672fb205959f 100644 --- a/drivers/media/video/saa7134/saa7134-cards.c +++ b/drivers/media/video/saa7134/saa7134-cards.c | |||
@@ -976,7 +976,7 @@ struct saa7134_board saa7134_boards[] = { | |||
976 | .radio_type = UNSET, | 976 | .radio_type = UNSET, |
977 | .tuner_addr = ADDR_UNSET, | 977 | .tuner_addr = ADDR_UNSET, |
978 | .radio_addr = ADDR_UNSET, | 978 | .radio_addr = ADDR_UNSET, |
979 | .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER, | 979 | .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_ACTIVE, |
980 | .inputs = {{ | 980 | .inputs = {{ |
981 | .name = name_tv, | 981 | .name = name_tv, |
982 | .vmux = 3, | 982 | .vmux = 3, |
diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c index 1a093bf176f3..23d8747338ed 100644 --- a/drivers/media/video/saa7134/saa7134-core.c +++ b/drivers/media/video/saa7134/saa7134-core.c | |||
@@ -71,6 +71,7 @@ static unsigned int radio_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; | |||
71 | static unsigned int tuner[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; | 71 | static unsigned int tuner[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; |
72 | static unsigned int card[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; | 72 | static unsigned int card[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; |
73 | 73 | ||
74 | |||
74 | module_param_array(video_nr, int, NULL, 0444); | 75 | module_param_array(video_nr, int, NULL, 0444); |
75 | module_param_array(vbi_nr, int, NULL, 0444); | 76 | module_param_array(vbi_nr, int, NULL, 0444); |
76 | module_param_array(radio_nr, int, NULL, 0444); | 77 | module_param_array(radio_nr, int, NULL, 0444); |
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index e9ec69efb4c9..575f3e835f91 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -36,6 +36,7 @@ MODULE_AUTHOR("Gerd Knorr <kraxel@bytesex.org> [SuSE Labs]"); | |||
36 | MODULE_LICENSE("GPL"); | 36 | MODULE_LICENSE("GPL"); |
37 | 37 | ||
38 | static unsigned int empress_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; | 38 | static unsigned int empress_nr[] = {[0 ... (SAA7134_MAXBOARDS - 1)] = UNSET }; |
39 | |||
39 | module_param_array(empress_nr, int, NULL, 0444); | 40 | module_param_array(empress_nr, int, NULL, 0444); |
40 | MODULE_PARM_DESC(empress_nr,"ts device number"); | 41 | MODULE_PARM_DESC(empress_nr,"ts device number"); |
41 | 42 | ||
diff --git a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c index 7575043f0874..df9dd36721e0 100644 --- a/drivers/media/video/saa7134/saa7134-i2c.c +++ b/drivers/media/video/saa7134/saa7134-i2c.c | |||
@@ -333,7 +333,7 @@ static int attach_inform(struct i2c_client *client) | |||
333 | struct tuner_setup tun_setup; | 333 | struct tuner_setup tun_setup; |
334 | 334 | ||
335 | d1printk( "%s i2c attach [addr=0x%x,client=%s]\n", | 335 | d1printk( "%s i2c attach [addr=0x%x,client=%s]\n", |
336 | client->driver->name, client->addr, client->name); | 336 | client->driver->name, client->addr, client->name); |
337 | 337 | ||
338 | /* Am I an i2c remote control? */ | 338 | /* Am I an i2c remote control? */ |
339 | 339 | ||
diff --git a/drivers/media/video/saa7134/saa7134-oss.c b/drivers/media/video/saa7134/saa7134-oss.c index 5a579194e455..513a699a6df2 100644 --- a/drivers/media/video/saa7134/saa7134-oss.c +++ b/drivers/media/video/saa7134/saa7134-oss.c | |||
@@ -782,36 +782,36 @@ struct file_operations saa7134_mixer_fops = { | |||
782 | 782 | ||
783 | static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs) | 783 | static irqreturn_t saa7134_oss_irq(int irq, void *dev_id, struct pt_regs *regs) |
784 | { | 784 | { |
785 | struct saa7134_dmasound *dmasound = dev_id; | 785 | struct saa7134_dmasound *dmasound = dev_id; |
786 | struct saa7134_dev *dev = dmasound->priv_data; | 786 | struct saa7134_dev *dev = dmasound->priv_data; |
787 | unsigned long report, status; | 787 | unsigned long report, status; |
788 | int loop, handled = 0; | 788 | int loop, handled = 0; |
789 | 789 | ||
790 | for (loop = 0; loop < 10; loop++) { | 790 | for (loop = 0; loop < 10; loop++) { |
791 | report = saa_readl(SAA7134_IRQ_REPORT); | 791 | report = saa_readl(SAA7134_IRQ_REPORT); |
792 | status = saa_readl(SAA7134_IRQ_STATUS); | 792 | status = saa_readl(SAA7134_IRQ_STATUS); |
793 | 793 | ||
794 | if (report & SAA7134_IRQ_REPORT_DONE_RA3) { | 794 | if (report & SAA7134_IRQ_REPORT_DONE_RA3) { |
795 | handled = 1; | 795 | handled = 1; |
796 | saa_writel(SAA7134_IRQ_REPORT,report); | 796 | saa_writel(SAA7134_IRQ_REPORT,report); |
797 | saa7134_irq_oss_done(dev, status); | 797 | saa7134_irq_oss_done(dev, status); |
798 | } else { | 798 | } else { |
799 | goto out; | 799 | goto out; |
800 | } | 800 | } |
801 | } | 801 | } |
802 | 802 | ||
803 | if (loop == 10) { | 803 | if (loop == 10) { |
804 | dprintk("error! looping IRQ!"); | 804 | dprintk("error! looping IRQ!"); |
805 | } | 805 | } |
806 | out: | 806 | out: |
807 | return IRQ_RETVAL(handled); | 807 | return IRQ_RETVAL(handled); |
808 | } | 808 | } |
809 | 809 | ||
810 | int saa7134_oss_init1(struct saa7134_dev *dev) | 810 | int saa7134_oss_init1(struct saa7134_dev *dev) |
811 | { | 811 | { |
812 | 812 | ||
813 | if ((request_irq(dev->pci->irq, saa7134_oss_irq, | 813 | if ((request_irq(dev->pci->irq, saa7134_oss_irq, |
814 | SA_SHIRQ | SA_INTERRUPT, dev->name, | 814 | SA_SHIRQ | SA_INTERRUPT, dev->name, |
815 | (void*) &dev->dmasound)) < 0) | 815 | (void*) &dev->dmasound)) < 0) |
816 | return -1; | 816 | return -1; |
817 | 817 | ||
@@ -905,25 +905,25 @@ static int saa7134_dsp_create(struct saa7134_dev *dev) | |||
905 | 905 | ||
906 | err = dev->dmasound.minor_dsp = | 906 | err = dev->dmasound.minor_dsp = |
907 | register_sound_dsp(&saa7134_dsp_fops, | 907 | register_sound_dsp(&saa7134_dsp_fops, |
908 | dsp_nr[dev->nr]); | 908 | dsp_nr[dev->nr]); |
909 | if (err < 0) { | 909 | if (err < 0) { |
910 | goto fail; | 910 | goto fail; |
911 | } | 911 | } |
912 | printk(KERN_INFO "%s: registered device dsp%d\n", | 912 | printk(KERN_INFO "%s: registered device dsp%d\n", |
913 | dev->name,dev->dmasound.minor_dsp >> 4); | 913 | dev->name,dev->dmasound.minor_dsp >> 4); |
914 | 914 | ||
915 | err = dev->dmasound.minor_mixer = | 915 | err = dev->dmasound.minor_mixer = |
916 | register_sound_mixer(&saa7134_mixer_fops, | 916 | register_sound_mixer(&saa7134_mixer_fops, |
917 | mixer_nr[dev->nr]); | 917 | mixer_nr[dev->nr]); |
918 | if (err < 0) | 918 | if (err < 0) |
919 | goto fail; | 919 | goto fail; |
920 | printk(KERN_INFO "%s: registered device mixer%d\n", | 920 | printk(KERN_INFO "%s: registered device mixer%d\n", |
921 | dev->name,dev->dmasound.minor_mixer >> 4); | 921 | dev->name,dev->dmasound.minor_mixer >> 4); |
922 | 922 | ||
923 | return 0; | 923 | return 0; |
924 | 924 | ||
925 | fail: | 925 | fail: |
926 | unregister_sound_dsp(dev->dmasound.minor_dsp); | 926 | unregister_sound_dsp(dev->dmasound.minor_dsp); |
927 | return 0; | 927 | return 0; |
928 | 928 | ||
929 | 929 | ||
@@ -956,49 +956,50 @@ static int oss_device_exit(struct saa7134_dev *dev) | |||
956 | 956 | ||
957 | static int saa7134_oss_init(void) | 957 | static int saa7134_oss_init(void) |
958 | { | 958 | { |
959 | struct saa7134_dev *dev = NULL; | 959 | struct saa7134_dev *dev = NULL; |
960 | struct list_head *list; | 960 | struct list_head *list; |
961 | 961 | ||
962 | printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n"); | 962 | printk(KERN_INFO "saa7134 OSS driver for DMA sound loaded\n"); |
963 | 963 | ||
964 | list_for_each(list,&saa7134_devlist) { | 964 | list_for_each(list,&saa7134_devlist) { |
965 | dev = list_entry(list, struct saa7134_dev, devlist); | 965 | dev = list_entry(list, struct saa7134_dev, devlist); |
966 | if (dev->dmasound.priv_data == NULL) { | 966 | if (dev->dmasound.priv_data == NULL) { |
967 | oss_device_init(dev); | 967 | oss_device_init(dev); |
968 | } else { | 968 | } else { |
969 | printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name); | 969 | printk(KERN_ERR "saa7134 OSS: DMA sound is being handled by ALSA, ignoring %s\n",dev->name); |
970 | return -EBUSY; | 970 | return -EBUSY; |
971 | } | 971 | } |
972 | } | 972 | } |
973 | 973 | ||
974 | if (dev == NULL) | 974 | if (dev == NULL) |
975 | printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n"); | 975 | printk(KERN_INFO "saa7134 OSS: no saa7134 cards found\n"); |
976 | 976 | ||
977 | dmasound_init = oss_device_init; | 977 | dmasound_init = oss_device_init; |
978 | dmasound_exit = oss_device_exit; | 978 | dmasound_exit = oss_device_exit; |
979 | 979 | ||
980 | return 0; | 980 | return 0; |
981 | 981 | ||
982 | } | 982 | } |
983 | 983 | ||
984 | static void saa7134_oss_exit(void) | 984 | static void saa7134_oss_exit(void) |
985 | { | 985 | { |
986 | struct saa7134_dev *dev = NULL; | 986 | struct saa7134_dev *dev = NULL; |
987 | struct list_head *list; | 987 | struct list_head *list; |
988 | 988 | ||
989 | list_for_each(list,&saa7134_devlist) { | 989 | list_for_each(list,&saa7134_devlist) { |
990 | dev = list_entry(list, struct saa7134_dev, devlist); | 990 | dev = list_entry(list, struct saa7134_dev, devlist); |
991 | 991 | ||
992 | /* Device isn't registered by OSS, probably ALSA's */ | 992 | /* Device isn't registered by OSS, probably ALSA's */ |
993 | if (!dev->dmasound.minor_dsp) | 993 | if (!dev->dmasound.minor_dsp) |
994 | continue; | 994 | continue; |
995 | 995 | ||
996 | oss_device_exit(dev); | 996 | oss_device_exit(dev); |
997 | } | ||
998 | 997 | ||
999 | printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n"); | 998 | } |
999 | |||
1000 | printk(KERN_INFO "saa7134 OSS driver for DMA sound unloaded\n"); | ||
1000 | 1001 | ||
1001 | return; | 1002 | return; |
1002 | } | 1003 | } |
1003 | 1004 | ||
1004 | module_init(saa7134_oss_init); | 1005 | module_init(saa7134_oss_init); |
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c index 4249127c0a1d..2f2414e90e8b 100644 --- a/drivers/media/video/tda9887.c +++ b/drivers/media/video/tda9887.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <media/audiochip.h> | 12 | #include <media/audiochip.h> |
13 | #include <media/tuner.h> | 13 | #include <media/tuner.h> |
14 | 14 | ||
15 | |||
15 | /* Chips: | 16 | /* Chips: |
16 | TDA9885 (PAL, NTSC) | 17 | TDA9885 (PAL, NTSC) |
17 | TDA9886 (PAL, SECAM, NTSC) | 18 | TDA9886 (PAL, SECAM, NTSC) |
@@ -819,12 +820,12 @@ static int tda9887_resume(struct device * dev) | |||
819 | 820 | ||
820 | static struct i2c_driver driver = { | 821 | static struct i2c_driver driver = { |
821 | .owner = THIS_MODULE, | 822 | .owner = THIS_MODULE, |
822 | .name = "i2c tda9887 driver", | 823 | .name = "i2c tda9887 driver", |
823 | .id = -1, /* FIXME */ | 824 | .id = -1, /* FIXME */ |
824 | .flags = I2C_DF_NOTIFY, | 825 | .flags = I2C_DF_NOTIFY, |
825 | .attach_adapter = tda9887_probe, | 826 | .attach_adapter = tda9887_probe, |
826 | .detach_client = tda9887_detach, | 827 | .detach_client = tda9887_detach, |
827 | .command = tda9887_command, | 828 | .command = tda9887_command, |
828 | .driver = { | 829 | .driver = { |
829 | .suspend = tda9887_suspend, | 830 | .suspend = tda9887_suspend, |
830 | .resume = tda9887_resume, | 831 | .resume = tda9887_resume, |
@@ -834,7 +835,7 @@ static struct i2c_client client_template = | |||
834 | { | 835 | { |
835 | .name = "tda9887", | 836 | .name = "tda9887", |
836 | .flags = I2C_CLIENT_ALLOW_USE, | 837 | .flags = I2C_CLIENT_ALLOW_USE, |
837 | .driver = &driver, | 838 | .driver = &driver, |
838 | }; | 839 | }; |
839 | 840 | ||
840 | static int __init tda9887_init_module(void) | 841 | static int __init tda9887_init_module(void) |
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index c31bf28b73fe..5b20e8177cad 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
@@ -188,7 +188,7 @@ static int chip_write(struct CHIPSTATE *chip, int subaddr, int val) | |||
188 | buffer[1] = val; | 188 | buffer[1] = val; |
189 | if (2 != i2c_master_send(&chip->c,buffer,2)) { | 189 | if (2 != i2c_master_send(&chip->c,buffer,2)) { |
190 | tvaudio_warn("%s: I/O error (write reg%d=0x%x)\n", | 190 | tvaudio_warn("%s: I/O error (write reg%d=0x%x)\n", |
191 | chip->c.name, subaddr, val); | 191 | chip->c.name, subaddr, val); |
192 | return -1; | 192 | return -1; |
193 | } | 193 | } |
194 | } | 194 | } |
@@ -216,7 +216,7 @@ static int chip_read(struct CHIPSTATE *chip) | |||
216 | chip->c.name); | 216 | chip->c.name); |
217 | return -1; | 217 | return -1; |
218 | } | 218 | } |
219 | tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name,buffer); | 219 | tvaudio_dbg("%s: chip_read: 0x%x\n",chip->c.name, buffer); |
220 | return buffer; | 220 | return buffer; |
221 | } | 221 | } |
222 | 222 | ||
@@ -235,7 +235,7 @@ static int chip_read2(struct CHIPSTATE *chip, int subaddr) | |||
235 | return -1; | 235 | return -1; |
236 | } | 236 | } |
237 | tvaudio_dbg("%s: chip_read2: reg%d=0x%x\n", | 237 | tvaudio_dbg("%s: chip_read2: reg%d=0x%x\n", |
238 | chip->c.name,subaddr,read[0]); | 238 | chip->c.name, subaddr,read[0]); |
239 | return read[0]; | 239 | return read[0]; |
240 | } | 240 | } |
241 | 241 | ||
@@ -248,7 +248,7 @@ static int chip_cmd(struct CHIPSTATE *chip, char *name, audiocmd *cmd) | |||
248 | 248 | ||
249 | /* update our shadow register set; print bytes if (debug > 0) */ | 249 | /* update our shadow register set; print bytes if (debug > 0) */ |
250 | tvaudio_dbg("%s: chip_cmd(%s): reg=%d, data:", | 250 | tvaudio_dbg("%s: chip_cmd(%s): reg=%d, data:", |
251 | chip->c.name,name,cmd->bytes[0]); | 251 | chip->c.name, name,cmd->bytes[0]); |
252 | for (i = 1; i < cmd->count; i++) { | 252 | for (i = 1; i < cmd->count; i++) { |
253 | if (debug) | 253 | if (debug) |
254 | printk(" 0x%x",cmd->bytes[i]); | 254 | printk(" 0x%x",cmd->bytes[i]); |
@@ -322,7 +322,7 @@ static void generic_checkmode(struct CHIPSTATE *chip) | |||
322 | int mode = desc->getmode(chip); | 322 | int mode = desc->getmode(chip); |
323 | 323 | ||
324 | if (mode == chip->prevmode) | 324 | if (mode == chip->prevmode) |
325 | return; | 325 | return; |
326 | 326 | ||
327 | tvaudio_dbg("%s: thread checkmode\n", chip->c.name); | 327 | tvaudio_dbg("%s: thread checkmode\n", chip->c.name); |
328 | chip->prevmode = mode; | 328 | chip->prevmode = mode; |
@@ -1506,18 +1506,18 @@ static int chip_attach(struct i2c_adapter *adap, int addr, int kind) | |||
1506 | return -EIO; | 1506 | return -EIO; |
1507 | } | 1507 | } |
1508 | tvaudio_info("%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name); | 1508 | tvaudio_info("%s found @ 0x%x (%s)\n", desc->name, addr<<1, adap->name); |
1509 | if (desc->flags) { | 1509 | if (desc->flags) { |
1510 | tvaudio_dbg("matches:%s%s%s.\n", | 1510 | tvaudio_dbg("matches:%s%s%s.\n", |
1511 | (desc->flags & CHIP_HAS_VOLUME) ? " volume" : "", | 1511 | (desc->flags & CHIP_HAS_VOLUME) ? " volume" : "", |
1512 | (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "", | 1512 | (desc->flags & CHIP_HAS_BASSTREBLE) ? " bass/treble" : "", |
1513 | (desc->flags & CHIP_HAS_INPUTSEL) ? " audiomux" : ""); | 1513 | (desc->flags & CHIP_HAS_INPUTSEL) ? " audiomux" : ""); |
1514 | } | 1514 | } |
1515 | 1515 | ||
1516 | /* fill required data structures */ | 1516 | /* fill required data structures */ |
1517 | strcpy(chip->c.name,desc->name); | 1517 | strcpy(chip->c.name, desc->name); |
1518 | chip->type = desc-chiplist; | 1518 | chip->type = desc-chiplist; |
1519 | chip->shadow.count = desc->registers+1; | 1519 | chip->shadow.count = desc->registers+1; |
1520 | chip->prevmode = -1; | 1520 | chip->prevmode = -1; |
1521 | /* register */ | 1521 | /* register */ |
1522 | i2c_attach_client(&chip->c); | 1522 | i2c_attach_client(&chip->c); |
1523 | 1523 | ||
@@ -1604,7 +1604,7 @@ static int chip_command(struct i2c_client *client, | |||
1604 | struct CHIPSTATE *chip = i2c_get_clientdata(client); | 1604 | struct CHIPSTATE *chip = i2c_get_clientdata(client); |
1605 | struct CHIPDESC *desc = chiplist + chip->type; | 1605 | struct CHIPDESC *desc = chiplist + chip->type; |
1606 | 1606 | ||
1607 | tvaudio_dbg("%s: chip_command 0x%x\n",chip->c.name,cmd); | 1607 | tvaudio_dbg("%s: chip_command 0x%x\n", chip->c.name, cmd); |
1608 | 1608 | ||
1609 | switch (cmd) { | 1609 | switch (cmd) { |
1610 | case AUDC_SET_INPUT: | 1610 | case AUDC_SET_INPUT: |
@@ -1624,7 +1624,7 @@ static int chip_command(struct i2c_client *client, | |||
1624 | 1624 | ||
1625 | /* --- v4l ioctls --- */ | 1625 | /* --- v4l ioctls --- */ |
1626 | /* take care: bttv does userspace copying, we'll get a | 1626 | /* take care: bttv does userspace copying, we'll get a |
1627 | kernel pointer here... */ | 1627 | kernel pointer here... */ |
1628 | case VIDIOCGAUDIO: | 1628 | case VIDIOCGAUDIO: |
1629 | { | 1629 | { |
1630 | struct video_audio *va = arg; | 1630 | struct video_audio *va = arg; |
diff --git a/drivers/media/video/tveeprom.c b/drivers/media/video/tveeprom.c index d95aecebbda3..5ac235365dd8 100644 --- a/drivers/media/video/tveeprom.c +++ b/drivers/media/video/tveeprom.c | |||
@@ -206,7 +206,7 @@ hauppauge_tuner[] = | |||
206 | { TUNER_ABSENT, "TCL 2002MI_3H"}, | 206 | { TUNER_ABSENT, "TCL 2002MI_3H"}, |
207 | { TUNER_TCL_2002N, "TCL 2002N 5H"}, | 207 | { TUNER_TCL_2002N, "TCL 2002N 5H"}, |
208 | /* 100-109 */ | 208 | /* 100-109 */ |
209 | { TUNER_ABSENT, "Philips FMD1216ME"}, | 209 | { TUNER_PHILIPS_FMD1216ME_MK3, "Philips FMD1216ME"}, |
210 | { TUNER_TEA5767, "Philips TEA5768HL FM Radio"}, | 210 | { TUNER_TEA5767, "Philips TEA5768HL FM Radio"}, |
211 | { TUNER_ABSENT, "Panasonic ENV57H12D5"}, | 211 | { TUNER_ABSENT, "Panasonic ENV57H12D5"}, |
212 | { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05-4"}, | 212 | { TUNER_PHILIPS_FM1236_MK3, "TCL MFNM05-4"}, |
@@ -753,7 +753,8 @@ tveeprom_detect_client(struct i2c_adapter *adapter, | |||
753 | client->driver = &i2c_driver_tveeprom; | 753 | client->driver = &i2c_driver_tveeprom; |
754 | client->flags = I2C_CLIENT_ALLOW_USE; | 754 | client->flags = I2C_CLIENT_ALLOW_USE; |
755 | snprintf(client->name, sizeof(client->name), "tveeprom"); | 755 | snprintf(client->name, sizeof(client->name), "tveeprom"); |
756 | i2c_attach_client(client); | 756 | i2c_attach_client(client); |
757 | |||
757 | return 0; | 758 | return 0; |
758 | } | 759 | } |
759 | 760 | ||
diff --git a/drivers/media/video/tvp5150.c b/drivers/media/video/tvp5150.c index 81e6d4494e7d..97431e26d229 100644 --- a/drivers/media/video/tvp5150.c +++ b/drivers/media/video/tvp5150.c | |||
@@ -31,7 +31,7 @@ MODULE_PARM_DESC(debug, "Debug level (0-1)"); | |||
31 | #define dprintk(num, format, args...) \ | 31 | #define dprintk(num, format, args...) \ |
32 | do { \ | 32 | do { \ |
33 | if (debug >= num) \ | 33 | if (debug >= num) \ |
34 | printk(format , ##args); \ | 34 | printk(format, ##args); \ |
35 | } while (0) | 35 | } while (0) |
36 | 36 | ||
37 | /* supported controls */ | 37 | /* supported controls */ |
@@ -770,7 +770,6 @@ static int tvp5150_detect_client(struct i2c_adapter *adapter, | |||
770 | 770 | ||
771 | if (debug > 1) | 771 | if (debug > 1) |
772 | dump_reg(client); | 772 | dump_reg(client); |
773 | |||
774 | return 0; | 773 | return 0; |
775 | } | 774 | } |
776 | 775 | ||
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c index 55f129e964eb..0a4004a4393c 100644 --- a/drivers/media/video/video-buf-dvb.c +++ b/drivers/media/video/video-buf-dvb.c | |||
@@ -13,6 +13,7 @@ | |||
13 | * (at your option) any later version. | 13 | * (at your option) any later version. |
14 | */ | 14 | */ |
15 | 15 | ||
16 | |||
16 | #include <linux/module.h> | 17 | #include <linux/module.h> |
17 | #include <linux/init.h> | 18 | #include <linux/init.h> |
18 | #include <linux/device.h> | 19 | #include <linux/device.h> |
@@ -247,3 +248,4 @@ EXPORT_SYMBOL(videobuf_dvb_unregister); | |||
247 | * compile-command: "make DVB=1" | 248 | * compile-command: "make DVB=1" |
248 | * End: | 249 | * End: |
249 | */ | 250 | */ |
251 | |||
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c index 81ef306cb124..ee7075fa1ec3 100644 --- a/drivers/message/i2o/pci.c +++ b/drivers/message/i2o/pci.c | |||
@@ -303,6 +303,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, | |||
303 | struct i2o_controller *c; | 303 | struct i2o_controller *c; |
304 | int rc; | 304 | int rc; |
305 | struct pci_dev *i960 = NULL; | 305 | struct pci_dev *i960 = NULL; |
306 | int pci_dev_busy = 0; | ||
306 | 307 | ||
307 | printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n"); | 308 | printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n"); |
308 | 309 | ||
@@ -395,6 +396,8 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, | |||
395 | if ((rc = i2o_pci_alloc(c))) { | 396 | if ((rc = i2o_pci_alloc(c))) { |
396 | printk(KERN_ERR "%s: DMA / IO allocation for I2O controller " | 397 | printk(KERN_ERR "%s: DMA / IO allocation for I2O controller " |
397 | " failed\n", c->name); | 398 | " failed\n", c->name); |
399 | if (rc == -ENODEV) | ||
400 | pci_dev_busy = 1; | ||
398 | goto free_controller; | 401 | goto free_controller; |
399 | } | 402 | } |
400 | 403 | ||
@@ -425,7 +428,8 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev, | |||
425 | i2o_iop_free(c); | 428 | i2o_iop_free(c); |
426 | 429 | ||
427 | disable: | 430 | disable: |
428 | pci_disable_device(pdev); | 431 | if (!pci_dev_busy) |
432 | pci_disable_device(pdev); | ||
429 | 433 | ||
430 | return rc; | 434 | return rc; |
431 | } | 435 | } |
diff --git a/drivers/mfd/ucb1x00-ts.c b/drivers/mfd/ucb1x00-ts.c index a984c0efabf0..551061c2eadf 100644 --- a/drivers/mfd/ucb1x00-ts.c +++ b/drivers/mfd/ucb1x00-ts.c | |||
@@ -59,16 +59,18 @@ static int adcsync; | |||
59 | 59 | ||
60 | static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x, u16 y) | 60 | static inline void ucb1x00_ts_evt_add(struct ucb1x00_ts *ts, u16 pressure, u16 x, u16 y) |
61 | { | 61 | { |
62 | input_report_abs(ts->idev, ABS_X, x); | 62 | struct input_dev *idev = ts->idev; |
63 | input_report_abs(ts->idev, ABS_Y, y); | 63 | input_report_abs(idev, ABS_X, x); |
64 | input_report_abs(ts->idev, ABS_PRESSURE, pressure); | 64 | input_report_abs(idev, ABS_Y, y); |
65 | input_sync(ts->idev); | 65 | input_report_abs(idev, ABS_PRESSURE, pressure); |
66 | input_sync(idev); | ||
66 | } | 67 | } |
67 | 68 | ||
68 | static inline void ucb1x00_ts_event_release(struct ucb1x00_ts *ts) | 69 | static inline void ucb1x00_ts_event_release(struct ucb1x00_ts *ts) |
69 | { | 70 | { |
70 | input_report_abs(ts->idev, ABS_PRESSURE, 0); | 71 | struct input_dev *idev = ts->idev; |
71 | input_sync(ts->idev); | 72 | input_report_abs(idev, ABS_PRESSURE, 0); |
73 | input_sync(idev); | ||
72 | } | 74 | } |
73 | 75 | ||
74 | /* | 76 | /* |
@@ -297,7 +299,7 @@ static void ucb1x00_ts_irq(int idx, void *id) | |||
297 | 299 | ||
298 | static int ucb1x00_ts_open(struct input_dev *idev) | 300 | static int ucb1x00_ts_open(struct input_dev *idev) |
299 | { | 301 | { |
300 | struct ucb1x00_ts *ts = (struct ucb1x00_ts *)idev; | 302 | struct ucb1x00_ts *ts = idev->private; |
301 | int ret = 0; | 303 | int ret = 0; |
302 | 304 | ||
303 | BUG_ON(ts->rtask); | 305 | BUG_ON(ts->rtask); |
@@ -334,7 +336,7 @@ static int ucb1x00_ts_open(struct input_dev *idev) | |||
334 | */ | 336 | */ |
335 | static void ucb1x00_ts_close(struct input_dev *idev) | 337 | static void ucb1x00_ts_close(struct input_dev *idev) |
336 | { | 338 | { |
337 | struct ucb1x00_ts *ts = (struct ucb1x00_ts *)idev; | 339 | struct ucb1x00_ts *ts = idev->private; |
338 | 340 | ||
339 | if (ts->rtask) | 341 | if (ts->rtask) |
340 | kthread_stop(ts->rtask); | 342 | kthread_stop(ts->rtask); |
@@ -386,6 +388,7 @@ static int ucb1x00_ts_add(struct ucb1x00_dev *dev) | |||
386 | ts->ucb = dev->ucb; | 388 | ts->ucb = dev->ucb; |
387 | ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC; | 389 | ts->adcsync = adcsync ? UCB_SYNC : UCB_NOSYNC; |
388 | 390 | ||
391 | ts->idev->private = ts; | ||
389 | ts->idev->name = "Touchscreen panel"; | 392 | ts->idev->name = "Touchscreen panel"; |
390 | ts->idev->id.product = ts->ucb->id; | 393 | ts->idev->id.product = ts->ucb->id; |
391 | ts->idev->open = ucb1x00_ts_open; | 394 | ts->idev->open = ucb1x00_ts_open; |
diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c index d336a1d65dc7..eb41391e06e9 100644 --- a/drivers/mmc/mmc.c +++ b/drivers/mmc/mmc.c | |||
@@ -679,7 +679,15 @@ static void mmc_idle_cards(struct mmc_host *host) | |||
679 | } | 679 | } |
680 | 680 | ||
681 | /* | 681 | /* |
682 | * Apply power to the MMC stack. | 682 | * Apply power to the MMC stack. This is a two-stage process. |
683 | * First, we enable power to the card without the clock running. | ||
684 | * We then wait a bit for the power to stabilise. Finally, | ||
685 | * enable the bus drivers and clock to the card. | ||
686 | * | ||
687 | * We must _NOT_ enable the clock prior to power stablising. | ||
688 | * | ||
689 | * If a host does all the power sequencing itself, ignore the | ||
690 | * initial MMC_POWER_UP stage. | ||
683 | */ | 691 | */ |
684 | static void mmc_power_up(struct mmc_host *host) | 692 | static void mmc_power_up(struct mmc_host *host) |
685 | { | 693 | { |
@@ -932,8 +940,9 @@ static void mmc_read_scrs(struct mmc_host *host) | |||
932 | 940 | ||
933 | sg_init_one(&sg, (u8*)card->raw_scr, 8); | 941 | sg_init_one(&sg, (u8*)card->raw_scr, 8); |
934 | 942 | ||
935 | err = mmc_wait_for_req(host, &mrq); | 943 | mmc_wait_for_req(host, &mrq); |
936 | if (err != MMC_ERR_NONE) { | 944 | |
945 | if (cmd.error != MMC_ERR_NONE || data.error != MMC_ERR_NONE) { | ||
937 | mmc_card_set_dead(card); | 946 | mmc_card_set_dead(card); |
938 | continue; | 947 | continue; |
939 | } | 948 | } |
diff --git a/drivers/mtd/devices/blkmtd.c b/drivers/mtd/devices/blkmtd.c index f9db52f6bf00..04f864d238db 100644 --- a/drivers/mtd/devices/blkmtd.c +++ b/drivers/mtd/devices/blkmtd.c | |||
@@ -113,7 +113,7 @@ static int bi_write_complete(struct bio *bio, unsigned int bytes_done, int error | |||
113 | ClearPageUptodate(page); | 113 | ClearPageUptodate(page); |
114 | SetPageError(page); | 114 | SetPageError(page); |
115 | } | 115 | } |
116 | ClearPageDirty(page); | 116 | clear_page_dirty(page); |
117 | unlock_page(page); | 117 | unlock_page(page); |
118 | page_cache_release(page); | 118 | page_cache_release(page); |
119 | } while (bvec >= bio->bi_io_vec); | 119 | } while (bvec >= bio->bi_io_vec); |
@@ -289,7 +289,7 @@ static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to, | |||
289 | BUG(); | 289 | BUG(); |
290 | } | 290 | } |
291 | memcpy(page_address(page)+offset, buf, start_len); | 291 | memcpy(page_address(page)+offset, buf, start_len); |
292 | SetPageDirty(page); | 292 | set_page_dirty(page); |
293 | SetPageUptodate(page); | 293 | SetPageUptodate(page); |
294 | buf += start_len; | 294 | buf += start_len; |
295 | thislen = start_len; | 295 | thislen = start_len; |
@@ -336,7 +336,7 @@ static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to, | |||
336 | } | 336 | } |
337 | pagenr++; | 337 | pagenr++; |
338 | pagecnt--; | 338 | pagecnt--; |
339 | SetPageDirty(page); | 339 | set_page_dirty(page); |
340 | SetPageUptodate(page); | 340 | SetPageUptodate(page); |
341 | pagesc--; | 341 | pagesc--; |
342 | thislen += PAGE_SIZE; | 342 | thislen += PAGE_SIZE; |
@@ -357,7 +357,7 @@ static int write_pages(struct blkmtd_dev *dev, const u_char *buf, loff_t to, | |||
357 | BUG(); | 357 | BUG(); |
358 | } | 358 | } |
359 | memcpy(page_address(page), buf, end_len); | 359 | memcpy(page_address(page), buf, end_len); |
360 | SetPageDirty(page); | 360 | set_page_dirty(page); |
361 | SetPageUptodate(page); | 361 | SetPageUptodate(page); |
362 | DEBUG(3, "blkmtd: write: writing out partial end\n"); | 362 | DEBUG(3, "blkmtd: write: writing out partial end\n"); |
363 | thislen += end_len; | 363 | thislen += end_len; |
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c index 48cce431f89f..45c077d0f063 100644 --- a/drivers/mtd/onenand/generic.c +++ b/drivers/mtd/onenand/generic.c | |||
@@ -12,9 +12,9 @@ | |||
12 | * This is a device driver for the OneNAND flash for generic boards. | 12 | * This is a device driver for the OneNAND flash for generic boards. |
13 | */ | 13 | */ |
14 | 14 | ||
15 | #include <linux/device.h> | ||
16 | #include <linux/module.h> | 15 | #include <linux/module.h> |
17 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/platform_device.h> | ||
18 | #include <linux/mtd/mtd.h> | 18 | #include <linux/mtd/mtd.h> |
19 | #include <linux/mtd/onenand.h> | 19 | #include <linux/mtd/onenand.h> |
20 | #include <linux/mtd/partitions.h> | 20 | #include <linux/mtd/partitions.h> |
@@ -39,7 +39,7 @@ static int __devinit generic_onenand_probe(struct device *dev) | |||
39 | { | 39 | { |
40 | struct onenand_info *info; | 40 | struct onenand_info *info; |
41 | struct platform_device *pdev = to_platform_device(dev); | 41 | struct platform_device *pdev = to_platform_device(dev); |
42 | struct onenand_platform_data *pdata = pdev->dev.platform_data; | 42 | struct flash_platform_data *pdata = pdev->dev.platform_data; |
43 | struct resource *res = pdev->resource; | 43 | struct resource *res = pdev->resource; |
44 | unsigned long size = res->end - res->start + 1; | 44 | unsigned long size = res->end - res->start + 1; |
45 | int err; | 45 | int err; |
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index f67d5d6eb9a6..a53a73fc2a5a 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c | |||
@@ -940,7 +940,7 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs, | |||
940 | u_char *eccbuf, struct nand_oobinfo *oobsel) | 940 | u_char *eccbuf, struct nand_oobinfo *oobsel) |
941 | { | 941 | { |
942 | struct onenand_chip *this = mtd->priv; | 942 | struct onenand_chip *this = mtd->priv; |
943 | unsigned char buffer[MAX_ONENAND_PAGESIZE], *pbuf; | 943 | unsigned char *pbuf; |
944 | size_t total_len, len; | 944 | size_t total_len, len; |
945 | int i, written = 0; | 945 | int i, written = 0; |
946 | int ret = 0; | 946 | int ret = 0; |
@@ -975,7 +975,7 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs, | |||
975 | /* Loop until all keve's data has been written */ | 975 | /* Loop until all keve's data has been written */ |
976 | len = 0; | 976 | len = 0; |
977 | while (count) { | 977 | while (count) { |
978 | pbuf = buffer; | 978 | pbuf = this->page_buf; |
979 | /* | 979 | /* |
980 | * If the given tuple is >= pagesize then | 980 | * If the given tuple is >= pagesize then |
981 | * write it out from the iov | 981 | * write it out from the iov |
@@ -995,7 +995,7 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs, | |||
995 | int cnt = 0, thislen; | 995 | int cnt = 0, thislen; |
996 | while (cnt < mtd->oobblock) { | 996 | while (cnt < mtd->oobblock) { |
997 | thislen = min_t(int, mtd->oobblock - cnt, vecs->iov_len - len); | 997 | thislen = min_t(int, mtd->oobblock - cnt, vecs->iov_len - len); |
998 | memcpy(buffer + cnt, vecs->iov_base + len, thislen); | 998 | memcpy(this->page_buf + cnt, vecs->iov_base + len, thislen); |
999 | cnt += thislen; | 999 | cnt += thislen; |
1000 | len += thislen; | 1000 | len += thislen; |
1001 | 1001 | ||
@@ -1296,6 +1296,12 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len) | |||
1296 | 1296 | ||
1297 | /* Block lock scheme */ | 1297 | /* Block lock scheme */ |
1298 | for (block = start; block < end; block++) { | 1298 | for (block = start; block < end; block++) { |
1299 | /* Set block address */ | ||
1300 | value = onenand_block_address(this, block); | ||
1301 | this->write_word(value, this->base + ONENAND_REG_START_ADDRESS1); | ||
1302 | /* Select DataRAM for DDP */ | ||
1303 | value = onenand_bufferram_address(this, block); | ||
1304 | this->write_word(value, this->base + ONENAND_REG_START_ADDRESS2); | ||
1299 | /* Set start block address */ | 1305 | /* Set start block address */ |
1300 | this->write_word(block, this->base + ONENAND_REG_START_BLOCK_ADDRESS); | 1306 | this->write_word(block, this->base + ONENAND_REG_START_BLOCK_ADDRESS); |
1301 | /* Write unlock command */ | 1307 | /* Write unlock command */ |
@@ -1309,10 +1315,6 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len) | |||
1309 | & ONENAND_CTRL_ONGO) | 1315 | & ONENAND_CTRL_ONGO) |
1310 | continue; | 1316 | continue; |
1311 | 1317 | ||
1312 | /* Set block address for read block status */ | ||
1313 | value = onenand_block_address(this, block); | ||
1314 | this->write_word(value, this->base + ONENAND_REG_START_ADDRESS1); | ||
1315 | |||
1316 | /* Check lock status */ | 1318 | /* Check lock status */ |
1317 | status = this->read_word(this->base + ONENAND_REG_WP_STATUS); | 1319 | status = this->read_word(this->base + ONENAND_REG_WP_STATUS); |
1318 | if (!(status & ONENAND_WP_US)) | 1320 | if (!(status & ONENAND_WP_US)) |
@@ -1346,7 +1348,6 @@ static void onenand_print_device_info(int device) | |||
1346 | 1348 | ||
1347 | static const struct onenand_manufacturers onenand_manuf_ids[] = { | 1349 | static const struct onenand_manufacturers onenand_manuf_ids[] = { |
1348 | {ONENAND_MFR_SAMSUNG, "Samsung"}, | 1350 | {ONENAND_MFR_SAMSUNG, "Samsung"}, |
1349 | {ONENAND_MFR_UNKNOWN, "Unknown"} | ||
1350 | }; | 1351 | }; |
1351 | 1352 | ||
1352 | /** | 1353 | /** |
@@ -1357,17 +1358,22 @@ static const struct onenand_manufacturers onenand_manuf_ids[] = { | |||
1357 | */ | 1358 | */ |
1358 | static int onenand_check_maf(int manuf) | 1359 | static int onenand_check_maf(int manuf) |
1359 | { | 1360 | { |
1361 | int size = ARRAY_SIZE(onenand_manuf_ids); | ||
1362 | char *name; | ||
1360 | int i; | 1363 | int i; |
1361 | 1364 | ||
1362 | for (i = 0; onenand_manuf_ids[i].id; i++) { | 1365 | for (i = 0; i < size; i++) |
1363 | if (manuf == onenand_manuf_ids[i].id) | 1366 | if (manuf == onenand_manuf_ids[i].id) |
1364 | break; | 1367 | break; |
1365 | } | ||
1366 | 1368 | ||
1367 | printk(KERN_DEBUG "OneNAND Manufacturer: %s (0x%0x)\n", | 1369 | if (i < size) |
1368 | onenand_manuf_ids[i].name, manuf); | 1370 | name = onenand_manuf_ids[i].name; |
1371 | else | ||
1372 | name = "Unknown"; | ||
1373 | |||
1374 | printk(KERN_DEBUG "OneNAND Manufacturer: %s (0x%0x)\n", name, manuf); | ||
1369 | 1375 | ||
1370 | return (i != ONENAND_MFR_UNKNOWN); | 1376 | return (i == size); |
1371 | } | 1377 | } |
1372 | 1378 | ||
1373 | /** | 1379 | /** |
@@ -1513,6 +1519,18 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) | |||
1513 | this->read_bufferram = onenand_sync_read_bufferram; | 1519 | this->read_bufferram = onenand_sync_read_bufferram; |
1514 | } | 1520 | } |
1515 | 1521 | ||
1522 | /* Allocate buffers, if necessary */ | ||
1523 | if (!this->page_buf) { | ||
1524 | size_t len; | ||
1525 | len = mtd->oobblock + mtd->oobsize; | ||
1526 | this->page_buf = kmalloc(len, GFP_KERNEL); | ||
1527 | if (!this->page_buf) { | ||
1528 | printk(KERN_ERR "onenand_scan(): Can't allocate page_buf\n"); | ||
1529 | return -ENOMEM; | ||
1530 | } | ||
1531 | this->options |= ONENAND_PAGEBUF_ALLOC; | ||
1532 | } | ||
1533 | |||
1516 | this->state = FL_READY; | 1534 | this->state = FL_READY; |
1517 | init_waitqueue_head(&this->wq); | 1535 | init_waitqueue_head(&this->wq); |
1518 | spin_lock_init(&this->chip_lock); | 1536 | spin_lock_init(&this->chip_lock); |
@@ -1574,12 +1592,21 @@ int onenand_scan(struct mtd_info *mtd, int maxchips) | |||
1574 | */ | 1592 | */ |
1575 | void onenand_release(struct mtd_info *mtd) | 1593 | void onenand_release(struct mtd_info *mtd) |
1576 | { | 1594 | { |
1595 | struct onenand_chip *this = mtd->priv; | ||
1596 | |||
1577 | #ifdef CONFIG_MTD_PARTITIONS | 1597 | #ifdef CONFIG_MTD_PARTITIONS |
1578 | /* Deregister partitions */ | 1598 | /* Deregister partitions */ |
1579 | del_mtd_partitions (mtd); | 1599 | del_mtd_partitions (mtd); |
1580 | #endif | 1600 | #endif |
1581 | /* Deregister the device */ | 1601 | /* Deregister the device */ |
1582 | del_mtd_device (mtd); | 1602 | del_mtd_device (mtd); |
1603 | |||
1604 | /* Free bad block table memory, if allocated */ | ||
1605 | if (this->bbm) | ||
1606 | kfree(this->bbm); | ||
1607 | /* Buffer allocated by onenand_scan */ | ||
1608 | if (this->options & ONENAND_PAGEBUF_ALLOC) | ||
1609 | kfree(this->page_buf); | ||
1583 | } | 1610 | } |
1584 | 1611 | ||
1585 | EXPORT_SYMBOL_GPL(onenand_scan); | 1612 | EXPORT_SYMBOL_GPL(onenand_scan); |
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c index f40190f499e1..4510d3361eaa 100644 --- a/drivers/mtd/onenand/onenand_bbt.c +++ b/drivers/mtd/onenand/onenand_bbt.c | |||
@@ -118,10 +118,10 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr | |||
118 | */ | 118 | */ |
119 | static inline int onenand_memory_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd) | 119 | static inline int onenand_memory_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd) |
120 | { | 120 | { |
121 | unsigned char data_buf[MAX_ONENAND_PAGESIZE]; | 121 | struct onenand_chip *this = mtd->priv; |
122 | 122 | ||
123 | bd->options &= ~NAND_BBT_SCANEMPTY; | 123 | bd->options &= ~NAND_BBT_SCANEMPTY; |
124 | return create_bbt(mtd, data_buf, bd, -1); | 124 | return create_bbt(mtd, this->page_buf, bd, -1); |
125 | } | 125 | } |
126 | 126 | ||
127 | /** | 127 | /** |
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index be319229f543..8f6cf8c896a4 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -1251,12 +1251,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) | |||
1251 | 1251 | ||
1252 | if (memcmp(promaddr, dev->dev_addr, 6) | 1252 | if (memcmp(promaddr, dev->dev_addr, 6) |
1253 | || !is_valid_ether_addr(dev->dev_addr)) { | 1253 | || !is_valid_ether_addr(dev->dev_addr)) { |
1254 | #ifndef __powerpc__ | ||
1255 | if (is_valid_ether_addr(promaddr)) { | 1254 | if (is_valid_ether_addr(promaddr)) { |
1256 | #else | ||
1257 | if (!is_valid_ether_addr(dev->dev_addr) | ||
1258 | && is_valid_ether_addr(promaddr)) { | ||
1259 | #endif | ||
1260 | if (pcnet32_debug & NETIF_MSG_PROBE) { | 1255 | if (pcnet32_debug & NETIF_MSG_PROBE) { |
1261 | printk(" warning: CSR address invalid,\n"); | 1256 | printk(" warning: CSR address invalid,\n"); |
1262 | printk(KERN_INFO " using instead PROM address of"); | 1257 | printk(KERN_INFO " using instead PROM address of"); |
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index e57df8dfe6b4..669dd52c412a 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -3078,7 +3078,7 @@ int s2io_set_swapper(nic_t * sp) | |||
3078 | 3078 | ||
3079 | static int wait_for_msix_trans(nic_t *nic, int i) | 3079 | static int wait_for_msix_trans(nic_t *nic, int i) |
3080 | { | 3080 | { |
3081 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; | 3081 | XENA_dev_config_t __iomem *bar0 = nic->bar0; |
3082 | u64 val64; | 3082 | u64 val64; |
3083 | int ret = 0, cnt = 0; | 3083 | int ret = 0, cnt = 0; |
3084 | 3084 | ||
@@ -3099,7 +3099,7 @@ static int wait_for_msix_trans(nic_t *nic, int i) | |||
3099 | 3099 | ||
3100 | void restore_xmsi_data(nic_t *nic) | 3100 | void restore_xmsi_data(nic_t *nic) |
3101 | { | 3101 | { |
3102 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; | 3102 | XENA_dev_config_t __iomem *bar0 = nic->bar0; |
3103 | u64 val64; | 3103 | u64 val64; |
3104 | int i; | 3104 | int i; |
3105 | 3105 | ||
@@ -3117,7 +3117,7 @@ void restore_xmsi_data(nic_t *nic) | |||
3117 | 3117 | ||
3118 | static void store_xmsi_data(nic_t *nic) | 3118 | static void store_xmsi_data(nic_t *nic) |
3119 | { | 3119 | { |
3120 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; | 3120 | XENA_dev_config_t __iomem *bar0 = nic->bar0; |
3121 | u64 val64, addr, data; | 3121 | u64 val64, addr, data; |
3122 | int i; | 3122 | int i; |
3123 | 3123 | ||
@@ -3140,7 +3140,7 @@ static void store_xmsi_data(nic_t *nic) | |||
3140 | 3140 | ||
3141 | int s2io_enable_msi(nic_t *nic) | 3141 | int s2io_enable_msi(nic_t *nic) |
3142 | { | 3142 | { |
3143 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; | 3143 | XENA_dev_config_t __iomem *bar0 = nic->bar0; |
3144 | u16 msi_ctrl, msg_val; | 3144 | u16 msi_ctrl, msg_val; |
3145 | struct config_param *config = &nic->config; | 3145 | struct config_param *config = &nic->config; |
3146 | struct net_device *dev = nic->dev; | 3146 | struct net_device *dev = nic->dev; |
@@ -3190,7 +3190,7 @@ int s2io_enable_msi(nic_t *nic) | |||
3190 | 3190 | ||
3191 | int s2io_enable_msi_x(nic_t *nic) | 3191 | int s2io_enable_msi_x(nic_t *nic) |
3192 | { | 3192 | { |
3193 | XENA_dev_config_t *bar0 = (XENA_dev_config_t *) nic->bar0; | 3193 | XENA_dev_config_t __iomem *bar0 = nic->bar0; |
3194 | u64 tx_mat, rx_mat; | 3194 | u64 tx_mat, rx_mat; |
3195 | u16 msi_control; /* Temp variable */ | 3195 | u16 msi_control; /* Temp variable */ |
3196 | int ret, i, j, msix_indx = 1; | 3196 | int ret, i, j, msix_indx = 1; |
diff --git a/drivers/net/sk98lin/skge.c b/drivers/net/sk98lin/skge.c index 00c5d7f04c68..ae7343934758 100644 --- a/drivers/net/sk98lin/skge.c +++ b/drivers/net/sk98lin/skge.c | |||
@@ -818,7 +818,7 @@ uintptr_t VNextDescr; /* the virtual bus address of the next descriptor */ | |||
818 | /* set the pointers right */ | 818 | /* set the pointers right */ |
819 | pDescr->VNextRxd = VNextDescr & 0xffffffffULL; | 819 | pDescr->VNextRxd = VNextDescr & 0xffffffffULL; |
820 | pDescr->pNextRxd = pNextDescr; | 820 | pDescr->pNextRxd = pNextDescr; |
821 | pDescr->TcpSumStarts = 0; | 821 | if (!IsTx) pDescr->TcpSumStarts = ETH_HLEN << 16 | ETH_HLEN; |
822 | 822 | ||
823 | /* advance one step */ | 823 | /* advance one step */ |
824 | pPrevDescr = pDescr; | 824 | pPrevDescr = pDescr; |
@@ -2169,7 +2169,7 @@ rx_start: | |||
2169 | } /* frame > SK_COPY_TRESHOLD */ | 2169 | } /* frame > SK_COPY_TRESHOLD */ |
2170 | 2170 | ||
2171 | #ifdef USE_SK_RX_CHECKSUM | 2171 | #ifdef USE_SK_RX_CHECKSUM |
2172 | pMsg->csum = pRxd->TcpSums; | 2172 | pMsg->csum = pRxd->TcpSums & 0xffff; |
2173 | pMsg->ip_summed = CHECKSUM_HW; | 2173 | pMsg->ip_summed = CHECKSUM_HW; |
2174 | #else | 2174 | #else |
2175 | pMsg->ip_summed = CHECKSUM_NONE; | 2175 | pMsg->ip_summed = CHECKSUM_NONE; |
diff --git a/drivers/net/skge.c b/drivers/net/skge.c index 716467879b9c..00d683063c01 100644 --- a/drivers/net/skge.c +++ b/drivers/net/skge.c | |||
@@ -2280,11 +2280,13 @@ static int skge_xmit_frame(struct sk_buff *skb, struct net_device *dev) | |||
2280 | } | 2280 | } |
2281 | 2281 | ||
2282 | if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) { | 2282 | if (unlikely(skge->tx_avail < skb_shinfo(skb)->nr_frags +1)) { |
2283 | netif_stop_queue(dev); | 2283 | if (!netif_queue_stopped(dev)) { |
2284 | spin_unlock_irqrestore(&skge->tx_lock, flags); | 2284 | netif_stop_queue(dev); |
2285 | 2285 | ||
2286 | printk(KERN_WARNING PFX "%s: ring full when queue awake!\n", | 2286 | printk(KERN_WARNING PFX "%s: ring full when queue awake!\n", |
2287 | dev->name); | 2287 | dev->name); |
2288 | } | ||
2289 | spin_unlock_irqrestore(&skge->tx_lock, flags); | ||
2288 | return NETDEV_TX_BUSY; | 2290 | return NETDEV_TX_BUSY; |
2289 | } | 2291 | } |
2290 | 2292 | ||
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 1828a6bf8458..cefb0c08a68d 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c | |||
@@ -68,8 +68,8 @@ | |||
68 | 68 | ||
69 | #define DRV_MODULE_NAME "tg3" | 69 | #define DRV_MODULE_NAME "tg3" |
70 | #define PFX DRV_MODULE_NAME ": " | 70 | #define PFX DRV_MODULE_NAME ": " |
71 | #define DRV_MODULE_VERSION "3.43" | 71 | #define DRV_MODULE_VERSION "3.46" |
72 | #define DRV_MODULE_RELDATE "Oct 24, 2005" | 72 | #define DRV_MODULE_RELDATE "Dec 19, 2005" |
73 | 73 | ||
74 | #define TG3_DEF_MAC_MODE 0 | 74 | #define TG3_DEF_MAC_MODE 0 |
75 | #define TG3_DEF_RX_MODE 0 | 75 | #define TG3_DEF_RX_MODE 0 |
@@ -341,6 +341,16 @@ static struct { | |||
341 | { "interrupt test (offline)" }, | 341 | { "interrupt test (offline)" }, |
342 | }; | 342 | }; |
343 | 343 | ||
344 | static void tg3_write32(struct tg3 *tp, u32 off, u32 val) | ||
345 | { | ||
346 | writel(val, tp->regs + off); | ||
347 | } | ||
348 | |||
349 | static u32 tg3_read32(struct tg3 *tp, u32 off) | ||
350 | { | ||
351 | return (readl(tp->regs + off)); | ||
352 | } | ||
353 | |||
344 | static void tg3_write_indirect_reg32(struct tg3 *tp, u32 off, u32 val) | 354 | static void tg3_write_indirect_reg32(struct tg3 *tp, u32 off, u32 val) |
345 | { | 355 | { |
346 | unsigned long flags; | 356 | unsigned long flags; |
@@ -411,13 +421,29 @@ static u32 tg3_read_indirect_mbox(struct tg3 *tp, u32 off) | |||
411 | return val; | 421 | return val; |
412 | } | 422 | } |
413 | 423 | ||
414 | static void _tw32_flush(struct tg3 *tp, u32 off, u32 val) | 424 | /* usec_wait specifies the wait time in usec when writing to certain registers |
425 | * where it is unsafe to read back the register without some delay. | ||
426 | * GRC_LOCAL_CTRL is one example if the GPIOs are toggled to switch power. | ||
427 | * TG3PCI_CLOCK_CTRL is another example if the clock frequencies are changed. | ||
428 | */ | ||
429 | static void _tw32_flush(struct tg3 *tp, u32 off, u32 val, u32 usec_wait) | ||
415 | { | 430 | { |
416 | tp->write32(tp, off, val); | 431 | if ((tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG) || |
417 | if (!(tp->tg3_flags & TG3_FLAG_PCIX_TARGET_HWBUG) && | 432 | (tp->tg3_flags2 & TG3_FLG2_ICH_WORKAROUND)) |
418 | !(tp->tg3_flags & TG3_FLAG_5701_REG_WRITE_BUG) && | 433 | /* Non-posted methods */ |
419 | !(tp->tg3_flags2 & TG3_FLG2_ICH_WORKAROUND)) | 434 | tp->write32(tp, off, val); |
420 | tp->read32(tp, off); /* flush */ | 435 | else { |
436 | /* Posted method */ | ||
437 | tg3_write32(tp, off, val); | ||
438 | if (usec_wait) | ||
439 | udelay(usec_wait); | ||
440 | tp->read32(tp, off); | ||
441 | } | ||
442 | /* Wait again after the read for the posted method to guarantee that | ||
443 | * the wait time is met. | ||
444 | */ | ||
445 | if (usec_wait) | ||
446 | udelay(usec_wait); | ||
421 | } | 447 | } |
422 | 448 | ||
423 | static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val) | 449 | static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val) |
@@ -438,16 +464,6 @@ static void tg3_write32_tx_mbox(struct tg3 *tp, u32 off, u32 val) | |||
438 | readl(mbox); | 464 | readl(mbox); |
439 | } | 465 | } |
440 | 466 | ||
441 | static void tg3_write32(struct tg3 *tp, u32 off, u32 val) | ||
442 | { | ||
443 | writel(val, tp->regs + off); | ||
444 | } | ||
445 | |||
446 | static u32 tg3_read32(struct tg3 *tp, u32 off) | ||
447 | { | ||
448 | return (readl(tp->regs + off)); | ||
449 | } | ||
450 | |||
451 | #define tw32_mailbox(reg, val) tp->write32_mbox(tp, reg, val) | 467 | #define tw32_mailbox(reg, val) tp->write32_mbox(tp, reg, val) |
452 | #define tw32_mailbox_f(reg, val) tw32_mailbox_flush(tp, (reg), (val)) | 468 | #define tw32_mailbox_f(reg, val) tw32_mailbox_flush(tp, (reg), (val)) |
453 | #define tw32_rx_mbox(reg, val) tp->write32_rx_mbox(tp, reg, val) | 469 | #define tw32_rx_mbox(reg, val) tp->write32_rx_mbox(tp, reg, val) |
@@ -455,7 +471,8 @@ static u32 tg3_read32(struct tg3 *tp, u32 off) | |||
455 | #define tr32_mailbox(reg) tp->read32_mbox(tp, reg) | 471 | #define tr32_mailbox(reg) tp->read32_mbox(tp, reg) |
456 | 472 | ||
457 | #define tw32(reg,val) tp->write32(tp, reg, val) | 473 | #define tw32(reg,val) tp->write32(tp, reg, val) |
458 | #define tw32_f(reg,val) _tw32_flush(tp,(reg),(val)) | 474 | #define tw32_f(reg,val) _tw32_flush(tp,(reg),(val), 0) |
475 | #define tw32_wait_f(reg,val,us) _tw32_flush(tp,(reg),(val), (us)) | ||
459 | #define tr32(reg) tp->read32(tp, reg) | 476 | #define tr32(reg) tp->read32(tp, reg) |
460 | 477 | ||
461 | static void tg3_write_mem(struct tg3 *tp, u32 off, u32 val) | 478 | static void tg3_write_mem(struct tg3 *tp, u32 off, u32 val) |
@@ -595,21 +612,19 @@ static void tg3_switch_clocks(struct tg3 *tp) | |||
595 | 612 | ||
596 | if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS) { | 613 | if (tp->tg3_flags2 & TG3_FLG2_5705_PLUS) { |
597 | if (orig_clock_ctrl & CLOCK_CTRL_625_CORE) { | 614 | if (orig_clock_ctrl & CLOCK_CTRL_625_CORE) { |
598 | tw32_f(TG3PCI_CLOCK_CTRL, | 615 | tw32_wait_f(TG3PCI_CLOCK_CTRL, |
599 | clock_ctrl | CLOCK_CTRL_625_CORE); | 616 | clock_ctrl | CLOCK_CTRL_625_CORE, 40); |
600 | udelay(40); | ||
601 | } | 617 | } |
602 | } else if ((orig_clock_ctrl & CLOCK_CTRL_44MHZ_CORE) != 0) { | 618 | } else if ((orig_clock_ctrl & CLOCK_CTRL_44MHZ_CORE) != 0) { |
603 | tw32_f(TG3PCI_CLOCK_CTRL, | 619 | tw32_wait_f(TG3PCI_CLOCK_CTRL, |
604 | clock_ctrl | | 620 | clock_ctrl | |
605 | (CLOCK_CTRL_44MHZ_CORE | CLOCK_CTRL_ALTCLK)); | 621 | (CLOCK_CTRL_44MHZ_CORE | CLOCK_CTRL_ALTCLK), |
606 | udelay(40); | 622 | 40); |
607 | tw32_f(TG3PCI_CLOCK_CTRL, | 623 | tw32_wait_f(TG3PCI_CLOCK_CTRL, |
608 | clock_ctrl | (CLOCK_CTRL_ALTCLK)); | 624 | clock_ctrl | (CLOCK_CTRL_ALTCLK), |
609 | udelay(40); | 625 | 40); |
610 | } | 626 | } |
611 | tw32_f(TG3PCI_CLOCK_CTRL, clock_ctrl); | 627 | tw32_wait_f(TG3PCI_CLOCK_CTRL, clock_ctrl, 40); |
612 | udelay(40); | ||
613 | } | 628 | } |
614 | 629 | ||
615 | #define PHY_BUSY_LOOPS 5000 | 630 | #define PHY_BUSY_LOOPS 5000 |
@@ -1017,37 +1032,50 @@ static void tg3_frob_aux_power(struct tg3 *tp) | |||
1017 | if ((tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) != 0) | 1032 | if ((tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) != 0) |
1018 | return; | 1033 | return; |
1019 | 1034 | ||
1020 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) { | 1035 | if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) || |
1021 | tp_peer = pci_get_drvdata(tp->pdev_peer); | 1036 | (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714)) { |
1022 | if (!tp_peer) | 1037 | struct net_device *dev_peer; |
1038 | |||
1039 | dev_peer = pci_get_drvdata(tp->pdev_peer); | ||
1040 | if (!dev_peer) | ||
1023 | BUG(); | 1041 | BUG(); |
1042 | tp_peer = netdev_priv(dev_peer); | ||
1024 | } | 1043 | } |
1025 | 1044 | ||
1026 | |||
1027 | if ((tp->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0 || | 1045 | if ((tp->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0 || |
1028 | (tp_peer->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0) { | 1046 | (tp->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0 || |
1047 | (tp_peer->tg3_flags & TG3_FLAG_WOL_ENABLE) != 0 || | ||
1048 | (tp_peer->tg3_flags & TG3_FLAG_ENABLE_ASF) != 0) { | ||
1029 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 || | 1049 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5700 || |
1030 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) { | 1050 | GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701) { |
1031 | tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | | 1051 | tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | |
1032 | (GRC_LCLCTRL_GPIO_OE0 | | 1052 | (GRC_LCLCTRL_GPIO_OE0 | |
1033 | GRC_LCLCTRL_GPIO_OE1 | | 1053 | GRC_LCLCTRL_GPIO_OE1 | |
1034 | GRC_LCLCTRL_GPIO_OE2 | | 1054 | GRC_LCLCTRL_GPIO_OE2 | |
1035 | GRC_LCLCTRL_GPIO_OUTPUT0 | | 1055 | GRC_LCLCTRL_GPIO_OUTPUT0 | |
1036 | GRC_LCLCTRL_GPIO_OUTPUT1)); | 1056 | GRC_LCLCTRL_GPIO_OUTPUT1), |
1037 | udelay(100); | 1057 | 100); |
1038 | } else { | 1058 | } else { |
1039 | u32 no_gpio2; | 1059 | u32 no_gpio2; |
1040 | u32 grc_local_ctrl; | 1060 | u32 grc_local_ctrl = 0; |
1041 | 1061 | ||
1042 | if (tp_peer != tp && | 1062 | if (tp_peer != tp && |
1043 | (tp_peer->tg3_flags & TG3_FLAG_INIT_COMPLETE) != 0) | 1063 | (tp_peer->tg3_flags & TG3_FLAG_INIT_COMPLETE) != 0) |
1044 | return; | 1064 | return; |
1045 | 1065 | ||
1066 | /* Workaround to prevent overdrawing Amps. */ | ||
1067 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == | ||
1068 | ASIC_REV_5714) { | ||
1069 | grc_local_ctrl |= GRC_LCLCTRL_GPIO_OE3; | ||
1070 | tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | | ||
1071 | grc_local_ctrl, 100); | ||
1072 | } | ||
1073 | |||
1046 | /* On 5753 and variants, GPIO2 cannot be used. */ | 1074 | /* On 5753 and variants, GPIO2 cannot be used. */ |
1047 | no_gpio2 = tp->nic_sram_data_cfg & | 1075 | no_gpio2 = tp->nic_sram_data_cfg & |
1048 | NIC_SRAM_DATA_CFG_NO_GPIO2; | 1076 | NIC_SRAM_DATA_CFG_NO_GPIO2; |
1049 | 1077 | ||
1050 | grc_local_ctrl = GRC_LCLCTRL_GPIO_OE0 | | 1078 | grc_local_ctrl |= GRC_LCLCTRL_GPIO_OE0 | |
1051 | GRC_LCLCTRL_GPIO_OE1 | | 1079 | GRC_LCLCTRL_GPIO_OE1 | |
1052 | GRC_LCLCTRL_GPIO_OE2 | | 1080 | GRC_LCLCTRL_GPIO_OE2 | |
1053 | GRC_LCLCTRL_GPIO_OUTPUT1 | | 1081 | GRC_LCLCTRL_GPIO_OUTPUT1 | |
@@ -1056,21 +1084,18 @@ static void tg3_frob_aux_power(struct tg3 *tp) | |||
1056 | grc_local_ctrl &= ~(GRC_LCLCTRL_GPIO_OE2 | | 1084 | grc_local_ctrl &= ~(GRC_LCLCTRL_GPIO_OE2 | |
1057 | GRC_LCLCTRL_GPIO_OUTPUT2); | 1085 | GRC_LCLCTRL_GPIO_OUTPUT2); |
1058 | } | 1086 | } |
1059 | tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | | 1087 | tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | |
1060 | grc_local_ctrl); | 1088 | grc_local_ctrl, 100); |
1061 | udelay(100); | ||
1062 | 1089 | ||
1063 | grc_local_ctrl |= GRC_LCLCTRL_GPIO_OUTPUT0; | 1090 | grc_local_ctrl |= GRC_LCLCTRL_GPIO_OUTPUT0; |
1064 | 1091 | ||
1065 | tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | | 1092 | tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | |
1066 | grc_local_ctrl); | 1093 | grc_local_ctrl, 100); |
1067 | udelay(100); | ||
1068 | 1094 | ||
1069 | if (!no_gpio2) { | 1095 | if (!no_gpio2) { |
1070 | grc_local_ctrl &= ~GRC_LCLCTRL_GPIO_OUTPUT2; | 1096 | grc_local_ctrl &= ~GRC_LCLCTRL_GPIO_OUTPUT2; |
1071 | tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | | 1097 | tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | |
1072 | grc_local_ctrl); | 1098 | grc_local_ctrl, 100); |
1073 | udelay(100); | ||
1074 | } | 1099 | } |
1075 | } | 1100 | } |
1076 | } else { | 1101 | } else { |
@@ -1080,19 +1105,16 @@ static void tg3_frob_aux_power(struct tg3 *tp) | |||
1080 | (tp_peer->tg3_flags & TG3_FLAG_INIT_COMPLETE) != 0) | 1105 | (tp_peer->tg3_flags & TG3_FLAG_INIT_COMPLETE) != 0) |
1081 | return; | 1106 | return; |
1082 | 1107 | ||
1083 | tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | | 1108 | tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | |
1084 | (GRC_LCLCTRL_GPIO_OE1 | | 1109 | (GRC_LCLCTRL_GPIO_OE1 | |
1085 | GRC_LCLCTRL_GPIO_OUTPUT1)); | 1110 | GRC_LCLCTRL_GPIO_OUTPUT1), 100); |
1086 | udelay(100); | ||
1087 | 1111 | ||
1088 | tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | | 1112 | tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | |
1089 | (GRC_LCLCTRL_GPIO_OE1)); | 1113 | GRC_LCLCTRL_GPIO_OE1, 100); |
1090 | udelay(100); | ||
1091 | 1114 | ||
1092 | tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | | 1115 | tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl | |
1093 | (GRC_LCLCTRL_GPIO_OE1 | | 1116 | (GRC_LCLCTRL_GPIO_OE1 | |
1094 | GRC_LCLCTRL_GPIO_OUTPUT1)); | 1117 | GRC_LCLCTRL_GPIO_OUTPUT1), 100); |
1095 | udelay(100); | ||
1096 | } | 1118 | } |
1097 | } | 1119 | } |
1098 | } | 1120 | } |
@@ -1105,6 +1127,8 @@ static int tg3_setup_phy(struct tg3 *, int); | |||
1105 | 1127 | ||
1106 | static void tg3_write_sig_post_reset(struct tg3 *, int); | 1128 | static void tg3_write_sig_post_reset(struct tg3 *, int); |
1107 | static int tg3_halt_cpu(struct tg3 *, u32); | 1129 | static int tg3_halt_cpu(struct tg3 *, u32); |
1130 | static int tg3_nvram_lock(struct tg3 *); | ||
1131 | static void tg3_nvram_unlock(struct tg3 *); | ||
1108 | 1132 | ||
1109 | static int tg3_set_power_state(struct tg3 *tp, int state) | 1133 | static int tg3_set_power_state(struct tg3 *tp, int state) |
1110 | { | 1134 | { |
@@ -1133,10 +1157,8 @@ static int tg3_set_power_state(struct tg3 *tp, int state) | |||
1133 | udelay(100); /* Delay after power state change */ | 1157 | udelay(100); /* Delay after power state change */ |
1134 | 1158 | ||
1135 | /* Switch out of Vaux if it is not a LOM */ | 1159 | /* Switch out of Vaux if it is not a LOM */ |
1136 | if (!(tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT)) { | 1160 | if (!(tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT)) |
1137 | tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl); | 1161 | tw32_wait_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl, 100); |
1138 | udelay(100); | ||
1139 | } | ||
1140 | 1162 | ||
1141 | return 0; | 1163 | return 0; |
1142 | 1164 | ||
@@ -1179,6 +1201,21 @@ static int tg3_set_power_state(struct tg3 *tp, int state) | |||
1179 | tg3_setup_phy(tp, 0); | 1201 | tg3_setup_phy(tp, 0); |
1180 | } | 1202 | } |
1181 | 1203 | ||
1204 | if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) { | ||
1205 | int i; | ||
1206 | u32 val; | ||
1207 | |||
1208 | for (i = 0; i < 200; i++) { | ||
1209 | tg3_read_mem(tp, NIC_SRAM_FW_ASF_STATUS_MBOX, &val); | ||
1210 | if (val == ~NIC_SRAM_FIRMWARE_MBOX_MAGIC1) | ||
1211 | break; | ||
1212 | msleep(1); | ||
1213 | } | ||
1214 | } | ||
1215 | tg3_write_mem(tp, NIC_SRAM_WOL_MBOX, WOL_SIGNATURE | | ||
1216 | WOL_DRV_STATE_SHUTDOWN | | ||
1217 | WOL_DRV_WOL | WOL_SET_MAGIC_PKT); | ||
1218 | |||
1182 | pci_read_config_word(tp->pdev, pm + PCI_PM_PMC, &power_caps); | 1219 | pci_read_config_word(tp->pdev, pm + PCI_PM_PMC, &power_caps); |
1183 | 1220 | ||
1184 | if (tp->tg3_flags & TG3_FLAG_WOL_ENABLE) { | 1221 | if (tp->tg3_flags & TG3_FLAG_WOL_ENABLE) { |
@@ -1220,10 +1257,8 @@ static int tg3_set_power_state(struct tg3 *tp, int state) | |||
1220 | base_val |= (CLOCK_CTRL_RXCLK_DISABLE | | 1257 | base_val |= (CLOCK_CTRL_RXCLK_DISABLE | |
1221 | CLOCK_CTRL_TXCLK_DISABLE); | 1258 | CLOCK_CTRL_TXCLK_DISABLE); |
1222 | 1259 | ||
1223 | tw32_f(TG3PCI_CLOCK_CTRL, base_val | | 1260 | tw32_wait_f(TG3PCI_CLOCK_CTRL, base_val | CLOCK_CTRL_ALTCLK | |
1224 | CLOCK_CTRL_ALTCLK | | 1261 | CLOCK_CTRL_PWRDOWN_PLL133, 40); |
1225 | CLOCK_CTRL_PWRDOWN_PLL133); | ||
1226 | udelay(40); | ||
1227 | } else if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS) { | 1262 | } else if (tp->tg3_flags2 & TG3_FLG2_5780_CLASS) { |
1228 | /* do nothing */ | 1263 | /* do nothing */ |
1229 | } else if (!((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) && | 1264 | } else if (!((tp->tg3_flags2 & TG3_FLG2_5750_PLUS) && |
@@ -1244,11 +1279,11 @@ static int tg3_set_power_state(struct tg3 *tp, int state) | |||
1244 | newbits2 = newbits1 | CLOCK_CTRL_44MHZ_CORE; | 1279 | newbits2 = newbits1 | CLOCK_CTRL_44MHZ_CORE; |
1245 | } | 1280 | } |
1246 | 1281 | ||
1247 | tw32_f(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl | newbits1); | 1282 | tw32_wait_f(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl | newbits1, |
1248 | udelay(40); | 1283 | 40); |
1249 | 1284 | ||
1250 | tw32_f(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl | newbits2); | 1285 | tw32_wait_f(TG3PCI_CLOCK_CTRL, tp->pci_clock_ctrl | newbits2, |
1251 | udelay(40); | 1286 | 40); |
1252 | 1287 | ||
1253 | if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS)) { | 1288 | if (!(tp->tg3_flags2 & TG3_FLG2_5705_PLUS)) { |
1254 | u32 newbits3; | 1289 | u32 newbits3; |
@@ -1262,9 +1297,20 @@ static int tg3_set_power_state(struct tg3 *tp, int state) | |||
1262 | newbits3 = CLOCK_CTRL_44MHZ_CORE; | 1297 | newbits3 = CLOCK_CTRL_44MHZ_CORE; |
1263 | } | 1298 | } |
1264 | 1299 | ||
1265 | tw32_f(TG3PCI_CLOCK_CTRL, | 1300 | tw32_wait_f(TG3PCI_CLOCK_CTRL, |
1266 | tp->pci_clock_ctrl | newbits3); | 1301 | tp->pci_clock_ctrl | newbits3, 40); |
1267 | udelay(40); | 1302 | } |
1303 | } | ||
1304 | |||
1305 | if (!(tp->tg3_flags & TG3_FLAG_WOL_ENABLE) && | ||
1306 | !(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) { | ||
1307 | /* Turn off the PHY */ | ||
1308 | if (!(tp->tg3_flags2 & TG3_FLG2_PHY_SERDES)) { | ||
1309 | tg3_writephy(tp, MII_TG3_EXT_CTRL, | ||
1310 | MII_TG3_EXT_CTRL_FORCE_LED_OFF); | ||
1311 | tg3_writephy(tp, MII_TG3_AUX_CTRL, 0x01b2); | ||
1312 | if (GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5700) | ||
1313 | tg3_writephy(tp, MII_BMCR, BMCR_PDOWN); | ||
1268 | } | 1314 | } |
1269 | } | 1315 | } |
1270 | 1316 | ||
@@ -1277,8 +1323,12 @@ static int tg3_set_power_state(struct tg3 *tp, int state) | |||
1277 | 1323 | ||
1278 | val &= ~((1 << 16) | (1 << 4) | (1 << 2) | (1 << 1) | 1); | 1324 | val &= ~((1 << 16) | (1 << 4) | (1 << 2) | (1 << 1) | 1); |
1279 | tw32(0x7d00, val); | 1325 | tw32(0x7d00, val); |
1280 | if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) | 1326 | if (!(tp->tg3_flags & TG3_FLAG_ENABLE_ASF)) { |
1327 | tg3_nvram_lock(tp); | ||
1281 | tg3_halt_cpu(tp, RX_CPU_BASE); | 1328 | tg3_halt_cpu(tp, RX_CPU_BASE); |
1329 | tw32_f(NVRAM_SWARB, SWARB_REQ_CLR0); | ||
1330 | tg3_nvram_unlock(tp); | ||
1331 | } | ||
1282 | } | 1332 | } |
1283 | 1333 | ||
1284 | /* Finally, set the new power state. */ | 1334 | /* Finally, set the new power state. */ |
@@ -1812,7 +1862,7 @@ static int tg3_setup_copper_phy(struct tg3 *tp, int force_reset) | |||
1812 | } | 1862 | } |
1813 | } | 1863 | } |
1814 | relink: | 1864 | relink: |
1815 | if (current_link_up == 0) { | 1865 | if (current_link_up == 0 || tp->link_config.phy_is_low_power) { |
1816 | u32 tmp; | 1866 | u32 tmp; |
1817 | 1867 | ||
1818 | tg3_phy_copper_begin(tp); | 1868 | tg3_phy_copper_begin(tp); |
@@ -3565,12 +3615,15 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
3565 | if (!spin_trylock(&tp->tx_lock)) | 3615 | if (!spin_trylock(&tp->tx_lock)) |
3566 | return NETDEV_TX_LOCKED; | 3616 | return NETDEV_TX_LOCKED; |
3567 | 3617 | ||
3568 | /* This is a hard error, log it. */ | ||
3569 | if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) { | 3618 | if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) { |
3570 | netif_stop_queue(dev); | 3619 | if (!netif_queue_stopped(dev)) { |
3620 | netif_stop_queue(dev); | ||
3621 | |||
3622 | /* This is a hard error, log it. */ | ||
3623 | printk(KERN_ERR PFX "%s: BUG! Tx Ring full when " | ||
3624 | "queue awake!\n", dev->name); | ||
3625 | } | ||
3571 | spin_unlock(&tp->tx_lock); | 3626 | spin_unlock(&tp->tx_lock); |
3572 | printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n", | ||
3573 | dev->name); | ||
3574 | return NETDEV_TX_BUSY; | 3627 | return NETDEV_TX_BUSY; |
3575 | } | 3628 | } |
3576 | 3629 | ||
@@ -7922,13 +7975,12 @@ static int tg3_test_memory(struct tg3 *tp) | |||
7922 | u32 offset; | 7975 | u32 offset; |
7923 | u32 len; | 7976 | u32 len; |
7924 | } mem_tbl_570x[] = { | 7977 | } mem_tbl_570x[] = { |
7925 | { 0x00000000, 0x01000}, | 7978 | { 0x00000000, 0x00b50}, |
7926 | { 0x00002000, 0x1c000}, | 7979 | { 0x00002000, 0x1c000}, |
7927 | { 0xffffffff, 0x00000} | 7980 | { 0xffffffff, 0x00000} |
7928 | }, mem_tbl_5705[] = { | 7981 | }, mem_tbl_5705[] = { |
7929 | { 0x00000100, 0x0000c}, | 7982 | { 0x00000100, 0x0000c}, |
7930 | { 0x00000200, 0x00008}, | 7983 | { 0x00000200, 0x00008}, |
7931 | { 0x00000b50, 0x00400}, | ||
7932 | { 0x00004000, 0x00800}, | 7984 | { 0x00004000, 0x00800}, |
7933 | { 0x00006000, 0x01000}, | 7985 | { 0x00006000, 0x01000}, |
7934 | { 0x00008000, 0x02000}, | 7986 | { 0x00008000, 0x02000}, |
@@ -8530,6 +8582,7 @@ static void __devinit tg3_nvram_init(struct tg3 *tp) | |||
8530 | GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) { | 8582 | GET_ASIC_REV(tp->pci_chip_rev_id) != ASIC_REV_5701) { |
8531 | tp->tg3_flags |= TG3_FLAG_NVRAM; | 8583 | tp->tg3_flags |= TG3_FLAG_NVRAM; |
8532 | 8584 | ||
8585 | tg3_nvram_lock(tp); | ||
8533 | tg3_enable_nvram_access(tp); | 8586 | tg3_enable_nvram_access(tp); |
8534 | 8587 | ||
8535 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752) | 8588 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5752) |
@@ -8540,6 +8593,7 @@ static void __devinit tg3_nvram_init(struct tg3 *tp) | |||
8540 | tg3_get_nvram_size(tp); | 8593 | tg3_get_nvram_size(tp); |
8541 | 8594 | ||
8542 | tg3_disable_nvram_access(tp); | 8595 | tg3_disable_nvram_access(tp); |
8596 | tg3_nvram_unlock(tp); | ||
8543 | 8597 | ||
8544 | } else { | 8598 | } else { |
8545 | tp->tg3_flags &= ~(TG3_FLAG_NVRAM | TG3_FLAG_NVRAM_BUFFERED); | 8599 | tp->tg3_flags &= ~(TG3_FLAG_NVRAM | TG3_FLAG_NVRAM_BUFFERED); |
@@ -8637,10 +8691,10 @@ static int tg3_nvram_read(struct tg3 *tp, u32 offset, u32 *val) | |||
8637 | if (ret == 0) | 8691 | if (ret == 0) |
8638 | *val = swab32(tr32(NVRAM_RDDATA)); | 8692 | *val = swab32(tr32(NVRAM_RDDATA)); |
8639 | 8693 | ||
8640 | tg3_nvram_unlock(tp); | ||
8641 | |||
8642 | tg3_disable_nvram_access(tp); | 8694 | tg3_disable_nvram_access(tp); |
8643 | 8695 | ||
8696 | tg3_nvram_unlock(tp); | ||
8697 | |||
8644 | return ret; | 8698 | return ret; |
8645 | } | 8699 | } |
8646 | 8700 | ||
@@ -8725,6 +8779,10 @@ static int tg3_nvram_write_block_unbuffered(struct tg3 *tp, u32 offset, u32 len, | |||
8725 | 8779 | ||
8726 | offset = offset + (pagesize - page_off); | 8780 | offset = offset + (pagesize - page_off); |
8727 | 8781 | ||
8782 | /* Nvram lock released by tg3_nvram_read() above, | ||
8783 | * so need to get it again. | ||
8784 | */ | ||
8785 | tg3_nvram_lock(tp); | ||
8728 | tg3_enable_nvram_access(tp); | 8786 | tg3_enable_nvram_access(tp); |
8729 | 8787 | ||
8730 | /* | 8788 | /* |
@@ -10423,7 +10481,7 @@ static char * __devinit tg3_bus_string(struct tg3 *tp, char *str) | |||
10423 | return str; | 10481 | return str; |
10424 | } | 10482 | } |
10425 | 10483 | ||
10426 | static struct pci_dev * __devinit tg3_find_5704_peer(struct tg3 *tp) | 10484 | static struct pci_dev * __devinit tg3_find_peer(struct tg3 *tp) |
10427 | { | 10485 | { |
10428 | struct pci_dev *peer; | 10486 | struct pci_dev *peer; |
10429 | unsigned int func, devnr = tp->pdev->devfn & ~7; | 10487 | unsigned int func, devnr = tp->pdev->devfn & ~7; |
@@ -10434,8 +10492,13 @@ static struct pci_dev * __devinit tg3_find_5704_peer(struct tg3 *tp) | |||
10434 | break; | 10492 | break; |
10435 | pci_dev_put(peer); | 10493 | pci_dev_put(peer); |
10436 | } | 10494 | } |
10437 | if (!peer || peer == tp->pdev) | 10495 | /* 5704 can be configured in single-port mode, set peer to |
10438 | BUG(); | 10496 | * tp->pdev in that case. |
10497 | */ | ||
10498 | if (!peer) { | ||
10499 | peer = tp->pdev; | ||
10500 | return peer; | ||
10501 | } | ||
10439 | 10502 | ||
10440 | /* | 10503 | /* |
10441 | * We don't need to keep the refcount elevated; there's no way | 10504 | * We don't need to keep the refcount elevated; there's no way |
@@ -10671,8 +10734,9 @@ static int __devinit tg3_init_one(struct pci_dev *pdev, | |||
10671 | tp->rx_pending = 63; | 10734 | tp->rx_pending = 63; |
10672 | } | 10735 | } |
10673 | 10736 | ||
10674 | if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) | 10737 | if ((GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5704) || |
10675 | tp->pdev_peer = tg3_find_5704_peer(tp); | 10738 | (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5714)) |
10739 | tp->pdev_peer = tg3_find_peer(tp); | ||
10676 | 10740 | ||
10677 | err = tg3_get_device_address(tp); | 10741 | err = tg3_get_device_address(tp); |
10678 | if (err) { | 10742 | if (err) { |
@@ -10817,12 +10881,14 @@ static int tg3_suspend(struct pci_dev *pdev, pm_message_t state) | |||
10817 | 10881 | ||
10818 | tg3_full_lock(tp, 0); | 10882 | tg3_full_lock(tp, 0); |
10819 | tg3_halt(tp, RESET_KIND_SHUTDOWN, 1); | 10883 | tg3_halt(tp, RESET_KIND_SHUTDOWN, 1); |
10884 | tp->tg3_flags &= ~TG3_FLAG_INIT_COMPLETE; | ||
10820 | tg3_full_unlock(tp); | 10885 | tg3_full_unlock(tp); |
10821 | 10886 | ||
10822 | err = tg3_set_power_state(tp, pci_choose_state(pdev, state)); | 10887 | err = tg3_set_power_state(tp, pci_choose_state(pdev, state)); |
10823 | if (err) { | 10888 | if (err) { |
10824 | tg3_full_lock(tp, 0); | 10889 | tg3_full_lock(tp, 0); |
10825 | 10890 | ||
10891 | tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE; | ||
10826 | tg3_init_hw(tp); | 10892 | tg3_init_hw(tp); |
10827 | 10893 | ||
10828 | tp->timer.expires = jiffies + tp->timer_offset; | 10894 | tp->timer.expires = jiffies + tp->timer_offset; |
@@ -10856,6 +10922,7 @@ static int tg3_resume(struct pci_dev *pdev) | |||
10856 | 10922 | ||
10857 | tg3_full_lock(tp, 0); | 10923 | tg3_full_lock(tp, 0); |
10858 | 10924 | ||
10925 | tp->tg3_flags |= TG3_FLAG_INIT_COMPLETE; | ||
10859 | tg3_init_hw(tp); | 10926 | tg3_init_hw(tp); |
10860 | 10927 | ||
10861 | tp->timer.expires = jiffies + tp->timer_offset; | 10928 | tp->timer.expires = jiffies + tp->timer_offset; |
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index fb7e2a5f4a08..94dbcf3537ec 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
@@ -1529,6 +1529,12 @@ | |||
1529 | #define NIC_SRAM_MAC_ADDR_HIGH_MBOX 0x00000c14 | 1529 | #define NIC_SRAM_MAC_ADDR_HIGH_MBOX 0x00000c14 |
1530 | #define NIC_SRAM_MAC_ADDR_LOW_MBOX 0x00000c18 | 1530 | #define NIC_SRAM_MAC_ADDR_LOW_MBOX 0x00000c18 |
1531 | 1531 | ||
1532 | #define NIC_SRAM_WOL_MBOX 0x00000d30 | ||
1533 | #define WOL_SIGNATURE 0x474c0000 | ||
1534 | #define WOL_DRV_STATE_SHUTDOWN 0x00000001 | ||
1535 | #define WOL_DRV_WOL 0x00000002 | ||
1536 | #define WOL_SET_MAGIC_PKT 0x00000004 | ||
1537 | |||
1532 | #define NIC_SRAM_DATA_CFG_2 0x00000d38 | 1538 | #define NIC_SRAM_DATA_CFG_2 0x00000d38 |
1533 | 1539 | ||
1534 | #define SHASTA_EXT_LED_MODE_MASK 0x00018000 | 1540 | #define SHASTA_EXT_LED_MODE_MASK 0x00018000 |
@@ -1565,6 +1571,7 @@ | |||
1565 | #define MII_TG3_EXT_CTRL 0x10 /* Extended control register */ | 1571 | #define MII_TG3_EXT_CTRL 0x10 /* Extended control register */ |
1566 | #define MII_TG3_EXT_CTRL_FIFO_ELASTIC 0x0001 | 1572 | #define MII_TG3_EXT_CTRL_FIFO_ELASTIC 0x0001 |
1567 | #define MII_TG3_EXT_CTRL_LNK3_LED_MODE 0x0002 | 1573 | #define MII_TG3_EXT_CTRL_LNK3_LED_MODE 0x0002 |
1574 | #define MII_TG3_EXT_CTRL_FORCE_LED_OFF 0x0008 | ||
1568 | #define MII_TG3_EXT_CTRL_TBI 0x8000 | 1575 | #define MII_TG3_EXT_CTRL_TBI 0x8000 |
1569 | 1576 | ||
1570 | #define MII_TG3_EXT_STAT 0x11 /* Extended status register */ | 1577 | #define MII_TG3_EXT_STAT 0x11 /* Extended status register */ |
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 716df015f8d0..6707df968934 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile | |||
@@ -6,6 +6,9 @@ obj-y += access.o bus.o probe.o remove.o pci.o quirks.o \ | |||
6 | pci-driver.o search.o pci-sysfs.o rom.o setup-res.o | 6 | pci-driver.o search.o pci-sysfs.o rom.o setup-res.o |
7 | obj-$(CONFIG_PROC_FS) += proc.o | 7 | obj-$(CONFIG_PROC_FS) += proc.o |
8 | 8 | ||
9 | # Build PCI Express stuff if needed | ||
10 | obj-$(CONFIG_PCIEPORTBUS) += pcie/ | ||
11 | |||
9 | obj-$(CONFIG_HOTPLUG) += hotplug.o | 12 | obj-$(CONFIG_HOTPLUG) += hotplug.o |
10 | 13 | ||
11 | # Build the PCI Hotplug drivers if we were asked to | 14 | # Build the PCI Hotplug drivers if we were asked to |
@@ -40,7 +43,3 @@ endif | |||
40 | ifeq ($(CONFIG_PCI_DEBUG),y) | 43 | ifeq ($(CONFIG_PCI_DEBUG),y) |
41 | EXTRA_CFLAGS += -DDEBUG | 44 | EXTRA_CFLAGS += -DDEBUG |
42 | endif | 45 | endif |
43 | |||
44 | # Build PCI Express stuff if needed | ||
45 | obj-$(CONFIG_PCIEPORTBUS) += pcie/ | ||
46 | |||
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index c12c5046e2fa..14631ac11bc7 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c | |||
@@ -249,11 +249,11 @@ static loff_t jsf_lseek(struct file * file, loff_t offset, int orig) | |||
249 | /* | 249 | /* |
250 | * OS SIMM Cannot be read in other size but a 32bits word. | 250 | * OS SIMM Cannot be read in other size but a 32bits word. |
251 | */ | 251 | */ |
252 | static ssize_t jsf_read(struct file * file, char * buf, | 252 | static ssize_t jsf_read(struct file * file, char __user * buf, |
253 | size_t togo, loff_t *ppos) | 253 | size_t togo, loff_t *ppos) |
254 | { | 254 | { |
255 | unsigned long p = *ppos; | 255 | unsigned long p = *ppos; |
256 | char *tmp = buf; | 256 | char __user *tmp = buf; |
257 | 257 | ||
258 | union byte4 { | 258 | union byte4 { |
259 | char s[4]; | 259 | char s[4]; |
@@ -305,7 +305,7 @@ static ssize_t jsf_read(struct file * file, char * buf, | |||
305 | return tmp-buf; | 305 | return tmp-buf; |
306 | } | 306 | } |
307 | 307 | ||
308 | static ssize_t jsf_write(struct file * file, const char * buf, | 308 | static ssize_t jsf_write(struct file * file, const char __user * buf, |
309 | size_t count, loff_t *ppos) | 309 | size_t count, loff_t *ppos) |
310 | { | 310 | { |
311 | return -ENOSPC; | 311 | return -ENOSPC; |
@@ -356,10 +356,10 @@ static int jsf_ioctl_erase(unsigned long arg) | |||
356 | * Program a block of flash. | 356 | * Program a block of flash. |
357 | * Very simple because we can do it byte by byte anyway. | 357 | * Very simple because we can do it byte by byte anyway. |
358 | */ | 358 | */ |
359 | static int jsf_ioctl_program(unsigned long arg) | 359 | static int jsf_ioctl_program(void __user *arg) |
360 | { | 360 | { |
361 | struct jsflash_program_arg abuf; | 361 | struct jsflash_program_arg abuf; |
362 | char *uptr; | 362 | char __user *uptr; |
363 | unsigned long p; | 363 | unsigned long p; |
364 | unsigned int togo; | 364 | unsigned int togo; |
365 | union { | 365 | union { |
@@ -367,13 +367,13 @@ static int jsf_ioctl_program(unsigned long arg) | |||
367 | char s[4]; | 367 | char s[4]; |
368 | } b; | 368 | } b; |
369 | 369 | ||
370 | if (copy_from_user(&abuf, (char *)arg, JSFPRGSZ)) | 370 | if (copy_from_user(&abuf, arg, JSFPRGSZ)) |
371 | return -EFAULT; | 371 | return -EFAULT; |
372 | p = abuf.off; | 372 | p = abuf.off; |
373 | togo = abuf.size; | 373 | togo = abuf.size; |
374 | if ((togo & 3) || (p & 3)) return -EINVAL; | 374 | if ((togo & 3) || (p & 3)) return -EINVAL; |
375 | 375 | ||
376 | uptr = (char *) (unsigned long) abuf.data; | 376 | uptr = (char __user *) (unsigned long) abuf.data; |
377 | while (togo != 0) { | 377 | while (togo != 0) { |
378 | togo -= 4; | 378 | togo -= 4; |
379 | if (copy_from_user(&b.s[0], uptr, 4)) | 379 | if (copy_from_user(&b.s[0], uptr, 4)) |
@@ -390,19 +390,20 @@ static int jsf_ioctl(struct inode *inode, struct file *f, unsigned int cmd, | |||
390 | unsigned long arg) | 390 | unsigned long arg) |
391 | { | 391 | { |
392 | int error = -ENOTTY; | 392 | int error = -ENOTTY; |
393 | void __user *argp = (void __user *)arg; | ||
393 | 394 | ||
394 | if (!capable(CAP_SYS_ADMIN)) | 395 | if (!capable(CAP_SYS_ADMIN)) |
395 | return -EPERM; | 396 | return -EPERM; |
396 | switch (cmd) { | 397 | switch (cmd) { |
397 | case JSFLASH_IDENT: | 398 | case JSFLASH_IDENT: |
398 | if (copy_to_user((void *)arg, &jsf0.id, JSFIDSZ)) | 399 | if (copy_to_user(argp, &jsf0.id, JSFIDSZ)) |
399 | return -EFAULT; | 400 | return -EFAULT; |
400 | break; | 401 | break; |
401 | case JSFLASH_ERASE: | 402 | case JSFLASH_ERASE: |
402 | error = jsf_ioctl_erase(arg); | 403 | error = jsf_ioctl_erase(arg); |
403 | break; | 404 | break; |
404 | case JSFLASH_PROGRAM: | 405 | case JSFLASH_PROGRAM: |
405 | error = jsf_ioctl_program(arg); | 406 | error = jsf_ioctl_program(argp); |
406 | break; | 407 | break; |
407 | } | 408 | } |
408 | 409 | ||
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index 858cc683f85c..e2d9a7c85427 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c | |||
@@ -309,7 +309,7 @@ static void uctrl_do_txn(struct uctrl_txn *txn) | |||
309 | } | 309 | } |
310 | } | 310 | } |
311 | 311 | ||
312 | void uctrl_get_event_status() | 312 | void uctrl_get_event_status(void) |
313 | { | 313 | { |
314 | struct uctrl_driver *driver = &drv; | 314 | struct uctrl_driver *driver = &drv; |
315 | struct uctrl_txn txn; | 315 | struct uctrl_txn txn; |
@@ -318,7 +318,7 @@ void uctrl_get_event_status() | |||
318 | txn.opcode = READ_EVENT_STATUS; | 318 | txn.opcode = READ_EVENT_STATUS; |
319 | txn.inbits = 0; | 319 | txn.inbits = 0; |
320 | txn.outbits = 2; | 320 | txn.outbits = 2; |
321 | txn.inbuf = 0; | 321 | txn.inbuf = NULL; |
322 | txn.outbuf = outbits; | 322 | txn.outbuf = outbits; |
323 | 323 | ||
324 | uctrl_do_txn(&txn); | 324 | uctrl_do_txn(&txn); |
@@ -329,7 +329,7 @@ void uctrl_get_event_status() | |||
329 | dprintk(("ev is %x\n", driver->status.event_status)); | 329 | dprintk(("ev is %x\n", driver->status.event_status)); |
330 | } | 330 | } |
331 | 331 | ||
332 | void uctrl_get_external_status() | 332 | void uctrl_get_external_status(void) |
333 | { | 333 | { |
334 | struct uctrl_driver *driver = &drv; | 334 | struct uctrl_driver *driver = &drv; |
335 | struct uctrl_txn txn; | 335 | struct uctrl_txn txn; |
@@ -339,7 +339,7 @@ void uctrl_get_external_status() | |||
339 | txn.opcode = READ_EXTERNAL_STATUS; | 339 | txn.opcode = READ_EXTERNAL_STATUS; |
340 | txn.inbits = 0; | 340 | txn.inbits = 0; |
341 | txn.outbits = 2; | 341 | txn.outbits = 2; |
342 | txn.inbuf = 0; | 342 | txn.inbuf = NULL; |
343 | txn.outbuf = outbits; | 343 | txn.outbuf = outbits; |
344 | 344 | ||
345 | uctrl_do_txn(&txn); | 345 | uctrl_do_txn(&txn); |
@@ -414,7 +414,7 @@ static void __exit ts102_uctrl_cleanup(void) | |||
414 | if (driver->irq) | 414 | if (driver->irq) |
415 | free_irq(driver->irq, driver); | 415 | free_irq(driver->irq, driver); |
416 | if (driver->regs) | 416 | if (driver->regs) |
417 | driver->regs = 0; | 417 | driver->regs = NULL; |
418 | } | 418 | } |
419 | 419 | ||
420 | module_init(ts102_uctrl_init); | 420 | module_init(ts102_uctrl_init); |
diff --git a/drivers/sbus/char/vfc.h b/drivers/sbus/char/vfc.h index a7782e7da42e..8045cd5e7cb3 100644 --- a/drivers/sbus/char/vfc.h +++ b/drivers/sbus/char/vfc.h | |||
@@ -125,7 +125,7 @@ struct vfc_regs { | |||
125 | 125 | ||
126 | 126 | ||
127 | struct vfc_dev { | 127 | struct vfc_dev { |
128 | volatile struct vfc_regs *regs; | 128 | volatile struct vfc_regs __iomem *regs; |
129 | struct vfc_regs *phys_regs; | 129 | struct vfc_regs *phys_regs; |
130 | unsigned int control_reg; | 130 | unsigned int control_reg; |
131 | struct semaphore device_lock_sem; | 131 | struct semaphore device_lock_sem; |
diff --git a/drivers/sbus/char/vfc_dev.c b/drivers/sbus/char/vfc_dev.c index 7a103698fa3c..dfdd6be551f3 100644 --- a/drivers/sbus/char/vfc_dev.c +++ b/drivers/sbus/char/vfc_dev.c | |||
@@ -149,7 +149,7 @@ int init_vfc_device(struct sbus_dev *sdev,struct vfc_dev *dev, int instance) | |||
149 | } | 149 | } |
150 | printk("Initializing vfc%d\n",instance); | 150 | printk("Initializing vfc%d\n",instance); |
151 | dev->regs = NULL; | 151 | dev->regs = NULL; |
152 | dev->regs = (volatile struct vfc_regs *) | 152 | dev->regs = (volatile struct vfc_regs __iomem *) |
153 | sbus_ioremap(&sdev->resource[0], 0, | 153 | sbus_ioremap(&sdev->resource[0], 0, |
154 | sizeof(struct vfc_regs), vfcstr); | 154 | sizeof(struct vfc_regs), vfcstr); |
155 | dev->which_io = sdev->reg_addrs[0].which_io; | 155 | dev->which_io = sdev->reg_addrs[0].which_io; |
@@ -319,7 +319,7 @@ int vfc_capture_poll(struct vfc_dev *dev) | |||
319 | int timeout = 1000; | 319 | int timeout = 1000; |
320 | 320 | ||
321 | while (!timeout--) { | 321 | while (!timeout--) { |
322 | if (dev->regs->control & VFC_STATUS_CAPTURE) | 322 | if (sbus_readl(&dev->regs->control) & VFC_STATUS_CAPTURE) |
323 | break; | 323 | break; |
324 | vfc_i2c_delay_no_busy(dev, 100); | 324 | vfc_i2c_delay_no_busy(dev, 100); |
325 | } | 325 | } |
@@ -718,7 +718,7 @@ static void deinit_vfc_device(struct vfc_dev *dev) | |||
718 | if(dev == NULL) | 718 | if(dev == NULL) |
719 | return; | 719 | return; |
720 | devfs_remove("vfc/%d", dev->instance); | 720 | devfs_remove("vfc/%d", dev->instance); |
721 | sbus_iounmap((unsigned long)dev->regs, sizeof(struct vfc_regs)); | 721 | sbus_iounmap(dev->regs, sizeof(struct vfc_regs)); |
722 | kfree(dev); | 722 | kfree(dev); |
723 | } | 723 | } |
724 | 724 | ||
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index 418fc7b896ac..6252b9ddc01e 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c | |||
@@ -660,7 +660,12 @@ static int adpt_abort(struct scsi_cmnd * cmd) | |||
660 | msg[2] = 0; | 660 | msg[2] = 0; |
661 | msg[3]= 0; | 661 | msg[3]= 0; |
662 | msg[4] = (u32)cmd; | 662 | msg[4] = (u32)cmd; |
663 | if( (rcode = adpt_i2o_post_wait(pHba, msg, sizeof(msg), FOREVER)) != 0){ | 663 | if (pHba->host) |
664 | spin_lock_irq(pHba->host->host_lock); | ||
665 | rcode = adpt_i2o_post_wait(pHba, msg, sizeof(msg), FOREVER); | ||
666 | if (pHba->host) | ||
667 | spin_unlock_irq(pHba->host->host_lock); | ||
668 | if (rcode != 0) { | ||
664 | if(rcode == -EOPNOTSUPP ){ | 669 | if(rcode == -EOPNOTSUPP ){ |
665 | printk(KERN_INFO"%s: Abort cmd not supported\n",pHba->name); | 670 | printk(KERN_INFO"%s: Abort cmd not supported\n",pHba->name); |
666 | return FAILED; | 671 | return FAILED; |
@@ -697,10 +702,15 @@ static int adpt_device_reset(struct scsi_cmnd* cmd) | |||
697 | msg[2] = 0; | 702 | msg[2] = 0; |
698 | msg[3] = 0; | 703 | msg[3] = 0; |
699 | 704 | ||
705 | if (pHba->host) | ||
706 | spin_lock_irq(pHba->host->host_lock); | ||
700 | old_state = d->state; | 707 | old_state = d->state; |
701 | d->state |= DPTI_DEV_RESET; | 708 | d->state |= DPTI_DEV_RESET; |
702 | if( (rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER)) ){ | 709 | rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER); |
703 | d->state = old_state; | 710 | d->state = old_state; |
711 | if (pHba->host) | ||
712 | spin_unlock_irq(pHba->host->host_lock); | ||
713 | if (rcode != 0) { | ||
704 | if(rcode == -EOPNOTSUPP ){ | 714 | if(rcode == -EOPNOTSUPP ){ |
705 | printk(KERN_INFO"%s: Device reset not supported\n",pHba->name); | 715 | printk(KERN_INFO"%s: Device reset not supported\n",pHba->name); |
706 | return FAILED; | 716 | return FAILED; |
@@ -708,7 +718,6 @@ static int adpt_device_reset(struct scsi_cmnd* cmd) | |||
708 | printk(KERN_INFO"%s: Device reset failed\n",pHba->name); | 718 | printk(KERN_INFO"%s: Device reset failed\n",pHba->name); |
709 | return FAILED; | 719 | return FAILED; |
710 | } else { | 720 | } else { |
711 | d->state = old_state; | ||
712 | printk(KERN_INFO"%s: Device reset successful\n",pHba->name); | 721 | printk(KERN_INFO"%s: Device reset successful\n",pHba->name); |
713 | return SUCCESS; | 722 | return SUCCESS; |
714 | } | 723 | } |
@@ -721,6 +730,7 @@ static int adpt_bus_reset(struct scsi_cmnd* cmd) | |||
721 | { | 730 | { |
722 | adpt_hba* pHba; | 731 | adpt_hba* pHba; |
723 | u32 msg[4]; | 732 | u32 msg[4]; |
733 | u32 rcode; | ||
724 | 734 | ||
725 | pHba = (adpt_hba*)cmd->device->host->hostdata[0]; | 735 | pHba = (adpt_hba*)cmd->device->host->hostdata[0]; |
726 | memset(msg, 0, sizeof(msg)); | 736 | memset(msg, 0, sizeof(msg)); |
@@ -729,7 +739,12 @@ static int adpt_bus_reset(struct scsi_cmnd* cmd) | |||
729 | msg[1] = (I2O_HBA_BUS_RESET<<24|HOST_TID<<12|pHba->channel[cmd->device->channel].tid); | 739 | msg[1] = (I2O_HBA_BUS_RESET<<24|HOST_TID<<12|pHba->channel[cmd->device->channel].tid); |
730 | msg[2] = 0; | 740 | msg[2] = 0; |
731 | msg[3] = 0; | 741 | msg[3] = 0; |
732 | if(adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER) ){ | 742 | if (pHba->host) |
743 | spin_lock_irq(pHba->host->host_lock); | ||
744 | rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER); | ||
745 | if (pHba->host) | ||
746 | spin_unlock_irq(pHba->host->host_lock); | ||
747 | if (rcode != 0) { | ||
733 | printk(KERN_WARNING"%s: Bus reset failed.\n",pHba->name); | 748 | printk(KERN_WARNING"%s: Bus reset failed.\n",pHba->name); |
734 | return FAILED; | 749 | return FAILED; |
735 | } else { | 750 | } else { |
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.h b/drivers/scsi/ibmvscsi/ibmvscsi.h index 8bec0438dc8a..5b0edd1f1921 100644 --- a/drivers/scsi/ibmvscsi/ibmvscsi.h +++ b/drivers/scsi/ibmvscsi/ibmvscsi.h | |||
@@ -100,7 +100,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue, | |||
100 | void ibmvscsi_release_crq_queue(struct crq_queue *queue, | 100 | void ibmvscsi_release_crq_queue(struct crq_queue *queue, |
101 | struct ibmvscsi_host_data *hostdata, | 101 | struct ibmvscsi_host_data *hostdata, |
102 | int max_requests); | 102 | int max_requests); |
103 | void ibmvscsi_reset_crq_queue(struct crq_queue *queue, | 103 | int ibmvscsi_reset_crq_queue(struct crq_queue *queue, |
104 | struct ibmvscsi_host_data *hostdata); | 104 | struct ibmvscsi_host_data *hostdata); |
105 | 105 | ||
106 | void ibmvscsi_handle_crq(struct viosrp_crq *crq, | 106 | void ibmvscsi_handle_crq(struct viosrp_crq *crq, |
diff --git a/drivers/scsi/ibmvscsi/iseries_vscsi.c b/drivers/scsi/ibmvscsi/iseries_vscsi.c index 1045872b0175..ce15d9e39621 100644 --- a/drivers/scsi/ibmvscsi/iseries_vscsi.c +++ b/drivers/scsi/ibmvscsi/iseries_vscsi.c | |||
@@ -117,9 +117,10 @@ void ibmvscsi_release_crq_queue(struct crq_queue *queue, | |||
117 | * | 117 | * |
118 | * no-op for iSeries | 118 | * no-op for iSeries |
119 | */ | 119 | */ |
120 | void ibmvscsi_reset_crq_queue(struct crq_queue *queue, | 120 | int ibmvscsi_reset_crq_queue(struct crq_queue *queue, |
121 | struct ibmvscsi_host_data *hostdata) | 121 | struct ibmvscsi_host_data *hostdata) |
122 | { | 122 | { |
123 | return 0; | ||
123 | } | 124 | } |
124 | 125 | ||
125 | /** | 126 | /** |
diff --git a/drivers/scsi/ibmvscsi/rpa_vscsi.c b/drivers/scsi/ibmvscsi/rpa_vscsi.c index 8bf5652f1060..75db2f5c545e 100644 --- a/drivers/scsi/ibmvscsi/rpa_vscsi.c +++ b/drivers/scsi/ibmvscsi/rpa_vscsi.c | |||
@@ -230,6 +230,11 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue, | |||
230 | rc = plpar_hcall_norets(H_REG_CRQ, | 230 | rc = plpar_hcall_norets(H_REG_CRQ, |
231 | vdev->unit_address, | 231 | vdev->unit_address, |
232 | queue->msg_token, PAGE_SIZE); | 232 | queue->msg_token, PAGE_SIZE); |
233 | if (rc == H_Resource) | ||
234 | /* maybe kexecing and resource is busy. try a reset */ | ||
235 | rc = ibmvscsi_reset_crq_queue(queue, | ||
236 | hostdata); | ||
237 | |||
233 | if (rc == 2) { | 238 | if (rc == 2) { |
234 | /* Adapter is good, but other end is not ready */ | 239 | /* Adapter is good, but other end is not ready */ |
235 | printk(KERN_WARNING "ibmvscsi: Partner adapter not ready\n"); | 240 | printk(KERN_WARNING "ibmvscsi: Partner adapter not ready\n"); |
@@ -281,7 +286,7 @@ int ibmvscsi_init_crq_queue(struct crq_queue *queue, | |||
281 | * @hostdata: ibmvscsi_host_data of host | 286 | * @hostdata: ibmvscsi_host_data of host |
282 | * | 287 | * |
283 | */ | 288 | */ |
284 | void ibmvscsi_reset_crq_queue(struct crq_queue *queue, | 289 | int ibmvscsi_reset_crq_queue(struct crq_queue *queue, |
285 | struct ibmvscsi_host_data *hostdata) | 290 | struct ibmvscsi_host_data *hostdata) |
286 | { | 291 | { |
287 | int rc; | 292 | int rc; |
@@ -309,4 +314,5 @@ void ibmvscsi_reset_crq_queue(struct crq_queue *queue, | |||
309 | printk(KERN_WARNING | 314 | printk(KERN_WARNING |
310 | "ibmvscsi: couldn't register crq--rc 0x%x\n", rc); | 315 | "ibmvscsi: couldn't register crq--rc 0x%x\n", rc); |
311 | } | 316 | } |
317 | return rc; | ||
312 | } | 318 | } |
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 4fea3e4edaa7..3d8009f55342 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c | |||
@@ -3368,7 +3368,7 @@ iscsi_conn_set_param(iscsi_connh_t connh, enum iscsi_param param, | |||
3368 | switch(param) { | 3368 | switch(param) { |
3369 | case ISCSI_PARAM_MAX_RECV_DLENGTH: { | 3369 | case ISCSI_PARAM_MAX_RECV_DLENGTH: { |
3370 | char *saveptr = conn->data; | 3370 | char *saveptr = conn->data; |
3371 | int flags = GFP_KERNEL; | 3371 | gfp_t flags = GFP_KERNEL; |
3372 | 3372 | ||
3373 | if (conn->data_size >= value) { | 3373 | if (conn->data_size >= value) { |
3374 | conn->max_recv_dlength = value; | 3374 | conn->max_recv_dlength = value; |
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 665ae79e1fd6..d0a0fdbd0fc4 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c | |||
@@ -2443,7 +2443,7 @@ static void ata_sg_clean(struct ata_queued_cmd *qc) | |||
2443 | struct scatterlist *psg = &qc->pad_sgent; | 2443 | struct scatterlist *psg = &qc->pad_sgent; |
2444 | void *addr = kmap_atomic(psg->page, KM_IRQ0); | 2444 | void *addr = kmap_atomic(psg->page, KM_IRQ0); |
2445 | memcpy(addr + psg->offset, pad_buf, qc->pad_len); | 2445 | memcpy(addr + psg->offset, pad_buf, qc->pad_len); |
2446 | kunmap_atomic(psg->page, KM_IRQ0); | 2446 | kunmap_atomic(addr, KM_IRQ0); |
2447 | } | 2447 | } |
2448 | } else { | 2448 | } else { |
2449 | if (sg_dma_len(&sg[0]) > 0) | 2449 | if (sg_dma_len(&sg[0]) > 0) |
@@ -2717,7 +2717,7 @@ static int ata_sg_setup(struct ata_queued_cmd *qc) | |||
2717 | if (qc->tf.flags & ATA_TFLAG_WRITE) { | 2717 | if (qc->tf.flags & ATA_TFLAG_WRITE) { |
2718 | void *addr = kmap_atomic(psg->page, KM_IRQ0); | 2718 | void *addr = kmap_atomic(psg->page, KM_IRQ0); |
2719 | memcpy(pad_buf, addr + psg->offset, qc->pad_len); | 2719 | memcpy(pad_buf, addr + psg->offset, qc->pad_len); |
2720 | kunmap_atomic(psg->page, KM_IRQ0); | 2720 | kunmap_atomic(addr, KM_IRQ0); |
2721 | } | 2721 | } |
2722 | 2722 | ||
2723 | sg_dma_address(psg) = ap->pad_dma + (qc->tag * ATA_DMA_PAD_SZ); | 2723 | sg_dma_address(psg) = ap->pad_dma + (qc->tag * ATA_DMA_PAD_SZ); |
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 379e87089764..72ddba98f8fb 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c | |||
@@ -2173,9 +2173,12 @@ ata_scsi_find_dev(struct ata_port *ap, const struct scsi_device *scsidev) | |||
2173 | if (unlikely(!ata_dev_present(dev))) | 2173 | if (unlikely(!ata_dev_present(dev))) |
2174 | return NULL; | 2174 | return NULL; |
2175 | 2175 | ||
2176 | if (!atapi_enabled) { | 2176 | if (!atapi_enabled || (ap->flags & ATA_FLAG_NO_ATAPI)) { |
2177 | if (unlikely(dev->class == ATA_DEV_ATAPI)) | 2177 | if (unlikely(dev->class == ATA_DEV_ATAPI)) { |
2178 | printk(KERN_WARNING "ata%u(%u): WARNING: ATAPI is %s, device ignored.\n", | ||
2179 | ap->id, dev->devno, atapi_enabled ? "not supported with this driver" : "disabled"); | ||
2178 | return NULL; | 2180 | return NULL; |
2181 | } | ||
2179 | } | 2182 | } |
2180 | 2183 | ||
2181 | return dev; | 2184 | return dev; |
diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index f9792528e33f..578143e93a6f 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c | |||
@@ -664,7 +664,7 @@ mega_build_cmd(adapter_t *adapter, Scsi_Cmnd *cmd, int *busy) | |||
664 | sg->offset; | 664 | sg->offset; |
665 | } else | 665 | } else |
666 | buf = cmd->request_buffer; | 666 | buf = cmd->request_buffer; |
667 | memset(cmd->request_buffer, 0, cmd->cmnd[4]); | 667 | memset(buf, 0, cmd->cmnd[4]); |
668 | if (cmd->use_sg) { | 668 | if (cmd->use_sg) { |
669 | struct scatterlist *sg; | 669 | struct scatterlist *sg; |
670 | 670 | ||
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index 7096945ea234..7b3efd531297 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h | |||
@@ -2476,17 +2476,9 @@ typedef struct scsi_qla_host { | |||
2476 | */ | 2476 | */ |
2477 | #define LOOP_TRANSITION(ha) \ | 2477 | #define LOOP_TRANSITION(ha) \ |
2478 | (test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \ | 2478 | (test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \ |
2479 | test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags)) | 2479 | test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \ |
2480 | |||
2481 | #define LOOP_NOT_READY(ha) \ | ||
2482 | ((test_bit(ISP_ABORT_NEEDED, &ha->dpc_flags) || \ | ||
2483 | test_bit(ABORT_ISP_ACTIVE, &ha->dpc_flags) || \ | ||
2484 | test_bit(LOOP_RESYNC_NEEDED, &ha->dpc_flags) || \ | ||
2485 | test_bit(LOOP_RESYNC_ACTIVE, &ha->dpc_flags)) || \ | ||
2486 | atomic_read(&ha->loop_state) == LOOP_DOWN) | 2480 | atomic_read(&ha->loop_state) == LOOP_DOWN) |
2487 | 2481 | ||
2488 | #define LOOP_RDY(ha) (!LOOP_NOT_READY(ha)) | ||
2489 | |||
2490 | #define TGT_Q(ha, t) (ha->otgt[t]) | 2482 | #define TGT_Q(ha, t) (ha->otgt[t]) |
2491 | 2483 | ||
2492 | #define to_qla_host(x) ((scsi_qla_host_t *) (x)->hostdata) | 2484 | #define to_qla_host(x) ((scsi_qla_host_t *) (x)->hostdata) |
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 2d720121a0d3..c46d2469b85f 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c | |||
@@ -1259,7 +1259,7 @@ qla2x00_configure_hba(scsi_qla_host_t *ha) | |||
1259 | rval = qla2x00_get_adapter_id(ha, | 1259 | rval = qla2x00_get_adapter_id(ha, |
1260 | &loop_id, &al_pa, &area, &domain, &topo); | 1260 | &loop_id, &al_pa, &area, &domain, &topo); |
1261 | if (rval != QLA_SUCCESS) { | 1261 | if (rval != QLA_SUCCESS) { |
1262 | if (LOOP_NOT_READY(ha) || atomic_read(&ha->loop_down_timer) || | 1262 | if (LOOP_TRANSITION(ha) || atomic_read(&ha->loop_down_timer) || |
1263 | (rval == QLA_COMMAND_ERROR && loop_id == 0x7)) { | 1263 | (rval == QLA_COMMAND_ERROR && loop_id == 0x7)) { |
1264 | DEBUG2(printk("%s(%ld) Loop is in a transition state\n", | 1264 | DEBUG2(printk("%s(%ld) Loop is in a transition state\n", |
1265 | __func__, ha->host_no)); | 1265 | __func__, ha->host_no)); |
@@ -1796,7 +1796,7 @@ qla2x00_configure_loop(scsi_qla_host_t *ha) | |||
1796 | } | 1796 | } |
1797 | 1797 | ||
1798 | if (rval == QLA_SUCCESS && test_bit(RSCN_UPDATE, &flags)) { | 1798 | if (rval == QLA_SUCCESS && test_bit(RSCN_UPDATE, &flags)) { |
1799 | if (LOOP_NOT_READY(ha)) { | 1799 | if (LOOP_TRANSITION(ha)) { |
1800 | rval = QLA_FUNCTION_FAILED; | 1800 | rval = QLA_FUNCTION_FAILED; |
1801 | } else { | 1801 | } else { |
1802 | rval = qla2x00_configure_fabric(ha); | 1802 | rval = qla2x00_configure_fabric(ha); |
@@ -2369,7 +2369,7 @@ qla2x00_find_all_fabric_devs(scsi_qla_host_t *ha, struct list_head *new_fcports) | |||
2369 | if (qla2x00_is_reserved_id(ha, loop_id)) | 2369 | if (qla2x00_is_reserved_id(ha, loop_id)) |
2370 | continue; | 2370 | continue; |
2371 | 2371 | ||
2372 | if (atomic_read(&ha->loop_down_timer) || LOOP_NOT_READY(ha)) | 2372 | if (atomic_read(&ha->loop_down_timer) || LOOP_TRANSITION(ha)) |
2373 | break; | 2373 | break; |
2374 | 2374 | ||
2375 | if (swl != NULL) { | 2375 | if (swl != NULL) { |
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 09afc0f06bd4..5181d966fecb 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c | |||
@@ -909,6 +909,21 @@ qla2x00_status_entry(scsi_qla_host_t *ha, void *pkt) | |||
909 | resid = resid_len; | 909 | resid = resid_len; |
910 | cp->resid = resid; | 910 | cp->resid = resid; |
911 | CMD_RESID_LEN(cp) = resid; | 911 | CMD_RESID_LEN(cp) = resid; |
912 | |||
913 | if (!lscsi_status && | ||
914 | ((unsigned)(cp->request_bufflen - resid) < | ||
915 | cp->underflow)) { | ||
916 | qla_printk(KERN_INFO, ha, | ||
917 | "scsi(%ld:%d:%d:%d): Mid-layer underflow " | ||
918 | "detected (%x of %x bytes)...returning " | ||
919 | "error status.\n", ha->host_no, | ||
920 | cp->device->channel, cp->device->id, | ||
921 | cp->device->lun, resid, | ||
922 | cp->request_bufflen); | ||
923 | |||
924 | cp->result = DID_ERROR << 16; | ||
925 | break; | ||
926 | } | ||
912 | } | 927 | } |
913 | cp->result = DID_OK << 16 | lscsi_status; | 928 | cp->result = DID_OK << 16 | lscsi_status; |
914 | 929 | ||
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index ab7432a5778e..9321cdf45680 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c | |||
@@ -86,7 +86,8 @@ enum { | |||
86 | MV_FLAG_DUAL_HC = (1 << 30), /* two SATA Host Controllers */ | 86 | MV_FLAG_DUAL_HC = (1 << 30), /* two SATA Host Controllers */ |
87 | MV_FLAG_IRQ_COALESCE = (1 << 29), /* IRQ coalescing capability */ | 87 | MV_FLAG_IRQ_COALESCE = (1 << 29), /* IRQ coalescing capability */ |
88 | MV_COMMON_FLAGS = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 88 | MV_COMMON_FLAGS = (ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
89 | ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO), | 89 | ATA_FLAG_SATA_RESET | ATA_FLAG_MMIO | |
90 | ATA_FLAG_NO_ATAPI), | ||
90 | MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE, | 91 | MV_6XXX_FLAGS = MV_FLAG_IRQ_COALESCE, |
91 | 92 | ||
92 | CRQB_FLAG_READ = (1 << 0), | 93 | CRQB_FLAG_READ = (1 << 0), |
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index 8a8e3e3ef0ed..2691625f9bce 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c | |||
@@ -70,6 +70,9 @@ enum { | |||
70 | PDC_HAS_PATA = (1 << 1), /* PDC20375 has PATA */ | 70 | PDC_HAS_PATA = (1 << 1), /* PDC20375 has PATA */ |
71 | 71 | ||
72 | PDC_RESET = (1 << 11), /* HDMA reset */ | 72 | PDC_RESET = (1 << 11), /* HDMA reset */ |
73 | |||
74 | PDC_COMMON_FLAGS = ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST | | ||
75 | ATA_FLAG_MMIO | ATA_FLAG_NO_ATAPI, | ||
73 | }; | 76 | }; |
74 | 77 | ||
75 | 78 | ||
@@ -162,8 +165,7 @@ static struct ata_port_info pdc_port_info[] = { | |||
162 | /* board_2037x */ | 165 | /* board_2037x */ |
163 | { | 166 | { |
164 | .sht = &pdc_ata_sht, | 167 | .sht = &pdc_ata_sht, |
165 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 168 | .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, |
166 | ATA_FLAG_SRST | ATA_FLAG_MMIO, | ||
167 | .pio_mask = 0x1f, /* pio0-4 */ | 169 | .pio_mask = 0x1f, /* pio0-4 */ |
168 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 170 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
169 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 171 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ |
@@ -173,8 +175,7 @@ static struct ata_port_info pdc_port_info[] = { | |||
173 | /* board_20319 */ | 175 | /* board_20319 */ |
174 | { | 176 | { |
175 | .sht = &pdc_ata_sht, | 177 | .sht = &pdc_ata_sht, |
176 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 178 | .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SATA, |
177 | ATA_FLAG_SRST | ATA_FLAG_MMIO, | ||
178 | .pio_mask = 0x1f, /* pio0-4 */ | 179 | .pio_mask = 0x1f, /* pio0-4 */ |
179 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 180 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
180 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 181 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ |
@@ -184,8 +185,7 @@ static struct ata_port_info pdc_port_info[] = { | |||
184 | /* board_20619 */ | 185 | /* board_20619 */ |
185 | { | 186 | { |
186 | .sht = &pdc_ata_sht, | 187 | .sht = &pdc_ata_sht, |
187 | .host_flags = ATA_FLAG_NO_LEGACY | ATA_FLAG_SRST | | 188 | .host_flags = PDC_COMMON_FLAGS | ATA_FLAG_SLAVE_POSS, |
188 | ATA_FLAG_MMIO | ATA_FLAG_SLAVE_POSS, | ||
189 | .pio_mask = 0x1f, /* pio0-4 */ | 189 | .pio_mask = 0x1f, /* pio0-4 */ |
190 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 190 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
191 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 191 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ |
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c index dcc3ad9a9d6e..ac7b0d819ebc 100644 --- a/drivers/scsi/sata_sx4.c +++ b/drivers/scsi/sata_sx4.c | |||
@@ -220,7 +220,8 @@ static struct ata_port_info pdc_port_info[] = { | |||
220 | { | 220 | { |
221 | .sht = &pdc_sata_sht, | 221 | .sht = &pdc_sata_sht, |
222 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | | 222 | .host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY | |
223 | ATA_FLAG_SRST | ATA_FLAG_MMIO, | 223 | ATA_FLAG_SRST | ATA_FLAG_MMIO | |
224 | ATA_FLAG_NO_ATAPI, | ||
224 | .pio_mask = 0x1f, /* pio0-4 */ | 225 | .pio_mask = 0x1f, /* pio0-4 */ |
225 | .mwdma_mask = 0x07, /* mwdma0-2 */ | 226 | .mwdma_mask = 0x07, /* mwdma0-2 */ |
226 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ | 227 | .udma_mask = 0x7f, /* udma0-6 ; FIXME */ |
diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c index 18c5d2523014..c0ae9e965f6f 100644 --- a/drivers/scsi/scsi_error.c +++ b/drivers/scsi/scsi_error.c | |||
@@ -422,10 +422,15 @@ static int scsi_eh_completed_normally(struct scsi_cmnd *scmd) | |||
422 | **/ | 422 | **/ |
423 | static void scsi_eh_done(struct scsi_cmnd *scmd) | 423 | static void scsi_eh_done(struct scsi_cmnd *scmd) |
424 | { | 424 | { |
425 | struct completion *eh_action; | ||
426 | |||
425 | SCSI_LOG_ERROR_RECOVERY(3, | 427 | SCSI_LOG_ERROR_RECOVERY(3, |
426 | printk("%s scmd: %p result: %x\n", | 428 | printk("%s scmd: %p result: %x\n", |
427 | __FUNCTION__, scmd, scmd->result)); | 429 | __FUNCTION__, scmd, scmd->result)); |
428 | complete(scmd->device->host->eh_action); | 430 | |
431 | eh_action = scmd->device->host->eh_action; | ||
432 | if (eh_action) | ||
433 | complete(eh_action); | ||
429 | } | 434 | } |
430 | 435 | ||
431 | /** | 436 | /** |
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 4afef5cdcb17..dc249cb970ea 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
@@ -542,10 +542,17 @@ static void scsi_requeue_command(struct request_queue *q, struct scsi_cmnd *cmd) | |||
542 | 542 | ||
543 | void scsi_next_command(struct scsi_cmnd *cmd) | 543 | void scsi_next_command(struct scsi_cmnd *cmd) |
544 | { | 544 | { |
545 | struct request_queue *q = cmd->device->request_queue; | 545 | struct scsi_device *sdev = cmd->device; |
546 | struct request_queue *q = sdev->request_queue; | ||
547 | |||
548 | /* need to hold a reference on the device before we let go of the cmd */ | ||
549 | get_device(&sdev->sdev_gendev); | ||
546 | 550 | ||
547 | scsi_put_command(cmd); | 551 | scsi_put_command(cmd); |
548 | scsi_run_queue(q); | 552 | scsi_run_queue(q); |
553 | |||
554 | /* ok to remove device now */ | ||
555 | put_device(&sdev->sdev_gendev); | ||
549 | } | 556 | } |
550 | 557 | ||
551 | void scsi_run_host_queues(struct Scsi_Host *shost) | 558 | void scsi_run_host_queues(struct Scsi_Host *shost) |
@@ -1078,6 +1085,26 @@ static void scsi_generic_done(struct scsi_cmnd *cmd) | |||
1078 | scsi_io_completion(cmd, cmd->result == 0 ? cmd->bufflen : 0, 0); | 1085 | scsi_io_completion(cmd, cmd->result == 0 ? cmd->bufflen : 0, 0); |
1079 | } | 1086 | } |
1080 | 1087 | ||
1088 | void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd, int retries) | ||
1089 | { | ||
1090 | struct request *req = cmd->request; | ||
1091 | |||
1092 | BUG_ON(sizeof(req->cmd) > sizeof(cmd->cmnd)); | ||
1093 | memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd)); | ||
1094 | cmd->cmd_len = req->cmd_len; | ||
1095 | if (!req->data_len) | ||
1096 | cmd->sc_data_direction = DMA_NONE; | ||
1097 | else if (rq_data_dir(req) == WRITE) | ||
1098 | cmd->sc_data_direction = DMA_TO_DEVICE; | ||
1099 | else | ||
1100 | cmd->sc_data_direction = DMA_FROM_DEVICE; | ||
1101 | |||
1102 | cmd->transfersize = req->data_len; | ||
1103 | cmd->allowed = retries; | ||
1104 | cmd->timeout_per_command = req->timeout; | ||
1105 | } | ||
1106 | EXPORT_SYMBOL_GPL(scsi_setup_blk_pc_cmnd); | ||
1107 | |||
1081 | static int scsi_prep_fn(struct request_queue *q, struct request *req) | 1108 | static int scsi_prep_fn(struct request_queue *q, struct request *req) |
1082 | { | 1109 | { |
1083 | struct scsi_device *sdev = q->queuedata; | 1110 | struct scsi_device *sdev = q->queuedata; |
@@ -1213,18 +1240,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req) | |||
1213 | goto kill; | 1240 | goto kill; |
1214 | } | 1241 | } |
1215 | } else { | 1242 | } else { |
1216 | memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd)); | 1243 | scsi_setup_blk_pc_cmnd(cmd, 3); |
1217 | cmd->cmd_len = req->cmd_len; | ||
1218 | if (rq_data_dir(req) == WRITE) | ||
1219 | cmd->sc_data_direction = DMA_TO_DEVICE; | ||
1220 | else if (req->data_len) | ||
1221 | cmd->sc_data_direction = DMA_FROM_DEVICE; | ||
1222 | else | ||
1223 | cmd->sc_data_direction = DMA_NONE; | ||
1224 | |||
1225 | cmd->transfersize = req->data_len; | ||
1226 | cmd->allowed = 3; | ||
1227 | cmd->timeout_per_command = req->timeout; | ||
1228 | cmd->done = scsi_generic_done; | 1244 | cmd->done = scsi_generic_done; |
1229 | } | 1245 | } |
1230 | } | 1246 | } |
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index 374853df9cca..94e5167f260d 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c | |||
@@ -266,8 +266,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, | |||
266 | /* | 266 | /* |
267 | * if LLDD reports slave not present, don't clutter | 267 | * if LLDD reports slave not present, don't clutter |
268 | * console with alloc failure messages | 268 | * console with alloc failure messages |
269 | |||
270 | |||
271 | */ | 269 | */ |
272 | if (ret == -ENXIO) | 270 | if (ret == -ENXIO) |
273 | display_failure_msg = 0; | 271 | display_failure_msg = 0; |
@@ -279,7 +277,6 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, | |||
279 | 277 | ||
280 | out_device_destroy: | 278 | out_device_destroy: |
281 | transport_destroy_device(&sdev->sdev_gendev); | 279 | transport_destroy_device(&sdev->sdev_gendev); |
282 | scsi_free_queue(sdev->request_queue); | ||
283 | put_device(&sdev->sdev_gendev); | 280 | put_device(&sdev->sdev_gendev); |
284 | out: | 281 | out: |
285 | if (display_failure_msg) | 282 | if (display_failure_msg) |
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c index 49fd18c1a9c6..e08462d50c97 100644 --- a/drivers/scsi/scsi_transport_iscsi.c +++ b/drivers/scsi/scsi_transport_iscsi.c | |||
@@ -249,7 +249,7 @@ static inline struct list_head *skb_to_lh(struct sk_buff *skb) | |||
249 | } | 249 | } |
250 | 250 | ||
251 | static void* | 251 | static void* |
252 | mempool_zone_alloc_skb(unsigned int gfp_mask, void *pool_data) | 252 | mempool_zone_alloc_skb(gfp_t gfp_mask, void *pool_data) |
253 | { | 253 | { |
254 | struct mempool_zone *zone = pool_data; | 254 | struct mempool_zone *zone = pool_data; |
255 | 255 | ||
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 8613a1317712..03fcbab30033 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c | |||
@@ -245,24 +245,10 @@ static int sd_init_command(struct scsi_cmnd * SCpnt) | |||
245 | * SG_IO from block layer already setup, just copy cdb basically | 245 | * SG_IO from block layer already setup, just copy cdb basically |
246 | */ | 246 | */ |
247 | if (blk_pc_request(rq)) { | 247 | if (blk_pc_request(rq)) { |
248 | if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd)) | 248 | scsi_setup_blk_pc_cmnd(SCpnt, SD_PASSTHROUGH_RETRIES); |
249 | return 0; | ||
250 | |||
251 | memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd)); | ||
252 | SCpnt->cmd_len = rq->cmd_len; | ||
253 | if (rq_data_dir(rq) == WRITE) | ||
254 | SCpnt->sc_data_direction = DMA_TO_DEVICE; | ||
255 | else if (rq->data_len) | ||
256 | SCpnt->sc_data_direction = DMA_FROM_DEVICE; | ||
257 | else | ||
258 | SCpnt->sc_data_direction = DMA_NONE; | ||
259 | |||
260 | this_count = rq->data_len; | ||
261 | if (rq->timeout) | 249 | if (rq->timeout) |
262 | timeout = rq->timeout; | 250 | timeout = rq->timeout; |
263 | 251 | ||
264 | SCpnt->transfersize = rq->data_len; | ||
265 | SCpnt->allowed = SD_PASSTHROUGH_RETRIES; | ||
266 | goto queue; | 252 | goto queue; |
267 | } | 253 | } |
268 | 254 | ||
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index d68cea753bb2..fb4012b5c188 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c | |||
@@ -320,25 +320,11 @@ static int sr_init_command(struct scsi_cmnd * SCpnt) | |||
320 | * these are already setup, just copy cdb basically | 320 | * these are already setup, just copy cdb basically |
321 | */ | 321 | */ |
322 | if (SCpnt->request->flags & REQ_BLOCK_PC) { | 322 | if (SCpnt->request->flags & REQ_BLOCK_PC) { |
323 | struct request *rq = SCpnt->request; | 323 | scsi_setup_blk_pc_cmnd(SCpnt, MAX_RETRIES); |
324 | 324 | ||
325 | if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd)) | 325 | if (SCpnt->timeout_per_command) |
326 | return 0; | 326 | timeout = SCpnt->timeout_per_command; |
327 | |||
328 | memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd)); | ||
329 | SCpnt->cmd_len = rq->cmd_len; | ||
330 | if (!rq->data_len) | ||
331 | SCpnt->sc_data_direction = DMA_NONE; | ||
332 | else if (rq_data_dir(rq) == WRITE) | ||
333 | SCpnt->sc_data_direction = DMA_TO_DEVICE; | ||
334 | else | ||
335 | SCpnt->sc_data_direction = DMA_FROM_DEVICE; | ||
336 | |||
337 | this_count = rq->data_len; | ||
338 | if (rq->timeout) | ||
339 | timeout = rq->timeout; | ||
340 | 327 | ||
341 | SCpnt->transfersize = rq->data_len; | ||
342 | goto queue; | 328 | goto queue; |
343 | } | 329 | } |
344 | 330 | ||
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 7ac6ea141fff..dd592f6a2529 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
@@ -4194,27 +4194,10 @@ static void st_intr(struct scsi_cmnd *SCpnt) | |||
4194 | */ | 4194 | */ |
4195 | static int st_init_command(struct scsi_cmnd *SCpnt) | 4195 | static int st_init_command(struct scsi_cmnd *SCpnt) |
4196 | { | 4196 | { |
4197 | struct request *rq; | ||
4198 | |||
4199 | if (!(SCpnt->request->flags & REQ_BLOCK_PC)) | 4197 | if (!(SCpnt->request->flags & REQ_BLOCK_PC)) |
4200 | return 0; | 4198 | return 0; |
4201 | 4199 | ||
4202 | rq = SCpnt->request; | 4200 | scsi_setup_blk_pc_cmnd(SCpnt, 0); |
4203 | if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd)) | ||
4204 | return 0; | ||
4205 | |||
4206 | memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd)); | ||
4207 | SCpnt->cmd_len = rq->cmd_len; | ||
4208 | |||
4209 | if (rq_data_dir(rq) == WRITE) | ||
4210 | SCpnt->sc_data_direction = DMA_TO_DEVICE; | ||
4211 | else if (rq->data_len) | ||
4212 | SCpnt->sc_data_direction = DMA_FROM_DEVICE; | ||
4213 | else | ||
4214 | SCpnt->sc_data_direction = DMA_NONE; | ||
4215 | |||
4216 | SCpnt->timeout_per_command = rq->timeout; | ||
4217 | SCpnt->transfersize = rq->data_len; | ||
4218 | SCpnt->done = st_intr; | 4201 | SCpnt->done = st_intr; |
4219 | return 1; | 4202 | return 1; |
4220 | } | 4203 | } |
diff --git a/drivers/scsi/sym53c8xx_2/sym_hipd.c b/drivers/scsi/sym53c8xx_2/sym_hipd.c index a7420cad4547..1564ca203a3e 100644 --- a/drivers/scsi/sym53c8xx_2/sym_hipd.c +++ b/drivers/scsi/sym53c8xx_2/sym_hipd.c | |||
@@ -1405,7 +1405,6 @@ static void sym_check_goals(struct sym_hcb *np, struct scsi_target *starget, | |||
1405 | goal->iu = 0; | 1405 | goal->iu = 0; |
1406 | goal->dt = 0; | 1406 | goal->dt = 0; |
1407 | goal->qas = 0; | 1407 | goal->qas = 0; |
1408 | goal->period = 0; | ||
1409 | goal->offset = 0; | 1408 | goal->offset = 0; |
1410 | return; | 1409 | return; |
1411 | } | 1410 | } |
@@ -1465,7 +1464,8 @@ static int sym_prepare_nego(struct sym_hcb *np, struct sym_ccb *cp, u_char *msgp | |||
1465 | * Many devices implement PPR in a buggy way, so only use it if we | 1464 | * Many devices implement PPR in a buggy way, so only use it if we |
1466 | * really want to. | 1465 | * really want to. |
1467 | */ | 1466 | */ |
1468 | if (goal->iu || goal->dt || goal->qas || (goal->period < 0xa)) { | 1467 | if (goal->offset && |
1468 | (goal->iu || goal->dt || goal->qas || (goal->period < 0xa))) { | ||
1469 | nego = NS_PPR; | 1469 | nego = NS_PPR; |
1470 | } else if (spi_width(starget) != goal->width) { | 1470 | } else if (spi_width(starget) != goal->width) { |
1471 | nego = NS_WIDE; | 1471 | nego = NS_WIDE; |
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index 8d92adfbb8bd..8adca0ce267f 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
@@ -516,7 +516,7 @@ pci_timedia_setup(struct serial_private *priv, struct pciserial_board *board, | |||
516 | break; | 516 | break; |
517 | case 3: | 517 | case 3: |
518 | offset = board->uart_offset; | 518 | offset = board->uart_offset; |
519 | bar = 1; | 519 | /* FALLTHROUGH */ |
520 | case 4: /* BAR 2 */ | 520 | case 4: /* BAR 2 */ |
521 | case 5: /* BAR 3 */ | 521 | case 5: /* BAR 3 */ |
522 | case 6: /* BAR 4 */ | 522 | case 6: /* BAR 4 */ |
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c index ed550132db0b..79efaf7d86a3 100644 --- a/drivers/usb/host/uhci-hcd.c +++ b/drivers/usb/host/uhci-hcd.c | |||
@@ -717,6 +717,7 @@ static int uhci_suspend(struct usb_hcd *hcd, pm_message_t message) | |||
717 | * at the source, so we must turn off PIRQ. | 717 | * at the source, so we must turn off PIRQ. |
718 | */ | 718 | */ |
719 | pci_write_config_word(to_pci_dev(uhci_dev(uhci)), USBLEGSUP, 0); | 719 | pci_write_config_word(to_pci_dev(uhci_dev(uhci)), USBLEGSUP, 0); |
720 | mb(); | ||
720 | clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); | 721 | clear_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); |
721 | uhci->hc_inaccessible = 1; | 722 | uhci->hc_inaccessible = 1; |
722 | hcd->poll_rh = 0; | 723 | hcd->poll_rh = 0; |
@@ -738,6 +739,7 @@ static int uhci_resume(struct usb_hcd *hcd) | |||
738 | * really don't want to keep a stale HCD_FLAG_HW_ACCESSIBLE=0 | 739 | * really don't want to keep a stale HCD_FLAG_HW_ACCESSIBLE=0 |
739 | */ | 740 | */ |
740 | set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); | 741 | set_bit(HCD_FLAG_HW_ACCESSIBLE, &hcd->flags); |
742 | mb(); | ||
741 | 743 | ||
742 | if (uhci->rh_state == UHCI_RH_RESET) /* Dead */ | 744 | if (uhci->rh_state == UHCI_RH_RESET) /* Dead */ |
743 | return 0; | 745 | return 0; |
diff --git a/drivers/usb/input/hid-core.c b/drivers/usb/input/hid-core.c index 45f3130fadea..a3e44ef1df43 100644 --- a/drivers/usb/input/hid-core.c +++ b/drivers/usb/input/hid-core.c | |||
@@ -893,8 +893,10 @@ static int hid_input_report(int type, struct urb *urb, int interrupt, struct pt_ | |||
893 | 893 | ||
894 | size = ((report->size - 1) >> 3) + 1; | 894 | size = ((report->size - 1) >> 3) + 1; |
895 | 895 | ||
896 | if (len < size) | 896 | if (len < size) { |
897 | dbg("report %d is too short, (%d < %d)", report->id, len, size); | 897 | dbg("report %d is too short, (%d < %d)", report->id, len, size); |
898 | memset(data + len, 0, size - len); | ||
899 | } | ||
898 | 900 | ||
899 | if (hid->claimed & HID_CLAIMED_HIDDEV) | 901 | if (hid->claimed & HID_CLAIMED_HIDDEV) |
900 | hiddev_report_event(hid, report); | 902 | hiddev_report_event(hid, report); |
diff --git a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c index 9ff25eb520a6..1220a5004a5c 100644 --- a/drivers/usb/input/hid-input.c +++ b/drivers/usb/input/hid-input.c | |||
@@ -137,6 +137,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel | |||
137 | switch (usage->hid & 0xffff) { | 137 | switch (usage->hid & 0xffff) { |
138 | case 0xba: map_abs(ABS_RUDDER); break; | 138 | case 0xba: map_abs(ABS_RUDDER); break; |
139 | case 0xbb: map_abs(ABS_THROTTLE); break; | 139 | case 0xbb: map_abs(ABS_THROTTLE); break; |
140 | default: goto ignore; | ||
140 | } | 141 | } |
141 | break; | 142 | break; |
142 | 143 | ||
diff --git a/drivers/usb/misc/auerswald.c b/drivers/usb/misc/auerswald.c index 2a28ceeaa66a..b293db3c28c3 100644 --- a/drivers/usb/misc/auerswald.c +++ b/drivers/usb/misc/auerswald.c | |||
@@ -1696,7 +1696,7 @@ static ssize_t auerchar_write (struct file *file, const char __user *buf, size_t | |||
1696 | int ret; | 1696 | int ret; |
1697 | wait_queue_t wait; | 1697 | wait_queue_t wait; |
1698 | 1698 | ||
1699 | dbg ("auerchar_write %d bytes", len); | 1699 | dbg ("auerchar_write %zd bytes", len); |
1700 | 1700 | ||
1701 | /* Error checking */ | 1701 | /* Error checking */ |
1702 | if (!ccp) | 1702 | if (!ccp) |
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c index 080db812ca48..2784f0a9d693 100644 --- a/drivers/video/arcfb.c +++ b/drivers/video/arcfb.c | |||
@@ -441,7 +441,7 @@ static int arcfb_ioctl(struct inode *inode, struct file *file, | |||
441 | * the fb. it's inefficient for them to do anything less than 64*8 | 441 | * the fb. it's inefficient for them to do anything less than 64*8 |
442 | * writes since we update the lcd in each write() anyway. | 442 | * writes since we update the lcd in each write() anyway. |
443 | */ | 443 | */ |
444 | static ssize_t arcfb_write(struct file *file, const char *buf, size_t count, | 444 | static ssize_t arcfb_write(struct file *file, const char __user *buf, size_t count, |
445 | loff_t *ppos) | 445 | loff_t *ppos) |
446 | { | 446 | { |
447 | /* modded from epson 1355 */ | 447 | /* modded from epson 1355 */ |
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c index d3728f60961e..9248fe1fbb1a 100644 --- a/drivers/video/bw2.c +++ b/drivers/video/bw2.c | |||
@@ -121,7 +121,6 @@ struct bw2_par { | |||
121 | unsigned long fbsize; | 121 | unsigned long fbsize; |
122 | 122 | ||
123 | struct sbus_dev *sdev; | 123 | struct sbus_dev *sdev; |
124 | struct list_head list; | ||
125 | }; | 124 | }; |
126 | 125 | ||
127 | /** | 126 | /** |
diff --git a/drivers/video/cfbcopyarea.c b/drivers/video/cfbcopyarea.c index cdc71572cf35..74415325b016 100644 --- a/drivers/video/cfbcopyarea.c +++ b/drivers/video/cfbcopyarea.c | |||
@@ -64,8 +64,8 @@ bitcpy(unsigned long __iomem *dst, int dst_idx, const unsigned long __iomem *src | |||
64 | int const shift = dst_idx-src_idx; | 64 | int const shift = dst_idx-src_idx; |
65 | int left, right; | 65 | int left, right; |
66 | 66 | ||
67 | first = ~0UL >> dst_idx; | 67 | first = FB_SHIFT_HIGH(~0UL, dst_idx); |
68 | last = ~(~0UL >> ((dst_idx+n) % bits)); | 68 | last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits)); |
69 | 69 | ||
70 | if (!shift) { | 70 | if (!shift) { |
71 | // Same alignment for source and dest | 71 | // Same alignment for source and dest |
@@ -216,8 +216,8 @@ bitcpy_rev(unsigned long __iomem *dst, int dst_idx, const unsigned long __iomem | |||
216 | 216 | ||
217 | shift = dst_idx-src_idx; | 217 | shift = dst_idx-src_idx; |
218 | 218 | ||
219 | first = ~0UL << (bits - 1 - dst_idx); | 219 | first = FB_SHIFT_LOW(~0UL, bits - 1 - dst_idx); |
220 | last = ~(~0UL << (bits - 1 - ((dst_idx-n) % bits))); | 220 | last = ~(FB_SHIFT_LOW(~0UL, bits - 1 - ((dst_idx-n) % bits))); |
221 | 221 | ||
222 | if (!shift) { | 222 | if (!shift) { |
223 | // Same alignment for source and dest | 223 | // Same alignment for source and dest |
diff --git a/drivers/video/cfbfillrect.c b/drivers/video/cfbfillrect.c index 167d9314e6eb..e5ff62e9cfb8 100644 --- a/drivers/video/cfbfillrect.c +++ b/drivers/video/cfbfillrect.c | |||
@@ -110,8 +110,8 @@ bitfill_aligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat, unsi | |||
110 | if (!n) | 110 | if (!n) |
111 | return; | 111 | return; |
112 | 112 | ||
113 | first = ~0UL >> dst_idx; | 113 | first = FB_SHIFT_HIGH(~0UL, dst_idx); |
114 | last = ~(~0UL >> ((dst_idx+n) % bits)); | 114 | last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits)); |
115 | 115 | ||
116 | if (dst_idx+n <= bits) { | 116 | if (dst_idx+n <= bits) { |
117 | // Single word | 117 | // Single word |
@@ -167,8 +167,8 @@ bitfill_unaligned(unsigned long __iomem *dst, int dst_idx, unsigned long pat, | |||
167 | if (!n) | 167 | if (!n) |
168 | return; | 168 | return; |
169 | 169 | ||
170 | first = ~0UL >> dst_idx; | 170 | first = FB_SHIFT_HIGH(~0UL, dst_idx); |
171 | last = ~(~0UL >> ((dst_idx+n) % bits)); | 171 | last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits)); |
172 | 172 | ||
173 | if (dst_idx+n <= bits) { | 173 | if (dst_idx+n <= bits) { |
174 | // Single word | 174 | // Single word |
@@ -221,8 +221,8 @@ bitfill_aligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat, | |||
221 | if (!n) | 221 | if (!n) |
222 | return; | 222 | return; |
223 | 223 | ||
224 | first = ~0UL >> dst_idx; | 224 | first = FB_SHIFT_HIGH(~0UL, dst_idx); |
225 | last = ~(~0UL >> ((dst_idx+n) % bits)); | 225 | last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits)); |
226 | 226 | ||
227 | if (dst_idx+n <= bits) { | 227 | if (dst_idx+n <= bits) { |
228 | // Single word | 228 | // Single word |
@@ -290,8 +290,8 @@ bitfill_unaligned_rev(unsigned long __iomem *dst, int dst_idx, unsigned long pat | |||
290 | if (!n) | 290 | if (!n) |
291 | return; | 291 | return; |
292 | 292 | ||
293 | first = ~0UL >> dst_idx; | 293 | first = FB_SHIFT_HIGH(~0UL, dst_idx); |
294 | last = ~(~0UL >> ((dst_idx+n) % bits)); | 294 | last = ~(FB_SHIFT_HIGH(~0UL, (dst_idx+n) % bits)); |
295 | 295 | ||
296 | if (dst_idx+n <= bits) { | 296 | if (dst_idx+n <= bits) { |
297 | // Single word | 297 | // Single word |
diff --git a/drivers/video/cfbimgblt.c b/drivers/video/cfbimgblt.c index a7770c4f17d0..910e2338a27e 100644 --- a/drivers/video/cfbimgblt.c +++ b/drivers/video/cfbimgblt.c | |||
@@ -76,18 +76,6 @@ static u32 cfb_tab32[] = { | |||
76 | #define FB_WRITEL fb_writel | 76 | #define FB_WRITEL fb_writel |
77 | #define FB_READL fb_readl | 77 | #define FB_READL fb_readl |
78 | 78 | ||
79 | #if defined (__BIG_ENDIAN) | ||
80 | #define LEFT_POS(bpp) (32 - bpp) | ||
81 | #define SHIFT_HIGH(val, bits) ((val) >> (bits)) | ||
82 | #define SHIFT_LOW(val, bits) ((val) << (bits)) | ||
83 | #define BIT_NR(b) (7 - (b)) | ||
84 | #else | ||
85 | #define LEFT_POS(bpp) (0) | ||
86 | #define SHIFT_HIGH(val, bits) ((val) << (bits)) | ||
87 | #define SHIFT_LOW(val, bits) ((val) >> (bits)) | ||
88 | #define BIT_NR(b) (b) | ||
89 | #endif | ||
90 | |||
91 | static inline void color_imageblit(const struct fb_image *image, | 79 | static inline void color_imageblit(const struct fb_image *image, |
92 | struct fb_info *p, u8 __iomem *dst1, | 80 | struct fb_info *p, u8 __iomem *dst1, |
93 | u32 start_index, | 81 | u32 start_index, |
@@ -109,7 +97,7 @@ static inline void color_imageblit(const struct fb_image *image, | |||
109 | val = 0; | 97 | val = 0; |
110 | 98 | ||
111 | if (start_index) { | 99 | if (start_index) { |
112 | u32 start_mask = ~(SHIFT_HIGH(~(u32)0, start_index)); | 100 | u32 start_mask = ~(FB_SHIFT_HIGH(~(u32)0, start_index)); |
113 | val = FB_READL(dst) & start_mask; | 101 | val = FB_READL(dst) & start_mask; |
114 | shift = start_index; | 102 | shift = start_index; |
115 | } | 103 | } |
@@ -119,20 +107,20 @@ static inline void color_imageblit(const struct fb_image *image, | |||
119 | color = palette[*src]; | 107 | color = palette[*src]; |
120 | else | 108 | else |
121 | color = *src; | 109 | color = *src; |
122 | color <<= LEFT_POS(bpp); | 110 | color <<= FB_LEFT_POS(bpp); |
123 | val |= SHIFT_HIGH(color, shift); | 111 | val |= FB_SHIFT_HIGH(color, shift); |
124 | if (shift >= null_bits) { | 112 | if (shift >= null_bits) { |
125 | FB_WRITEL(val, dst++); | 113 | FB_WRITEL(val, dst++); |
126 | 114 | ||
127 | val = (shift == null_bits) ? 0 : | 115 | val = (shift == null_bits) ? 0 : |
128 | SHIFT_LOW(color, 32 - shift); | 116 | FB_SHIFT_LOW(color, 32 - shift); |
129 | } | 117 | } |
130 | shift += bpp; | 118 | shift += bpp; |
131 | shift &= (32 - 1); | 119 | shift &= (32 - 1); |
132 | src++; | 120 | src++; |
133 | } | 121 | } |
134 | if (shift) { | 122 | if (shift) { |
135 | u32 end_mask = SHIFT_HIGH(~(u32)0, shift); | 123 | u32 end_mask = FB_SHIFT_HIGH(~(u32)0, shift); |
136 | 124 | ||
137 | FB_WRITEL((FB_READL(dst) & end_mask) | val, dst); | 125 | FB_WRITEL((FB_READL(dst) & end_mask) | val, dst); |
138 | } | 126 | } |
@@ -162,6 +150,8 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info * | |||
162 | u32 i, j, l; | 150 | u32 i, j, l; |
163 | 151 | ||
164 | dst2 = (u32 __iomem *) dst1; | 152 | dst2 = (u32 __iomem *) dst1; |
153 | fgcolor <<= FB_LEFT_POS(bpp); | ||
154 | bgcolor <<= FB_LEFT_POS(bpp); | ||
165 | 155 | ||
166 | for (i = image->height; i--; ) { | 156 | for (i = image->height; i--; ) { |
167 | shift = val = 0; | 157 | shift = val = 0; |
@@ -172,22 +162,21 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info * | |||
172 | 162 | ||
173 | /* write leading bits */ | 163 | /* write leading bits */ |
174 | if (start_index) { | 164 | if (start_index) { |
175 | u32 start_mask = ~(SHIFT_HIGH(~(u32)0, start_index)); | 165 | u32 start_mask = ~(FB_SHIFT_HIGH(~(u32)0,start_index)); |
176 | val = FB_READL(dst) & start_mask; | 166 | val = FB_READL(dst) & start_mask; |
177 | shift = start_index; | 167 | shift = start_index; |
178 | } | 168 | } |
179 | 169 | ||
180 | while (j--) { | 170 | while (j--) { |
181 | l--; | 171 | l--; |
182 | color = (*s & 1 << (BIT_NR(l))) ? fgcolor : bgcolor; | 172 | color = (*s & 1 << (FB_BIT_NR(l))) ? fgcolor : bgcolor; |
183 | color <<= LEFT_POS(bpp); | 173 | val |= FB_SHIFT_HIGH(color, shift); |
184 | val |= SHIFT_HIGH(color, shift); | ||
185 | 174 | ||
186 | /* Did the bitshift spill bits to the next long? */ | 175 | /* Did the bitshift spill bits to the next long? */ |
187 | if (shift >= null_bits) { | 176 | if (shift >= null_bits) { |
188 | FB_WRITEL(val, dst++); | 177 | FB_WRITEL(val, dst++); |
189 | val = (shift == null_bits) ? 0 : | 178 | val = (shift == null_bits) ? 0 : |
190 | SHIFT_LOW(color,32 - shift); | 179 | FB_SHIFT_LOW(color,32 - shift); |
191 | } | 180 | } |
192 | shift += bpp; | 181 | shift += bpp; |
193 | shift &= (32 - 1); | 182 | shift &= (32 - 1); |
@@ -196,7 +185,7 @@ static inline void slow_imageblit(const struct fb_image *image, struct fb_info * | |||
196 | 185 | ||
197 | /* write trailing bits */ | 186 | /* write trailing bits */ |
198 | if (shift) { | 187 | if (shift) { |
199 | u32 end_mask = SHIFT_HIGH(~(u32)0, shift); | 188 | u32 end_mask = FB_SHIFT_HIGH(~(u32)0, shift); |
200 | 189 | ||
201 | FB_WRITEL((FB_READL(dst) & end_mask) | val, dst); | 190 | FB_WRITEL((FB_READL(dst) & end_mask) | val, dst); |
202 | } | 191 | } |
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c index 1bed50f2a276..a56147102abb 100644 --- a/drivers/video/cg14.c +++ b/drivers/video/cg14.c | |||
@@ -206,7 +206,6 @@ struct cg14_par { | |||
206 | int mode; | 206 | int mode; |
207 | int ramsize; | 207 | int ramsize; |
208 | struct sbus_dev *sdev; | 208 | struct sbus_dev *sdev; |
209 | struct list_head list; | ||
210 | }; | 209 | }; |
211 | 210 | ||
212 | static void __cg14_reset(struct cg14_par *par) | 211 | static void __cg14_reset(struct cg14_par *par) |
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c index a1354e7e0513..9fcd89608ed7 100644 --- a/drivers/video/cg3.c +++ b/drivers/video/cg3.c | |||
@@ -124,7 +124,6 @@ struct cg3_par { | |||
124 | unsigned long fbsize; | 124 | unsigned long fbsize; |
125 | 125 | ||
126 | struct sbus_dev *sdev; | 126 | struct sbus_dev *sdev; |
127 | struct list_head list; | ||
128 | }; | 127 | }; |
129 | 128 | ||
130 | /** | 129 | /** |
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c index 9debe642fd2f..050835e39aa3 100644 --- a/drivers/video/cg6.c +++ b/drivers/video/cg6.c | |||
@@ -265,7 +265,6 @@ struct cg6_par { | |||
265 | unsigned long fbsize; | 265 | unsigned long fbsize; |
266 | 266 | ||
267 | struct sbus_dev *sdev; | 267 | struct sbus_dev *sdev; |
268 | struct list_head list; | ||
269 | }; | 268 | }; |
270 | 269 | ||
271 | static int cg6_sync(struct fb_info *info) | 270 | static int cg6_sync(struct fb_info *info) |
@@ -612,7 +611,7 @@ static void cg6_chip_init(struct fb_info *info) | |||
612 | struct cg6_par *par = (struct cg6_par *) info->par; | 611 | struct cg6_par *par = (struct cg6_par *) info->par; |
613 | struct cg6_tec __iomem *tec = par->tec; | 612 | struct cg6_tec __iomem *tec = par->tec; |
614 | struct cg6_fbc __iomem *fbc = par->fbc; | 613 | struct cg6_fbc __iomem *fbc = par->fbc; |
615 | u32 rev, conf, mode, tmp; | 614 | u32 rev, conf, mode; |
616 | int i; | 615 | int i; |
617 | 616 | ||
618 | /* Turn off stuff in the Transform Engine. */ | 617 | /* Turn off stuff in the Transform Engine. */ |
diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index bcea87c3cc06..3660e51b2612 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c | |||
@@ -2048,7 +2048,7 @@ static int fbcon_switch(struct vc_data *vc) | |||
2048 | struct fbcon_ops *ops; | 2048 | struct fbcon_ops *ops; |
2049 | struct display *p = &fb_display[vc->vc_num]; | 2049 | struct display *p = &fb_display[vc->vc_num]; |
2050 | struct fb_var_screeninfo var; | 2050 | struct fb_var_screeninfo var; |
2051 | int i, prev_console; | 2051 | int i, prev_console, charcnt = 256; |
2052 | 2052 | ||
2053 | info = registered_fb[con2fb_map[vc->vc_num]]; | 2053 | info = registered_fb[con2fb_map[vc->vc_num]]; |
2054 | ops = info->fbcon_par; | 2054 | ops = info->fbcon_par; |
@@ -2103,7 +2103,8 @@ static int fbcon_switch(struct vc_data *vc) | |||
2103 | fb_set_var(info, &var); | 2103 | fb_set_var(info, &var); |
2104 | ops->var = info->var; | 2104 | ops->var = info->var; |
2105 | 2105 | ||
2106 | if (old_info != NULL && old_info != info) { | 2106 | if (old_info != NULL && (old_info != info || |
2107 | info->flags & FBINFO_MISC_ALWAYS_SETPAR)) { | ||
2107 | if (info->fbops->fb_set_par) | 2108 | if (info->fbops->fb_set_par) |
2108 | info->fbops->fb_set_par(info); | 2109 | info->fbops->fb_set_par(info); |
2109 | fbcon_del_cursor_timer(old_info); | 2110 | fbcon_del_cursor_timer(old_info); |
@@ -2120,6 +2121,13 @@ static int fbcon_switch(struct vc_data *vc) | |||
2120 | 2121 | ||
2121 | vc->vc_can_do_color = (fb_get_color_depth(&info->var, &info->fix)!=1); | 2122 | vc->vc_can_do_color = (fb_get_color_depth(&info->var, &info->fix)!=1); |
2122 | vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800; | 2123 | vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800; |
2124 | |||
2125 | if (p->userfont) | ||
2126 | charcnt = FNTCHARCNT(vc->vc_font.data); | ||
2127 | |||
2128 | if (charcnt > 256) | ||
2129 | vc->vc_complement_mask <<= 1; | ||
2130 | |||
2123 | updatescrollmode(p, info, vc); | 2131 | updatescrollmode(p, info, vc); |
2124 | 2132 | ||
2125 | switch (p->scrollmode) { | 2133 | switch (p->scrollmode) { |
@@ -2139,8 +2147,12 @@ static int fbcon_switch(struct vc_data *vc) | |||
2139 | 2147 | ||
2140 | scrollback_max = 0; | 2148 | scrollback_max = 0; |
2141 | scrollback_current = 0; | 2149 | scrollback_current = 0; |
2142 | ops->var.xoffset = ops->var.yoffset = p->yscroll = 0; | 2150 | |
2143 | ops->update_start(info); | 2151 | if (!fbcon_is_inactive(vc, info)) { |
2152 | ops->var.xoffset = ops->var.yoffset = p->yscroll = 0; | ||
2153 | ops->update_start(info); | ||
2154 | } | ||
2155 | |||
2144 | fbcon_set_palette(vc, color_table); | 2156 | fbcon_set_palette(vc, color_table); |
2145 | fbcon_clear_margins(vc, 0); | 2157 | fbcon_clear_margins(vc, 0); |
2146 | 2158 | ||
@@ -2184,11 +2196,14 @@ static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch) | |||
2184 | ops->graphics = 1; | 2196 | ops->graphics = 1; |
2185 | 2197 | ||
2186 | if (!blank) { | 2198 | if (!blank) { |
2199 | if (info->fbops->fb_save_state) | ||
2200 | info->fbops->fb_save_state(info); | ||
2187 | var.activate = FB_ACTIVATE_NOW | FB_ACTIVATE_FORCE; | 2201 | var.activate = FB_ACTIVATE_NOW | FB_ACTIVATE_FORCE; |
2188 | fb_set_var(info, &var); | 2202 | fb_set_var(info, &var); |
2189 | ops->graphics = 0; | 2203 | ops->graphics = 0; |
2190 | ops->var = info->var; | 2204 | ops->var = info->var; |
2191 | } | 2205 | } else if (info->fbops->fb_restore_state) |
2206 | info->fbops->fb_restore_state(info); | ||
2192 | } | 2207 | } |
2193 | 2208 | ||
2194 | if (!fbcon_is_inactive(vc, info)) { | 2209 | if (!fbcon_is_inactive(vc, info)) { |
@@ -2736,8 +2751,12 @@ static void fbcon_modechanged(struct fb_info *info) | |||
2736 | updatescrollmode(p, info, vc); | 2751 | updatescrollmode(p, info, vc); |
2737 | scrollback_max = 0; | 2752 | scrollback_max = 0; |
2738 | scrollback_current = 0; | 2753 | scrollback_current = 0; |
2739 | ops->var.xoffset = ops->var.yoffset = p->yscroll = 0; | 2754 | |
2740 | ops->update_start(info); | 2755 | if (!fbcon_is_inactive(vc, info)) { |
2756 | ops->var.xoffset = ops->var.yoffset = p->yscroll = 0; | ||
2757 | ops->update_start(info); | ||
2758 | } | ||
2759 | |||
2741 | fbcon_set_palette(vc, color_table); | 2760 | fbcon_set_palette(vc, color_table); |
2742 | update_screen(vc); | 2761 | update_screen(vc); |
2743 | if (softback_buf) | 2762 | if (softback_buf) |
@@ -2774,8 +2793,13 @@ static void fbcon_set_all_vcs(struct fb_info *info) | |||
2774 | updatescrollmode(p, info, vc); | 2793 | updatescrollmode(p, info, vc); |
2775 | scrollback_max = 0; | 2794 | scrollback_max = 0; |
2776 | scrollback_current = 0; | 2795 | scrollback_current = 0; |
2777 | ops->var.xoffset = ops->var.yoffset = p->yscroll = 0; | 2796 | |
2778 | ops->update_start(info); | 2797 | if (!fbcon_is_inactive(vc, info)) { |
2798 | ops->var.xoffset = ops->var.yoffset = | ||
2799 | p->yscroll = 0; | ||
2800 | ops->update_start(info); | ||
2801 | } | ||
2802 | |||
2779 | fbcon_set_palette(vc, color_table); | 2803 | fbcon_set_palette(vc, color_table); |
2780 | update_screen(vc); | 2804 | update_screen(vc); |
2781 | if (softback_buf) | 2805 | if (softback_buf) |
diff --git a/drivers/video/console/fbcon_ud.c b/drivers/video/console/fbcon_ud.c index c4d7c89212b4..9dd059e8b645 100644 --- a/drivers/video/console/fbcon_ud.c +++ b/drivers/video/console/fbcon_ud.c | |||
@@ -420,13 +420,15 @@ static void ud_cursor(struct vc_data *vc, struct fb_info *info, | |||
420 | int ud_update_start(struct fb_info *info) | 420 | int ud_update_start(struct fb_info *info) |
421 | { | 421 | { |
422 | struct fbcon_ops *ops = info->fbcon_par; | 422 | struct fbcon_ops *ops = info->fbcon_par; |
423 | u32 xoffset, yoffset; | 423 | int xoffset, yoffset; |
424 | u32 vyres = GETVYRES(ops->p->scrollmode, info); | 424 | u32 vyres = GETVYRES(ops->p->scrollmode, info); |
425 | u32 vxres = GETVXRES(ops->p->scrollmode, info); | 425 | u32 vxres = GETVXRES(ops->p->scrollmode, info); |
426 | int err; | 426 | int err; |
427 | 427 | ||
428 | xoffset = (vxres - info->var.xres) - ops->var.xoffset; | 428 | xoffset = vxres - info->var.xres - ops->var.xoffset; |
429 | yoffset = (vyres - info->var.yres) - ops->var.yoffset; | 429 | yoffset = vyres - info->var.yres - ops->var.yoffset; |
430 | if (yoffset < 0) | ||
431 | yoffset += vyres; | ||
430 | ops->var.xoffset = xoffset; | 432 | ops->var.xoffset = xoffset; |
431 | ops->var.yoffset = yoffset; | 433 | ops->var.yoffset = yoffset; |
432 | err = fb_pan_display(info, &ops->var); | 434 | err = fb_pan_display(info, &ops->var); |
diff --git a/drivers/video/cyber2000fb.c b/drivers/video/cyber2000fb.c index c589d23e7f91..a9300f930ef2 100644 --- a/drivers/video/cyber2000fb.c +++ b/drivers/video/cyber2000fb.c | |||
@@ -1512,7 +1512,7 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb) | |||
1512 | * I/O cycles storing into a reserved memory space at | 1512 | * I/O cycles storing into a reserved memory space at |
1513 | * physical address 0x3000000 | 1513 | * physical address 0x3000000 |
1514 | */ | 1514 | */ |
1515 | unsigned char *iop; | 1515 | unsigned char __iomem *iop; |
1516 | 1516 | ||
1517 | iop = ioremap(0x3000000, 0x5000); | 1517 | iop = ioremap(0x3000000, 0x5000); |
1518 | if (iop == NULL) { | 1518 | if (iop == NULL) { |
@@ -1526,7 +1526,7 @@ static int cyberpro_pci_enable_mmio(struct cfb_info *cfb) | |||
1526 | writeb(EXT_BIU_MISC, iop + 0x3ce); | 1526 | writeb(EXT_BIU_MISC, iop + 0x3ce); |
1527 | writeb(EXT_BIU_MISC_LIN_ENABLE, iop + 0x3cf); | 1527 | writeb(EXT_BIU_MISC_LIN_ENABLE, iop + 0x3cf); |
1528 | 1528 | ||
1529 | iounmap((void *)iop); | 1529 | iounmap(iop); |
1530 | #else | 1530 | #else |
1531 | /* | 1531 | /* |
1532 | * Most other machine types are "normal", so | 1532 | * Most other machine types are "normal", so |
diff --git a/drivers/video/fbmem.c b/drivers/video/fbmem.c index 6240aedb4154..10dfdf035264 100644 --- a/drivers/video/fbmem.c +++ b/drivers/video/fbmem.c | |||
@@ -722,14 +722,30 @@ static void try_to_load(int fb) | |||
722 | int | 722 | int |
723 | fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var) | 723 | fb_pan_display(struct fb_info *info, struct fb_var_screeninfo *var) |
724 | { | 724 | { |
725 | struct fb_fix_screeninfo *fix = &info->fix; | ||
725 | int xoffset = var->xoffset; | 726 | int xoffset = var->xoffset; |
726 | int yoffset = var->yoffset; | 727 | int yoffset = var->yoffset; |
727 | int err; | 728 | int err = 0, yres = info->var.yres; |
729 | |||
730 | if (var->yoffset > 0) { | ||
731 | if (var->vmode & FB_VMODE_YWRAP) { | ||
732 | if (!fix->ywrapstep || (var->yoffset % fix->ywrapstep)) | ||
733 | err = -EINVAL; | ||
734 | else | ||
735 | yres = 0; | ||
736 | } else if (!fix->ypanstep || (var->yoffset % fix->ypanstep)) | ||
737 | err = -EINVAL; | ||
738 | } | ||
739 | |||
740 | if (var->xoffset > 0 && (!fix->xpanstep || | ||
741 | (var->xoffset % fix->xpanstep))) | ||
742 | err = -EINVAL; | ||
743 | |||
744 | if (err || !info->fbops->fb_pan_display || xoffset < 0 || | ||
745 | yoffset < 0 || var->yoffset + yres > info->var.yres_virtual || | ||
746 | var->xoffset + info->var.xres > info->var.xres_virtual) | ||
747 | return -EINVAL; | ||
728 | 748 | ||
729 | if (xoffset < 0 || yoffset < 0 || !info->fbops->fb_pan_display || | ||
730 | xoffset + info->var.xres > info->var.xres_virtual || | ||
731 | yoffset + info->var.yres > info->var.yres_virtual) | ||
732 | return -EINVAL; | ||
733 | if ((err = info->fbops->fb_pan_display(var, info))) | 749 | if ((err = info->fbops->fb_pan_display(var, info))) |
734 | return err; | 750 | return err; |
735 | info->var.xoffset = var->xoffset; | 751 | info->var.xoffset = var->xoffset; |
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c index 2584daec7bbf..c4870d559afc 100644 --- a/drivers/video/ffb.c +++ b/drivers/video/ffb.c | |||
@@ -359,7 +359,6 @@ struct ffb_par { | |||
359 | int prom_parent_node; | 359 | int prom_parent_node; |
360 | int dac_rev; | 360 | int dac_rev; |
361 | int board_type; | 361 | int board_type; |
362 | struct list_head list; | ||
363 | }; | 362 | }; |
364 | 363 | ||
365 | static void FFBFifo(struct ffb_par *par, int n) | 364 | static void FFBFifo(struct ffb_par *par, int n) |
diff --git a/drivers/video/intelfb/intelfb.h b/drivers/video/intelfb/intelfb.h index f077ca34faba..da29d007f215 100644 --- a/drivers/video/intelfb/intelfb.h +++ b/drivers/video/intelfb/intelfb.h | |||
@@ -41,6 +41,10 @@ | |||
41 | 41 | ||
42 | /*** hw-related values ***/ | 42 | /*** hw-related values ***/ |
43 | 43 | ||
44 | /* Resource Allocation */ | ||
45 | #define INTELFB_FB_ACQUIRED 1 | ||
46 | #define INTELFB_MMIO_ACQUIRED 2 | ||
47 | |||
44 | /* PCI ids for supported devices */ | 48 | /* PCI ids for supported devices */ |
45 | #define PCI_DEVICE_ID_INTEL_830M 0x3577 | 49 | #define PCI_DEVICE_ID_INTEL_830M 0x3577 |
46 | #define PCI_DEVICE_ID_INTEL_845G 0x2562 | 50 | #define PCI_DEVICE_ID_INTEL_845G 0x2562 |
@@ -257,6 +261,7 @@ struct intelfb_info { | |||
257 | int hwcursor; | 261 | int hwcursor; |
258 | int fixed_mode; | 262 | int fixed_mode; |
259 | int ring_active; | 263 | int ring_active; |
264 | int flag; | ||
260 | 265 | ||
261 | /* hw cursor */ | 266 | /* hw cursor */ |
262 | int cursor_on; | 267 | int cursor_on; |
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 427689e584da..0090544842f5 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c | |||
@@ -135,9 +135,6 @@ | |||
135 | static void __devinit get_initial_mode(struct intelfb_info *dinfo); | 135 | static void __devinit get_initial_mode(struct intelfb_info *dinfo); |
136 | static void update_dinfo(struct intelfb_info *dinfo, | 136 | static void update_dinfo(struct intelfb_info *dinfo, |
137 | struct fb_var_screeninfo *var); | 137 | struct fb_var_screeninfo *var); |
138 | static int intelfb_get_fix(struct fb_fix_screeninfo *fix, | ||
139 | struct fb_info *info); | ||
140 | |||
141 | static int intelfb_check_var(struct fb_var_screeninfo *var, | 138 | static int intelfb_check_var(struct fb_var_screeninfo *var, |
142 | struct fb_info *info); | 139 | struct fb_info *info); |
143 | static int intelfb_set_par(struct fb_info *info); | 140 | static int intelfb_set_par(struct fb_info *info); |
@@ -473,9 +470,9 @@ cleanup(struct intelfb_info *dinfo) | |||
473 | if (dinfo->aperture.virtual) | 470 | if (dinfo->aperture.virtual) |
474 | iounmap((void __iomem *)dinfo->aperture.virtual); | 471 | iounmap((void __iomem *)dinfo->aperture.virtual); |
475 | 472 | ||
476 | if (dinfo->mmio_base_phys) | 473 | if (dinfo->flag & INTELFB_MMIO_ACQUIRED) |
477 | release_mem_region(dinfo->mmio_base_phys, INTEL_REG_SIZE); | 474 | release_mem_region(dinfo->mmio_base_phys, INTEL_REG_SIZE); |
478 | if (dinfo->aperture.physical) | 475 | if (dinfo->flag & INTELFB_FB_ACQUIRED) |
479 | release_mem_region(dinfo->aperture.physical, | 476 | release_mem_region(dinfo->aperture.physical, |
480 | dinfo->aperture.size); | 477 | dinfo->aperture.size); |
481 | framebuffer_release(dinfo->info); | 478 | framebuffer_release(dinfo->info); |
@@ -572,6 +569,9 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
572 | cleanup(dinfo); | 569 | cleanup(dinfo); |
573 | return -ENODEV; | 570 | return -ENODEV; |
574 | } | 571 | } |
572 | |||
573 | dinfo->flag |= INTELFB_FB_ACQUIRED; | ||
574 | |||
575 | if (!request_mem_region(dinfo->mmio_base_phys, | 575 | if (!request_mem_region(dinfo->mmio_base_phys, |
576 | INTEL_REG_SIZE, | 576 | INTEL_REG_SIZE, |
577 | INTELFB_MODULE_NAME)) { | 577 | INTELFB_MODULE_NAME)) { |
@@ -580,6 +580,8 @@ intelfb_pci_register(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
580 | return -ENODEV; | 580 | return -ENODEV; |
581 | } | 581 | } |
582 | 582 | ||
583 | dinfo->flag |= INTELFB_MMIO_ACQUIRED; | ||
584 | |||
583 | /* Get the chipset info. */ | 585 | /* Get the chipset info. */ |
584 | dinfo->pci_chipset = pdev->device; | 586 | dinfo->pci_chipset = pdev->device; |
585 | 587 | ||
@@ -1091,7 +1093,17 @@ intelfb_set_fbinfo(struct intelfb_info *dinfo) | |||
1091 | return 1; | 1093 | return 1; |
1092 | 1094 | ||
1093 | info->pixmap.scan_align = 1; | 1095 | info->pixmap.scan_align = 1; |
1094 | 1096 | strcpy(info->fix.id, dinfo->name); | |
1097 | info->fix.smem_start = dinfo->fb.physical; | ||
1098 | info->fix.smem_len = dinfo->fb.size; | ||
1099 | info->fix.type = FB_TYPE_PACKED_PIXELS; | ||
1100 | info->fix.type_aux = 0; | ||
1101 | info->fix.xpanstep = 8; | ||
1102 | info->fix.ypanstep = 1; | ||
1103 | info->fix.ywrapstep = 0; | ||
1104 | info->fix.mmio_start = dinfo->mmio_base_phys; | ||
1105 | info->fix.mmio_len = INTEL_REG_SIZE; | ||
1106 | info->fix.accel = FB_ACCEL_I830; | ||
1095 | update_dinfo(dinfo, &info->var); | 1107 | update_dinfo(dinfo, &info->var); |
1096 | 1108 | ||
1097 | return 0; | 1109 | return 0; |
@@ -1109,7 +1121,8 @@ update_dinfo(struct intelfb_info *dinfo, struct fb_var_screeninfo *var) | |||
1109 | dinfo->yres = var->xres; | 1121 | dinfo->yres = var->xres; |
1110 | dinfo->pixclock = var->pixclock; | 1122 | dinfo->pixclock = var->pixclock; |
1111 | 1123 | ||
1112 | intelfb_get_fix(&dinfo->info->fix, dinfo->info); | 1124 | dinfo->info->fix.visual = dinfo->visual; |
1125 | dinfo->info->fix.line_length = dinfo->pitch; | ||
1113 | 1126 | ||
1114 | switch (dinfo->bpp) { | 1127 | switch (dinfo->bpp) { |
1115 | case 8: | 1128 | case 8: |
@@ -1139,30 +1152,6 @@ update_dinfo(struct intelfb_info *dinfo, struct fb_var_screeninfo *var) | |||
1139 | 1152 | ||
1140 | /* fbops functions */ | 1153 | /* fbops functions */ |
1141 | 1154 | ||
1142 | static int | ||
1143 | intelfb_get_fix(struct fb_fix_screeninfo *fix, struct fb_info *info) | ||
1144 | { | ||
1145 | struct intelfb_info *dinfo = GET_DINFO(info); | ||
1146 | |||
1147 | DBG_MSG("intelfb_get_fix\n"); | ||
1148 | |||
1149 | memset(fix, 0, sizeof(*fix)); | ||
1150 | strcpy(fix->id, dinfo->name); | ||
1151 | fix->smem_start = dinfo->fb.physical; | ||
1152 | fix->smem_len = dinfo->fb.size; | ||
1153 | fix->type = FB_TYPE_PACKED_PIXELS; | ||
1154 | fix->type_aux = 0; | ||
1155 | fix->visual = dinfo->visual; | ||
1156 | fix->xpanstep = 8; | ||
1157 | fix->ypanstep = 1; | ||
1158 | fix->ywrapstep = 0; | ||
1159 | fix->line_length = dinfo->pitch; | ||
1160 | fix->mmio_start = dinfo->mmio_base_phys; | ||
1161 | fix->mmio_len = INTEL_REG_SIZE; | ||
1162 | fix->accel = FB_ACCEL_I830; | ||
1163 | return 0; | ||
1164 | } | ||
1165 | |||
1166 | /*************************************************************** | 1155 | /*************************************************************** |
1167 | * fbdev interface * | 1156 | * fbdev interface * |
1168 | ***************************************************************/ | 1157 | ***************************************************************/ |
diff --git a/drivers/video/leo.c b/drivers/video/leo.c index 376d4a171ec7..494287f8f8bf 100644 --- a/drivers/video/leo.c +++ b/drivers/video/leo.c | |||
@@ -197,7 +197,6 @@ struct leo_par { | |||
197 | unsigned long fbsize; | 197 | unsigned long fbsize; |
198 | 198 | ||
199 | struct sbus_dev *sdev; | 199 | struct sbus_dev *sdev; |
200 | struct list_head list; | ||
201 | }; | 200 | }; |
202 | 201 | ||
203 | static void leo_wait(struct leo_lx_krn __iomem *lx_krn) | 202 | static void leo_wait(struct leo_lx_krn __iomem *lx_krn) |
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c index 18bcda23d2cf..b251e754e16c 100644 --- a/drivers/video/p9100.c +++ b/drivers/video/p9100.c | |||
@@ -140,7 +140,6 @@ struct p9100_par { | |||
140 | unsigned long fbsize; | 140 | unsigned long fbsize; |
141 | 141 | ||
142 | struct sbus_dev *sdev; | 142 | struct sbus_dev *sdev; |
143 | struct list_head list; | ||
144 | }; | 143 | }; |
145 | 144 | ||
146 | /** | 145 | /** |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 7b4cd250bec8..9fc10b9e6f57 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -1396,7 +1396,8 @@ static struct platform_driver pxafb_driver = { | |||
1396 | int __devinit pxafb_setup(char *options) | 1396 | int __devinit pxafb_setup(char *options) |
1397 | { | 1397 | { |
1398 | # ifdef CONFIG_FB_PXA_PARAMETERS | 1398 | # ifdef CONFIG_FB_PXA_PARAMETERS |
1399 | strlcpy(g_options, options, sizeof(g_options)); | 1399 | if (options) |
1400 | strlcpy(g_options, options, sizeof(g_options)); | ||
1400 | # endif | 1401 | # endif |
1401 | return 0; | 1402 | return 0; |
1402 | } | 1403 | } |
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c index fe4f63f3849d..2b27b4474001 100644 --- a/drivers/video/tcx.c +++ b/drivers/video/tcx.c | |||
@@ -125,7 +125,6 @@ struct tcx_par { | |||
125 | int lowdepth; | 125 | int lowdepth; |
126 | 126 | ||
127 | struct sbus_dev *sdev; | 127 | struct sbus_dev *sdev; |
128 | struct list_head list; | ||
129 | }; | 128 | }; |
130 | 129 | ||
131 | /* Reset control plane so that WID is 8-bit plane. */ | 130 | /* Reset control plane so that WID is 8-bit plane. */ |
@@ -444,7 +443,7 @@ static void tcx_init_one(struct sbus_dev *sdev) | |||
444 | 443 | ||
445 | tcx_reset(&all->info); | 444 | tcx_reset(&all->info); |
446 | 445 | ||
447 | tcx_blank(0, &all->info); | 446 | tcx_blank(FB_BLANK_UNBLANK, &all->info); |
448 | 447 | ||
449 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { | 448 | if (fb_alloc_cmap(&all->info.cmap, 256, 0)) { |
450 | printk(KERN_ERR "tcx: Could not allocate color map.\n"); | 449 | printk(KERN_ERR "tcx: Could not allocate color map.\n"); |
diff --git a/fs/inotify.c b/fs/inotify.c index bf7ce1d2412b..2fecb7af4a77 100644 --- a/fs/inotify.c +++ b/fs/inotify.c | |||
@@ -364,11 +364,12 @@ static int inotify_dev_get_wd(struct inotify_device *dev, | |||
364 | /* | 364 | /* |
365 | * find_inode - resolve a user-given path to a specific inode and return a nd | 365 | * find_inode - resolve a user-given path to a specific inode and return a nd |
366 | */ | 366 | */ |
367 | static int find_inode(const char __user *dirname, struct nameidata *nd) | 367 | static int find_inode(const char __user *dirname, struct nameidata *nd, |
368 | unsigned flags) | ||
368 | { | 369 | { |
369 | int error; | 370 | int error; |
370 | 371 | ||
371 | error = __user_walk(dirname, LOOKUP_FOLLOW, nd); | 372 | error = __user_walk(dirname, flags, nd); |
372 | if (error) | 373 | if (error) |
373 | return error; | 374 | return error; |
374 | /* you can only watch an inode if you have read permissions on it */ | 375 | /* you can only watch an inode if you have read permissions on it */ |
@@ -933,6 +934,7 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask) | |||
933 | struct file *filp; | 934 | struct file *filp; |
934 | int ret, fput_needed; | 935 | int ret, fput_needed; |
935 | int mask_add = 0; | 936 | int mask_add = 0; |
937 | unsigned flags = 0; | ||
936 | 938 | ||
937 | filp = fget_light(fd, &fput_needed); | 939 | filp = fget_light(fd, &fput_needed); |
938 | if (unlikely(!filp)) | 940 | if (unlikely(!filp)) |
@@ -944,7 +946,12 @@ asmlinkage long sys_inotify_add_watch(int fd, const char __user *path, u32 mask) | |||
944 | goto fput_and_out; | 946 | goto fput_and_out; |
945 | } | 947 | } |
946 | 948 | ||
947 | ret = find_inode(path, &nd); | 949 | if (!(mask & IN_DONT_FOLLOW)) |
950 | flags |= LOOKUP_FOLLOW; | ||
951 | if (mask & IN_ONLYDIR) | ||
952 | flags |= LOOKUP_DIRECTORY; | ||
953 | |||
954 | ret = find_inode(path, &nd, flags); | ||
948 | if (unlikely(ret)) | 955 | if (unlikely(ret)) |
949 | goto fput_and_out; | 956 | goto fput_and_out; |
950 | 957 | ||
diff --git a/fs/lockd/clntlock.c b/fs/lockd/clntlock.c index 006bb9e14579..3eaf6e701087 100644 --- a/fs/lockd/clntlock.c +++ b/fs/lockd/clntlock.c | |||
@@ -157,6 +157,8 @@ void nlmclnt_mark_reclaim(struct nlm_host *host) | |||
157 | inode = fl->fl_file->f_dentry->d_inode; | 157 | inode = fl->fl_file->f_dentry->d_inode; |
158 | if (inode->i_sb->s_magic != NFS_SUPER_MAGIC) | 158 | if (inode->i_sb->s_magic != NFS_SUPER_MAGIC) |
159 | continue; | 159 | continue; |
160 | if (fl->fl_u.nfs_fl.owner == NULL) | ||
161 | continue; | ||
160 | if (fl->fl_u.nfs_fl.owner->host != host) | 162 | if (fl->fl_u.nfs_fl.owner->host != host) |
161 | continue; | 163 | continue; |
162 | if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_GRANTED)) | 164 | if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_GRANTED)) |
@@ -226,6 +228,8 @@ restart: | |||
226 | inode = fl->fl_file->f_dentry->d_inode; | 228 | inode = fl->fl_file->f_dentry->d_inode; |
227 | if (inode->i_sb->s_magic != NFS_SUPER_MAGIC) | 229 | if (inode->i_sb->s_magic != NFS_SUPER_MAGIC) |
228 | continue; | 230 | continue; |
231 | if (fl->fl_u.nfs_fl.owner == NULL) | ||
232 | continue; | ||
229 | if (fl->fl_u.nfs_fl.owner->host != host) | 233 | if (fl->fl_u.nfs_fl.owner->host != host) |
230 | continue; | 234 | continue; |
231 | if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_RECLAIM)) | 235 | if (!(fl->fl_u.nfs_fl.flags & NFS_LCK_RECLAIM)) |
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index b497c71384e8..079228817603 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c | |||
@@ -678,15 +678,9 @@ nfs_file_direct_read(struct kiocb *iocb, char __user *buf, size_t count, loff_t | |||
678 | if (!count) | 678 | if (!count) |
679 | goto out; | 679 | goto out; |
680 | 680 | ||
681 | if (mapping->nrpages) { | 681 | retval = nfs_sync_mapping(mapping); |
682 | retval = filemap_fdatawrite(mapping); | 682 | if (retval) |
683 | if (retval == 0) | 683 | goto out; |
684 | retval = nfs_wb_all(inode); | ||
685 | if (retval == 0) | ||
686 | retval = filemap_fdatawait(mapping); | ||
687 | if (retval) | ||
688 | goto out; | ||
689 | } | ||
690 | 684 | ||
691 | retval = nfs_direct_read(inode, ctx, &iov, pos, 1); | 685 | retval = nfs_direct_read(inode, ctx, &iov, pos, 1); |
692 | if (retval > 0) | 686 | if (retval > 0) |
@@ -764,15 +758,9 @@ nfs_file_direct_write(struct kiocb *iocb, const char __user *buf, size_t count, | |||
764 | if (!count) | 758 | if (!count) |
765 | goto out; | 759 | goto out; |
766 | 760 | ||
767 | if (mapping->nrpages) { | 761 | retval = nfs_sync_mapping(mapping); |
768 | retval = filemap_fdatawrite(mapping); | 762 | if (retval) |
769 | if (retval == 0) | 763 | goto out; |
770 | retval = nfs_wb_all(inode); | ||
771 | if (retval == 0) | ||
772 | retval = filemap_fdatawait(mapping); | ||
773 | if (retval) | ||
774 | goto out; | ||
775 | } | ||
776 | 764 | ||
777 | retval = nfs_direct_write(inode, ctx, &iov, pos, 1); | 765 | retval = nfs_direct_write(inode, ctx, &iov, pos, 1); |
778 | if (mapping->nrpages) | 766 | if (mapping->nrpages) |
diff --git a/fs/nfs/file.c b/fs/nfs/file.c index 57d3e77d97ee..eb5cd4c3bbfd 100644 --- a/fs/nfs/file.c +++ b/fs/nfs/file.c | |||
@@ -433,11 +433,7 @@ static int do_unlk(struct file *filp, int cmd, struct file_lock *fl) | |||
433 | * Flush all pending writes before doing anything | 433 | * Flush all pending writes before doing anything |
434 | * with locks.. | 434 | * with locks.. |
435 | */ | 435 | */ |
436 | filemap_fdatawrite(filp->f_mapping); | 436 | nfs_sync_mapping(filp->f_mapping); |
437 | down(&inode->i_sem); | ||
438 | nfs_wb_all(inode); | ||
439 | up(&inode->i_sem); | ||
440 | filemap_fdatawait(filp->f_mapping); | ||
441 | 437 | ||
442 | /* NOTE: special case | 438 | /* NOTE: special case |
443 | * If we're signalled while cleaning up locks on process exit, we | 439 | * If we're signalled while cleaning up locks on process exit, we |
@@ -465,15 +461,8 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl) | |||
465 | * Flush all pending writes before doing anything | 461 | * Flush all pending writes before doing anything |
466 | * with locks.. | 462 | * with locks.. |
467 | */ | 463 | */ |
468 | status = filemap_fdatawrite(filp->f_mapping); | 464 | status = nfs_sync_mapping(filp->f_mapping); |
469 | if (status == 0) { | 465 | if (status != 0) |
470 | down(&inode->i_sem); | ||
471 | status = nfs_wb_all(inode); | ||
472 | up(&inode->i_sem); | ||
473 | if (status == 0) | ||
474 | status = filemap_fdatawait(filp->f_mapping); | ||
475 | } | ||
476 | if (status < 0) | ||
477 | goto out; | 466 | goto out; |
478 | 467 | ||
479 | lock_kernel(); | 468 | lock_kernel(); |
@@ -497,11 +486,7 @@ static int do_setlk(struct file *filp, int cmd, struct file_lock *fl) | |||
497 | * Make sure we clear the cache whenever we try to get the lock. | 486 | * Make sure we clear the cache whenever we try to get the lock. |
498 | * This makes locking act as a cache coherency point. | 487 | * This makes locking act as a cache coherency point. |
499 | */ | 488 | */ |
500 | filemap_fdatawrite(filp->f_mapping); | 489 | nfs_sync_mapping(filp->f_mapping); |
501 | down(&inode->i_sem); | ||
502 | nfs_wb_all(inode); /* we may have slept */ | ||
503 | up(&inode->i_sem); | ||
504 | filemap_fdatawait(filp->f_mapping); | ||
505 | nfs_zap_caches(inode); | 490 | nfs_zap_caches(inode); |
506 | out: | 491 | out: |
507 | rpc_clnt_sigunmask(NFS_CLIENT(inode), &oldset); | 492 | rpc_clnt_sigunmask(NFS_CLIENT(inode), &oldset); |
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index afd75d0463fd..432f41cd75e6 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c | |||
@@ -640,6 +640,27 @@ static int nfs_show_options(struct seq_file *m, struct vfsmount *mnt) | |||
640 | return 0; | 640 | return 0; |
641 | } | 641 | } |
642 | 642 | ||
643 | /** | ||
644 | * nfs_sync_mapping - helper to flush all mmapped dirty data to disk | ||
645 | */ | ||
646 | int nfs_sync_mapping(struct address_space *mapping) | ||
647 | { | ||
648 | int ret; | ||
649 | |||
650 | if (mapping->nrpages == 0) | ||
651 | return 0; | ||
652 | unmap_mapping_range(mapping, 0, 0, 0); | ||
653 | ret = filemap_fdatawrite(mapping); | ||
654 | if (ret != 0) | ||
655 | goto out; | ||
656 | ret = filemap_fdatawait(mapping); | ||
657 | if (ret != 0) | ||
658 | goto out; | ||
659 | ret = nfs_wb_all(mapping->host); | ||
660 | out: | ||
661 | return ret; | ||
662 | } | ||
663 | |||
643 | /* | 664 | /* |
644 | * Invalidate the local caches | 665 | * Invalidate the local caches |
645 | */ | 666 | */ |
@@ -1179,11 +1200,8 @@ void nfs_revalidate_mapping(struct inode *inode, struct address_space *mapping) | |||
1179 | struct nfs_inode *nfsi = NFS_I(inode); | 1200 | struct nfs_inode *nfsi = NFS_I(inode); |
1180 | 1201 | ||
1181 | if (nfsi->cache_validity & NFS_INO_INVALID_DATA) { | 1202 | if (nfsi->cache_validity & NFS_INO_INVALID_DATA) { |
1182 | if (S_ISREG(inode->i_mode)) { | 1203 | if (S_ISREG(inode->i_mode)) |
1183 | if (filemap_fdatawrite(mapping) == 0) | 1204 | nfs_sync_mapping(mapping); |
1184 | filemap_fdatawait(mapping); | ||
1185 | nfs_wb_all(inode); | ||
1186 | } | ||
1187 | invalidate_inode_pages2(mapping); | 1205 | invalidate_inode_pages2(mapping); |
1188 | 1206 | ||
1189 | spin_lock(&inode->i_lock); | 1207 | spin_lock(&inode->i_lock); |
diff --git a/fs/nfsd/nfs2acl.c b/fs/nfsd/nfs2acl.c index 7cbf0682b2f0..fc95c4df6693 100644 --- a/fs/nfsd/nfs2acl.c +++ b/fs/nfsd/nfs2acl.c | |||
@@ -107,7 +107,7 @@ static int nfsacld_proc_setacl(struct svc_rqst * rqstp, | |||
107 | dprintk("nfsd: SETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); | 107 | dprintk("nfsd: SETACL(2acl) %s\n", SVCFH_fmt(&argp->fh)); |
108 | 108 | ||
109 | fh = fh_copy(&resp->fh, &argp->fh); | 109 | fh = fh_copy(&resp->fh, &argp->fh); |
110 | nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP); | 110 | nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_SATTR); |
111 | 111 | ||
112 | if (!nfserr) { | 112 | if (!nfserr) { |
113 | nfserr = nfserrno( nfsd_set_posix_acl( | 113 | nfserr = nfserrno( nfsd_set_posix_acl( |
diff --git a/fs/nfsd/nfs3acl.c b/fs/nfsd/nfs3acl.c index 64ba40572fea..16e10c170aed 100644 --- a/fs/nfsd/nfs3acl.c +++ b/fs/nfsd/nfs3acl.c | |||
@@ -101,7 +101,7 @@ static int nfsd3_proc_setacl(struct svc_rqst * rqstp, | |||
101 | int nfserr = 0; | 101 | int nfserr = 0; |
102 | 102 | ||
103 | fh = fh_copy(&resp->fh, &argp->fh); | 103 | fh = fh_copy(&resp->fh, &argp->fh); |
104 | nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_NOP); | 104 | nfserr = fh_verify(rqstp, &resp->fh, 0, MAY_SATTR); |
105 | 105 | ||
106 | if (!nfserr) { | 106 | if (!nfserr) { |
107 | nfserr = nfserrno( nfsd_set_posix_acl( | 107 | nfserr = nfserrno( nfsd_set_posix_acl( |
diff --git a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c index 0a044ad98885..a5e3a0ddbe53 100644 --- a/fs/reiserfs/inode.c +++ b/fs/reiserfs/inode.c | |||
@@ -32,6 +32,7 @@ void reiserfs_delete_inode(struct inode *inode) | |||
32 | JOURNAL_PER_BALANCE_CNT * 2 + | 32 | JOURNAL_PER_BALANCE_CNT * 2 + |
33 | 2 * REISERFS_QUOTA_INIT_BLOCKS(inode->i_sb); | 33 | 2 * REISERFS_QUOTA_INIT_BLOCKS(inode->i_sb); |
34 | struct reiserfs_transaction_handle th; | 34 | struct reiserfs_transaction_handle th; |
35 | int err; | ||
35 | 36 | ||
36 | truncate_inode_pages(&inode->i_data, 0); | 37 | truncate_inode_pages(&inode->i_data, 0); |
37 | 38 | ||
@@ -49,15 +50,13 @@ void reiserfs_delete_inode(struct inode *inode) | |||
49 | } | 50 | } |
50 | reiserfs_update_inode_transaction(inode); | 51 | reiserfs_update_inode_transaction(inode); |
51 | 52 | ||
52 | if (reiserfs_delete_object(&th, inode)) { | 53 | err = reiserfs_delete_object(&th, inode); |
53 | up(&inode->i_sem); | ||
54 | goto out; | ||
55 | } | ||
56 | 54 | ||
57 | /* Do quota update inside a transaction for journaled quotas. We must do that | 55 | /* Do quota update inside a transaction for journaled quotas. We must do that |
58 | * after delete_object so that quota updates go into the same transaction as | 56 | * after delete_object so that quota updates go into the same transaction as |
59 | * stat data deletion */ | 57 | * stat data deletion */ |
60 | DQUOT_FREE_INODE(inode); | 58 | if (!err) |
59 | DQUOT_FREE_INODE(inode); | ||
61 | 60 | ||
62 | if (journal_end(&th, inode->i_sb, jbegin_count)) { | 61 | if (journal_end(&th, inode->i_sb, jbegin_count)) { |
63 | up(&inode->i_sem); | 62 | up(&inode->i_sem); |
@@ -66,6 +65,12 @@ void reiserfs_delete_inode(struct inode *inode) | |||
66 | 65 | ||
67 | up(&inode->i_sem); | 66 | up(&inode->i_sem); |
68 | 67 | ||
68 | /* check return value from reiserfs_delete_object after | ||
69 | * ending the transaction | ||
70 | */ | ||
71 | if (err) | ||
72 | goto out; | ||
73 | |||
69 | /* all items of file are deleted, so we can remove "save" link */ | 74 | /* all items of file are deleted, so we can remove "save" link */ |
70 | remove_save_link(inode, 0 /* not truncate */ ); /* we can't do anything | 75 | remove_save_link(inode, 0 /* not truncate */ ); /* we can't do anything |
71 | * about an error here */ | 76 | * about an error here */ |
@@ -2099,6 +2104,7 @@ int reiserfs_truncate_file(struct inode *p_s_inode, int update_timestamps) | |||
2099 | struct page *page = NULL; | 2104 | struct page *page = NULL; |
2100 | int error; | 2105 | int error; |
2101 | struct buffer_head *bh = NULL; | 2106 | struct buffer_head *bh = NULL; |
2107 | int err2; | ||
2102 | 2108 | ||
2103 | reiserfs_write_lock(p_s_inode->i_sb); | 2109 | reiserfs_write_lock(p_s_inode->i_sb); |
2104 | 2110 | ||
@@ -2136,14 +2142,18 @@ int reiserfs_truncate_file(struct inode *p_s_inode, int update_timestamps) | |||
2136 | transaction of truncating gets committed - on reboot the file | 2142 | transaction of truncating gets committed - on reboot the file |
2137 | either appears truncated properly or not truncated at all */ | 2143 | either appears truncated properly or not truncated at all */ |
2138 | add_save_link(&th, p_s_inode, 1); | 2144 | add_save_link(&th, p_s_inode, 1); |
2139 | error = reiserfs_do_truncate(&th, p_s_inode, page, update_timestamps); | 2145 | err2 = reiserfs_do_truncate(&th, p_s_inode, page, update_timestamps); |
2140 | if (error) | ||
2141 | goto out; | ||
2142 | error = | 2146 | error = |
2143 | journal_end(&th, p_s_inode->i_sb, JOURNAL_PER_BALANCE_CNT * 2 + 1); | 2147 | journal_end(&th, p_s_inode->i_sb, JOURNAL_PER_BALANCE_CNT * 2 + 1); |
2144 | if (error) | 2148 | if (error) |
2145 | goto out; | 2149 | goto out; |
2146 | 2150 | ||
2151 | /* check reiserfs_do_truncate after ending the transaction */ | ||
2152 | if (err2) { | ||
2153 | error = err2; | ||
2154 | goto out; | ||
2155 | } | ||
2156 | |||
2147 | if (update_timestamps) { | 2157 | if (update_timestamps) { |
2148 | error = remove_save_link(p_s_inode, 1 /* truncate */ ); | 2158 | error = remove_save_link(p_s_inode, 1 /* truncate */ ); |
2149 | if (error) | 2159 | if (error) |
diff --git a/fs/reiserfs/journal.c b/fs/reiserfs/journal.c index 68b7b78638ff..3f17ef844fb6 100644 --- a/fs/reiserfs/journal.c +++ b/fs/reiserfs/journal.c | |||
@@ -1039,6 +1039,10 @@ static int flush_commit_list(struct super_block *s, | |||
1039 | } | 1039 | } |
1040 | atomic_dec(&journal->j_async_throttle); | 1040 | atomic_dec(&journal->j_async_throttle); |
1041 | 1041 | ||
1042 | /* We're skipping the commit if there's an error */ | ||
1043 | if (retval || reiserfs_is_journal_aborted(journal)) | ||
1044 | barrier = 0; | ||
1045 | |||
1042 | /* wait on everything written so far before writing the commit | 1046 | /* wait on everything written so far before writing the commit |
1043 | * if we are in barrier mode, send the commit down now | 1047 | * if we are in barrier mode, send the commit down now |
1044 | */ | 1048 | */ |
@@ -1077,10 +1081,16 @@ static int flush_commit_list(struct super_block *s, | |||
1077 | BUG_ON(atomic_read(&(jl->j_commit_left)) != 1); | 1081 | BUG_ON(atomic_read(&(jl->j_commit_left)) != 1); |
1078 | 1082 | ||
1079 | if (!barrier) { | 1083 | if (!barrier) { |
1080 | if (buffer_dirty(jl->j_commit_bh)) | 1084 | /* If there was a write error in the journal - we can't commit |
1081 | BUG(); | 1085 | * this transaction - it will be invalid and, if successful, |
1082 | mark_buffer_dirty(jl->j_commit_bh); | 1086 | * will just end up propogating the write error out to |
1083 | sync_dirty_buffer(jl->j_commit_bh); | 1087 | * the file system. */ |
1088 | if (likely(!retval && !reiserfs_is_journal_aborted (journal))) { | ||
1089 | if (buffer_dirty(jl->j_commit_bh)) | ||
1090 | BUG(); | ||
1091 | mark_buffer_dirty(jl->j_commit_bh) ; | ||
1092 | sync_dirty_buffer(jl->j_commit_bh) ; | ||
1093 | } | ||
1084 | } else | 1094 | } else |
1085 | wait_on_buffer(jl->j_commit_bh); | 1095 | wait_on_buffer(jl->j_commit_bh); |
1086 | 1096 | ||
diff --git a/fs/relayfs/relay.c b/fs/relayfs/relay.c index 16446a15c96d..2a6f7f12b7f9 100644 --- a/fs/relayfs/relay.c +++ b/fs/relayfs/relay.c | |||
@@ -333,8 +333,7 @@ size_t relay_switch_subbuf(struct rchan_buf *buf, size_t length) | |||
333 | return length; | 333 | return length; |
334 | 334 | ||
335 | toobig: | 335 | toobig: |
336 | printk(KERN_WARNING "relayfs: event too large (%Zd)\n", length); | 336 | buf->chan->last_toobig = length; |
337 | WARN_ON(1); | ||
338 | return 0; | 337 | return 0; |
339 | } | 338 | } |
340 | 339 | ||
@@ -399,6 +398,11 @@ void relay_close(struct rchan *chan) | |||
399 | relay_close_buf(chan->buf[i]); | 398 | relay_close_buf(chan->buf[i]); |
400 | } | 399 | } |
401 | 400 | ||
401 | if (chan->last_toobig) | ||
402 | printk(KERN_WARNING "relayfs: one or more items not logged " | ||
403 | "[item size (%Zd) > sub-buffer size (%Zd)]\n", | ||
404 | chan->last_toobig, chan->subbuf_size); | ||
405 | |||
402 | kref_put(&chan->kref, relay_destroy_channel); | 406 | kref_put(&chan->kref, relay_destroy_channel); |
403 | } | 407 | } |
404 | 408 | ||
diff --git a/fs/xattr.c b/fs/xattr.c index a9db22557998..bcc2156d4d28 100644 --- a/fs/xattr.c +++ b/fs/xattr.c | |||
@@ -245,7 +245,7 @@ listxattr(struct dentry *d, char __user *list, size_t size) | |||
245 | error = d->d_inode->i_op->listxattr(d, klist, size); | 245 | error = d->d_inode->i_op->listxattr(d, klist, size); |
246 | } else { | 246 | } else { |
247 | error = security_inode_listsecurity(d->d_inode, klist, size); | 247 | error = security_inode_listsecurity(d->d_inode, klist, size); |
248 | if (size && error >= size) | 248 | if (size && error > size) |
249 | error = -ERANGE; | 249 | error = -ERANGE; |
250 | } | 250 | } |
251 | if (error > 0) { | 251 | if (error > 0) { |
diff --git a/fs/xfs/quota/xfs_qm.c b/fs/xfs/quota/xfs_qm.c index 1aea42d71a64..5328a2937127 100644 --- a/fs/xfs/quota/xfs_qm.c +++ b/fs/xfs/quota/xfs_qm.c | |||
@@ -78,7 +78,7 @@ STATIC int xfs_qm_dqhashlock_nowait(xfs_dquot_t *); | |||
78 | 78 | ||
79 | STATIC int xfs_qm_init_quotainos(xfs_mount_t *); | 79 | STATIC int xfs_qm_init_quotainos(xfs_mount_t *); |
80 | STATIC int xfs_qm_init_quotainfo(xfs_mount_t *); | 80 | STATIC int xfs_qm_init_quotainfo(xfs_mount_t *); |
81 | STATIC int xfs_qm_shake(int, unsigned int); | 81 | STATIC int xfs_qm_shake(int, gfp_t); |
82 | 82 | ||
83 | #ifdef DEBUG | 83 | #ifdef DEBUG |
84 | extern mutex_t qcheck_lock; | 84 | extern mutex_t qcheck_lock; |
@@ -2197,7 +2197,7 @@ xfs_qm_shake_freelist( | |||
2197 | */ | 2197 | */ |
2198 | /* ARGSUSED */ | 2198 | /* ARGSUSED */ |
2199 | STATIC int | 2199 | STATIC int |
2200 | xfs_qm_shake(int nr_to_scan, unsigned int gfp_mask) | 2200 | xfs_qm_shake(int nr_to_scan, gfp_t gfp_mask) |
2201 | { | 2201 | { |
2202 | int ndqused, nfree, n; | 2202 | int ndqused, nfree, n; |
2203 | 2203 | ||
diff --git a/include/asm-arm/arch-pxa/irq.h b/include/asm-arm/arch-pxa/irq.h index d770e4b37ae1..48c60f5eff6a 100644 --- a/include/asm-arm/arch-pxa/irq.h +++ b/include/asm-arm/arch-pxa/irq.h | |||
@@ -12,8 +12,3 @@ | |||
12 | 12 | ||
13 | #define fixup_irq(x) (x) | 13 | #define fixup_irq(x) (x) |
14 | 14 | ||
15 | /* | ||
16 | * This prototype is required for cascading of multiplexed interrupts. | ||
17 | * Since it doesn't exist elsewhere, we'll put it here for now. | ||
18 | */ | ||
19 | extern void do_IRQ(int irq, struct pt_regs *regs); | ||
diff --git a/include/asm-arm/elf.h b/include/asm-arm/elf.h index 7da97a937548..2d44b42d1847 100644 --- a/include/asm-arm/elf.h +++ b/include/asm-arm/elf.h | |||
@@ -22,6 +22,8 @@ typedef unsigned long elf_freg_t[3]; | |||
22 | #define R_ARM_NONE 0 | 22 | #define R_ARM_NONE 0 |
23 | #define R_ARM_PC24 1 | 23 | #define R_ARM_PC24 1 |
24 | #define R_ARM_ABS32 2 | 24 | #define R_ARM_ABS32 2 |
25 | #define R_ARM_CALL 28 | ||
26 | #define R_ARM_JUMP24 29 | ||
25 | 27 | ||
26 | #define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t)) | 28 | #define ELF_NGREG (sizeof (struct pt_regs) / sizeof(elf_greg_t)) |
27 | typedef elf_greg_t elf_gregset_t[ELF_NGREG]; | 29 | typedef elf_greg_t elf_gregset_t[ELF_NGREG]; |
diff --git a/include/asm-arm/io.h b/include/asm-arm/io.h index ae69db4a1010..0cf4d4f99600 100644 --- a/include/asm-arm/io.h +++ b/include/asm-arm/io.h | |||
@@ -42,9 +42,9 @@ extern void __raw_writesb(void __iomem *addr, const void *data, int bytelen); | |||
42 | extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen); | 42 | extern void __raw_writesw(void __iomem *addr, const void *data, int wordlen); |
43 | extern void __raw_writesl(void __iomem *addr, const void *data, int longlen); | 43 | extern void __raw_writesl(void __iomem *addr, const void *data, int longlen); |
44 | 44 | ||
45 | extern void __raw_readsb(void __iomem *addr, void *data, int bytelen); | 45 | extern void __raw_readsb(const void __iomem *addr, void *data, int bytelen); |
46 | extern void __raw_readsw(void __iomem *addr, void *data, int wordlen); | 46 | extern void __raw_readsw(const void __iomem *addr, void *data, int wordlen); |
47 | extern void __raw_readsl(void __iomem *addr, void *data, int longlen); | 47 | extern void __raw_readsl(const void __iomem *addr, void *data, int longlen); |
48 | 48 | ||
49 | #define __raw_writeb(v,a) (__chk_io_ptr(a), *(volatile unsigned char __force *)(a) = (v)) | 49 | #define __raw_writeb(v,a) (__chk_io_ptr(a), *(volatile unsigned char __force *)(a) = (v)) |
50 | #define __raw_writew(v,a) (__chk_io_ptr(a), *(volatile unsigned short __force *)(a) = (v)) | 50 | #define __raw_writew(v,a) (__chk_io_ptr(a), *(volatile unsigned short __force *)(a) = (v)) |
diff --git a/include/asm-arm/memory.h b/include/asm-arm/memory.h index a547ee598c6c..3e572364ee73 100644 --- a/include/asm-arm/memory.h +++ b/include/asm-arm/memory.h | |||
@@ -122,6 +122,7 @@ static inline void *phys_to_virt(unsigned long x) | |||
122 | */ | 122 | */ |
123 | #define __pa(x) __virt_to_phys((unsigned long)(x)) | 123 | #define __pa(x) __virt_to_phys((unsigned long)(x)) |
124 | #define __va(x) ((void *)__phys_to_virt((unsigned long)(x))) | 124 | #define __va(x) ((void *)__phys_to_virt((unsigned long)(x))) |
125 | #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) | ||
125 | 126 | ||
126 | /* | 127 | /* |
127 | * Virtual <-> DMA view memory address translations | 128 | * Virtual <-> DMA view memory address translations |
diff --git a/include/asm-ia64/delay.h b/include/asm-ia64/delay.h index 57182d6f2b9a..bba702076391 100644 --- a/include/asm-ia64/delay.h +++ b/include/asm-ia64/delay.h | |||
@@ -84,14 +84,6 @@ __delay (unsigned long loops) | |||
84 | ia64_delay_loop (loops - 1); | 84 | ia64_delay_loop (loops - 1); |
85 | } | 85 | } |
86 | 86 | ||
87 | static __inline__ void | 87 | extern void udelay (unsigned long usecs); |
88 | udelay (unsigned long usecs) | ||
89 | { | ||
90 | unsigned long start = ia64_get_itc(); | ||
91 | unsigned long cycles = usecs*local_cpu_data->cyc_per_usec; | ||
92 | |||
93 | while (ia64_get_itc() - start < cycles) | ||
94 | cpu_relax(); | ||
95 | } | ||
96 | 88 | ||
97 | #endif /* _ASM_IA64_DELAY_H */ | 89 | #endif /* _ASM_IA64_DELAY_H */ |
diff --git a/include/asm-ia64/ia32.h b/include/asm-ia64/ia32.h index 8e746b2413a6..f8044a1169cd 100644 --- a/include/asm-ia64/ia32.h +++ b/include/asm-ia64/ia32.h | |||
@@ -13,6 +13,8 @@ | |||
13 | 13 | ||
14 | # ifdef CONFIG_IA32_SUPPORT | 14 | # ifdef CONFIG_IA32_SUPPORT |
15 | 15 | ||
16 | #define IA32_PAGE_OFFSET 0xc0000000 | ||
17 | |||
16 | extern void ia32_cpu_init (void); | 18 | extern void ia32_cpu_init (void); |
17 | extern void ia32_mem_init (void); | 19 | extern void ia32_mem_init (void); |
18 | extern void ia32_gdt_init (void); | 20 | extern void ia32_gdt_init (void); |
diff --git a/include/asm-ia64/local.h b/include/asm-ia64/local.h index 1dbd584ad851..dc519092ef4d 100644 --- a/include/asm-ia64/local.h +++ b/include/asm-ia64/local.h | |||
@@ -17,8 +17,8 @@ typedef struct { | |||
17 | #define local_set(l, i) atomic64_set(&(l)->val, i) | 17 | #define local_set(l, i) atomic64_set(&(l)->val, i) |
18 | #define local_inc(l) atomic64_inc(&(l)->val) | 18 | #define local_inc(l) atomic64_inc(&(l)->val) |
19 | #define local_dec(l) atomic64_dec(&(l)->val) | 19 | #define local_dec(l) atomic64_dec(&(l)->val) |
20 | #define local_add(l) atomic64_add(&(l)->val) | 20 | #define local_add(i, l) atomic64_add((i), &(l)->val) |
21 | #define local_sub(l) atomic64_sub(&(l)->val) | 21 | #define local_sub(i, l) atomic64_sub((i), &(l)->val) |
22 | 22 | ||
23 | /* Non-atomic variants, i.e., preemption disabled and won't be touched in interrupt, etc. */ | 23 | /* Non-atomic variants, i.e., preemption disabled and won't be touched in interrupt, etc. */ |
24 | 24 | ||
diff --git a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h index 29df88bdd2bc..313cad0628d0 100644 --- a/include/asm-ia64/sal.h +++ b/include/asm-ia64/sal.h | |||
@@ -320,7 +320,8 @@ typedef struct sal_log_timestamp { | |||
320 | typedef struct sal_log_record_header { | 320 | typedef struct sal_log_record_header { |
321 | u64 id; /* Unique monotonically increasing ID */ | 321 | u64 id; /* Unique monotonically increasing ID */ |
322 | sal_log_revision_t revision; /* Major and Minor revision of header */ | 322 | sal_log_revision_t revision; /* Major and Minor revision of header */ |
323 | u16 severity; /* Error Severity */ | 323 | u8 severity; /* Error Severity */ |
324 | u8 validation_bits; /* 0: platform_guid, 1: !timestamp */ | ||
324 | u32 len; /* Length of this error log in bytes */ | 325 | u32 len; /* Length of this error log in bytes */ |
325 | sal_log_timestamp_t timestamp; /* Timestamp */ | 326 | sal_log_timestamp_t timestamp; /* Timestamp */ |
326 | efi_guid_t platform_guid; /* Unique OEM Platform ID */ | 327 | efi_guid_t platform_guid; /* Unique OEM Platform ID */ |
diff --git a/include/asm-ia64/sn/pcidev.h b/include/asm-ia64/sn/pcidev.h index 49711d00ad04..f65d222ca5e8 100644 --- a/include/asm-ia64/sn/pcidev.h +++ b/include/asm-ia64/sn/pcidev.h | |||
@@ -3,15 +3,27 @@ | |||
3 | * License. See the file "COPYING" in the main directory of this archive | 3 | * License. See the file "COPYING" in the main directory of this archive |
4 | * for more details. | 4 | * for more details. |
5 | * | 5 | * |
6 | * Copyright (C) 1992 - 1997, 2000-2004 Silicon Graphics, Inc. All rights reserved. | 6 | * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved. |
7 | */ | 7 | */ |
8 | #ifndef _ASM_IA64_SN_PCI_PCIDEV_H | 8 | #ifndef _ASM_IA64_SN_PCI_PCIDEV_H |
9 | #define _ASM_IA64_SN_PCI_PCIDEV_H | 9 | #define _ASM_IA64_SN_PCI_PCIDEV_H |
10 | 10 | ||
11 | #include <linux/pci.h> | 11 | #include <linux/pci.h> |
12 | 12 | ||
13 | #define SN_PCIDEV_INFO(pci_dev) \ | 13 | /* |
14 | ((struct pcidev_info *)(pci_dev)->sysdata) | 14 | * In ia64, pci_dev->sysdata must be a *pci_controller. To provide access to |
15 | * the pcidev_info structs for all devices under a controller, we extend the | ||
16 | * definition of pci_controller, via sn_pci_controller, to include a list | ||
17 | * of pcidev_info. | ||
18 | */ | ||
19 | struct sn_pci_controller { | ||
20 | struct pci_controller pci_controller; | ||
21 | struct list_head pcidev_info; | ||
22 | }; | ||
23 | |||
24 | #define SN_PCI_CONTROLLER(dev) ((struct sn_pci_controller *) dev->sysdata) | ||
25 | |||
26 | #define SN_PCIDEV_INFO(dev) sn_pcidev_info_get(dev) | ||
15 | 27 | ||
16 | #define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \ | 28 | #define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \ |
17 | (struct pcibus_info *)((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data)) | 29 | (struct pcibus_info *)((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data)) |
@@ -53,11 +65,13 @@ struct pcidev_info { | |||
53 | struct sn_irq_info *pdi_sn_irq_info; | 65 | struct sn_irq_info *pdi_sn_irq_info; |
54 | struct sn_pcibus_provider *pdi_provider; /* sn pci ops */ | 66 | struct sn_pcibus_provider *pdi_provider; /* sn pci ops */ |
55 | struct pci_dev *host_pci_dev; /* host bus link */ | 67 | struct pci_dev *host_pci_dev; /* host bus link */ |
68 | struct list_head pdi_list; /* List of pcidev_info */ | ||
56 | }; | 69 | }; |
57 | 70 | ||
58 | extern void sn_irq_fixup(struct pci_dev *pci_dev, | 71 | extern void sn_irq_fixup(struct pci_dev *pci_dev, |
59 | struct sn_irq_info *sn_irq_info); | 72 | struct sn_irq_info *sn_irq_info); |
60 | extern void sn_irq_unfixup(struct pci_dev *pci_dev); | 73 | extern void sn_irq_unfixup(struct pci_dev *pci_dev); |
74 | extern struct pcidev_info * sn_pcidev_info_get(struct pci_dev *); | ||
61 | extern void sn_pci_controller_fixup(int segment, int busnum, | 75 | extern void sn_pci_controller_fixup(int segment, int busnum, |
62 | struct pci_bus *bus); | 76 | struct pci_bus *bus); |
63 | extern void sn_bus_store_sysdata(struct pci_dev *dev); | 77 | extern void sn_bus_store_sysdata(struct pci_dev *dev); |
diff --git a/include/asm-ia64/spinlock.h b/include/asm-ia64/spinlock.h index 5b78611411c3..0c91a76c5ea3 100644 --- a/include/asm-ia64/spinlock.h +++ b/include/asm-ia64/spinlock.h | |||
@@ -201,6 +201,16 @@ static inline void __raw_write_unlock(raw_rwlock_t *x) | |||
201 | 201 | ||
202 | #endif /* !ASM_SUPPORTED */ | 202 | #endif /* !ASM_SUPPORTED */ |
203 | 203 | ||
204 | #define __raw_read_trylock(lock) generic__raw_read_trylock(lock) | 204 | static inline int __raw_read_trylock(raw_rwlock_t *x) |
205 | { | ||
206 | union { | ||
207 | raw_rwlock_t lock; | ||
208 | __u32 word; | ||
209 | } old, new; | ||
210 | old.lock = new.lock = *x; | ||
211 | old.lock.write_lock = new.lock.write_lock = 0; | ||
212 | ++new.lock.read_counter; | ||
213 | return (u32)ia64_cmpxchg4_acq((__u32 *)(x), new.word, old.word) == old.word; | ||
214 | } | ||
205 | 215 | ||
206 | #endif /* _ASM_IA64_SPINLOCK_H */ | 216 | #endif /* _ASM_IA64_SPINLOCK_H */ |
diff --git a/include/asm-mips/mach-au1x00/au1xxx_ide.h b/include/asm-mips/mach-au1x00/au1xxx_ide.h index 33d275c3b84c..e867b4ef96d1 100644 --- a/include/asm-mips/mach-au1x00/au1xxx_ide.h +++ b/include/asm-mips/mach-au1x00/au1xxx_ide.h | |||
@@ -74,9 +74,6 @@ typedef struct | |||
74 | u8 white_list, black_list; | 74 | u8 white_list, black_list; |
75 | struct dbdma_cmd *dma_table_cpu; | 75 | struct dbdma_cmd *dma_table_cpu; |
76 | dma_addr_t dma_table_dma; | 76 | dma_addr_t dma_table_dma; |
77 | struct scatterlist *sg_table; | ||
78 | int sg_nents; | ||
79 | int sg_dma_direction; | ||
80 | #endif | 77 | #endif |
81 | struct device *dev; | 78 | struct device *dev; |
82 | int irq; | 79 | int irq; |
@@ -87,11 +84,6 @@ typedef struct | |||
87 | } _auide_hwif; | 84 | } _auide_hwif; |
88 | 85 | ||
89 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 86 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
90 | struct drive_list_entry { | ||
91 | const char * id_model; | ||
92 | const char * id_firmware; | ||
93 | }; | ||
94 | |||
95 | /* HD white list */ | 87 | /* HD white list */ |
96 | static const struct drive_list_entry dma_white_list [] = { | 88 | static const struct drive_list_entry dma_white_list [] = { |
97 | /* | 89 | /* |
@@ -167,13 +159,9 @@ int __init auide_probe(void); | |||
167 | * Multi-Word DMA + DbDMA functions | 159 | * Multi-Word DMA + DbDMA functions |
168 | */ | 160 | */ |
169 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA | 161 | #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA |
170 | |||
171 | static int in_drive_list(struct hd_driveid *id, | ||
172 | const struct drive_list_entry *drive_table); | ||
173 | static int auide_build_sglist(ide_drive_t *drive, struct request *rq); | 162 | static int auide_build_sglist(ide_drive_t *drive, struct request *rq); |
174 | static int auide_build_dmatable(ide_drive_t *drive); | 163 | static int auide_build_dmatable(ide_drive_t *drive); |
175 | static int auide_dma_end(ide_drive_t *drive); | 164 | static int auide_dma_end(ide_drive_t *drive); |
176 | static void auide_dma_start(ide_drive_t *drive ); | ||
177 | ide_startstop_t auide_dma_intr (ide_drive_t *drive); | 165 | ide_startstop_t auide_dma_intr (ide_drive_t *drive); |
178 | static void auide_dma_exec_cmd(ide_drive_t *drive, u8 command); | 166 | static void auide_dma_exec_cmd(ide_drive_t *drive, u8 command); |
179 | static int auide_dma_setup(ide_drive_t *drive); | 167 | static int auide_dma_setup(ide_drive_t *drive); |
@@ -188,8 +176,6 @@ int __init auide_probe(void); | |||
188 | static void auide_ddma_rx_callback(int irq, void *param, | 176 | static void auide_ddma_rx_callback(int irq, void *param, |
189 | struct pt_regs *regs); | 177 | struct pt_regs *regs); |
190 | static int auide_dma_off_quietly(ide_drive_t *drive); | 178 | static int auide_dma_off_quietly(ide_drive_t *drive); |
191 | static int auide_dma_timeout(ide_drive_t *drive); | ||
192 | |||
193 | #endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */ | 179 | #endif /* end CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA */ |
194 | 180 | ||
195 | /******************************************************************************* | 181 | /******************************************************************************* |
@@ -299,3 +285,11 @@ int __init auide_probe(void); | |||
299 | #define SBC_IDE_MDMA2_TPM (0x00<<6) | 285 | #define SBC_IDE_MDMA2_TPM (0x00<<6) |
300 | #define SBC_IDE_MDMA2_TA (0x12<<0) | 286 | #define SBC_IDE_MDMA2_TA (0x12<<0) |
301 | 287 | ||
288 | #define SBC_IDE_TIMING(mode) \ | ||
289 | SBC_IDE_##mode##_TWCS | \ | ||
290 | SBC_IDE_##mode##_TCSH | \ | ||
291 | SBC_IDE_##mode##_TCSOFF | \ | ||
292 | SBC_IDE_##mode##_TWP | \ | ||
293 | SBC_IDE_##mode##_TCSW | \ | ||
294 | SBC_IDE_##mode##_TPM | \ | ||
295 | SBC_IDE_##mode##_TA | ||
diff --git a/include/asm-powerpc/mmu.h b/include/asm-powerpc/mmu.h index c1b4bbabbe97..29b0bb0086d3 100644 --- a/include/asm-powerpc/mmu.h +++ b/include/asm-powerpc/mmu.h | |||
@@ -220,7 +220,8 @@ extern int __hash_page_64K(unsigned long ea, unsigned long access, | |||
220 | unsigned int local); | 220 | unsigned int local); |
221 | struct mm_struct; | 221 | struct mm_struct; |
222 | extern int hash_huge_page(struct mm_struct *mm, unsigned long access, | 222 | extern int hash_huge_page(struct mm_struct *mm, unsigned long access, |
223 | unsigned long ea, unsigned long vsid, int local); | 223 | unsigned long ea, unsigned long vsid, int local, |
224 | unsigned long trap); | ||
224 | 225 | ||
225 | extern void htab_finish_init(void); | 226 | extern void htab_finish_init(void); |
226 | extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend, | 227 | extern int htab_bolt_mapping(unsigned long vstart, unsigned long vend, |
diff --git a/include/asm-ppc/ppc4xx_dma.h b/include/asm-ppc/ppc4xx_dma.h index a415001165fa..46a086fff816 100644 --- a/include/asm-ppc/ppc4xx_dma.h +++ b/include/asm-ppc/ppc4xx_dma.h | |||
@@ -33,9 +33,6 @@ | |||
33 | 33 | ||
34 | #define MAX_PPC4xx_DMA_CHANNELS 4 | 34 | #define MAX_PPC4xx_DMA_CHANNELS 4 |
35 | 35 | ||
36 | /* in arch/ppc/kernel/setup.c -- Cort */ | ||
37 | extern unsigned long DMA_MODE_WRITE, DMA_MODE_READ; | ||
38 | |||
39 | /* | 36 | /* |
40 | * Function return status codes | 37 | * Function return status codes |
41 | * These values are used to indicate whether or not the function | 38 | * These values are used to indicate whether or not the function |
diff --git a/include/asm-sparc/memreg.h b/include/asm-sparc/memreg.h index c0498d3baf93..5fb95c828da6 100644 --- a/include/asm-sparc/memreg.h +++ b/include/asm-sparc/memreg.h | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | /* Memory parity error register with associated bit constants. */ | 37 | /* Memory parity error register with associated bit constants. */ |
38 | #ifndef __ASSEMBLY__ | 38 | #ifndef __ASSEMBLY__ |
39 | extern __volatile__ unsigned long *sun4c_memerr_reg; | 39 | extern __volatile__ unsigned long __iomem *sun4c_memerr_reg; |
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | #define SUN4C_MPE_ERROR 0x80 /* Parity error detected. (ro) */ | 42 | #define SUN4C_MPE_ERROR 0x80 /* Parity error detected. (ro) */ |
diff --git a/include/asm-sparc/pcic.h b/include/asm-sparc/pcic.h index 301ae8022ddd..dedea14d87c8 100644 --- a/include/asm-sparc/pcic.h +++ b/include/asm-sparc/pcic.h | |||
@@ -16,10 +16,10 @@ | |||
16 | #include <asm/pbm.h> | 16 | #include <asm/pbm.h> |
17 | 17 | ||
18 | struct linux_pcic { | 18 | struct linux_pcic { |
19 | void * __iomem pcic_regs; | 19 | void __iomem *pcic_regs; |
20 | unsigned long pcic_io; | 20 | unsigned long pcic_io; |
21 | void * __iomem pcic_config_space_addr; | 21 | void __iomem *pcic_config_space_addr; |
22 | void * __iomem pcic_config_space_data; | 22 | void __iomem *pcic_config_space_data; |
23 | struct resource pcic_res_regs; | 23 | struct resource pcic_res_regs; |
24 | struct resource pcic_res_io; | 24 | struct resource pcic_res_io; |
25 | struct resource pcic_res_cfg_addr; | 25 | struct resource pcic_res_cfg_addr; |
diff --git a/include/linux/cache.h b/include/linux/cache.h index f6b5a46c5f82..0b7ecf3af78a 100644 --- a/include/linux/cache.h +++ b/include/linux/cache.h | |||
@@ -13,7 +13,7 @@ | |||
13 | #define SMP_CACHE_BYTES L1_CACHE_BYTES | 13 | #define SMP_CACHE_BYTES L1_CACHE_BYTES |
14 | #endif | 14 | #endif |
15 | 15 | ||
16 | #if defined(CONFIG_X86) || defined(CONFIG_SPARC64) | 16 | #if defined(CONFIG_X86) || defined(CONFIG_SPARC64) || defined(CONFIG_IA64) |
17 | #define __read_mostly __attribute__((__section__(".data.read_mostly"))) | 17 | #define __read_mostly __attribute__((__section__(".data.read_mostly"))) |
18 | #else | 18 | #else |
19 | #define __read_mostly | 19 | #define __read_mostly |
diff --git a/include/linux/cn_proc.h b/include/linux/cn_proc.h index c948f678e04e..1417de935057 100644 --- a/include/linux/cn_proc.h +++ b/include/linux/cn_proc.h | |||
@@ -26,6 +26,7 @@ | |||
26 | #define CN_PROC_H | 26 | #define CN_PROC_H |
27 | 27 | ||
28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
29 | #include <linux/time.h> | ||
29 | #include <linux/connector.h> | 30 | #include <linux/connector.h> |
30 | 31 | ||
31 | /* | 32 | /* |
@@ -65,6 +66,7 @@ struct proc_event { | |||
65 | PROC_EVENT_EXIT = 0x80000000 | 66 | PROC_EVENT_EXIT = 0x80000000 |
66 | } what; | 67 | } what; |
67 | __u32 cpu; | 68 | __u32 cpu; |
69 | struct timespec timestamp; | ||
68 | union { /* must be last field of proc_event struct */ | 70 | union { /* must be last field of proc_event struct */ |
69 | struct { | 71 | struct { |
70 | __u32 err; | 72 | __u32 err; |
diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h index cc314443f1c4..2b8797084685 100644 --- a/include/linux/dvb/audio.h +++ b/include/linux/dvb/audio.h | |||
@@ -32,39 +32,39 @@ | |||
32 | 32 | ||
33 | 33 | ||
34 | typedef enum { | 34 | typedef enum { |
35 | AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ | 35 | AUDIO_SOURCE_DEMUX, /* Select the demux as the main source */ |
36 | AUDIO_SOURCE_MEMORY /* Select internal memory as the main source */ | 36 | AUDIO_SOURCE_MEMORY /* Select internal memory as the main source */ |
37 | } audio_stream_source_t; | 37 | } audio_stream_source_t; |
38 | 38 | ||
39 | 39 | ||
40 | typedef enum { | 40 | typedef enum { |
41 | AUDIO_STOPPED, /* Device is stopped */ | 41 | AUDIO_STOPPED, /* Device is stopped */ |
42 | AUDIO_PLAYING, /* Device is currently playing */ | 42 | AUDIO_PLAYING, /* Device is currently playing */ |
43 | AUDIO_PAUSED /* Device is paused */ | 43 | AUDIO_PAUSED /* Device is paused */ |
44 | } audio_play_state_t; | 44 | } audio_play_state_t; |
45 | 45 | ||
46 | 46 | ||
47 | typedef enum { | 47 | typedef enum { |
48 | AUDIO_STEREO, | 48 | AUDIO_STEREO, |
49 | AUDIO_MONO_LEFT, | 49 | AUDIO_MONO_LEFT, |
50 | AUDIO_MONO_RIGHT | 50 | AUDIO_MONO_RIGHT |
51 | } audio_channel_select_t; | 51 | } audio_channel_select_t; |
52 | 52 | ||
53 | 53 | ||
54 | typedef struct audio_mixer { | 54 | typedef struct audio_mixer { |
55 | unsigned int volume_left; | 55 | unsigned int volume_left; |
56 | unsigned int volume_right; | 56 | unsigned int volume_right; |
57 | // what else do we need? bass, pass-through, ... | 57 | // what else do we need? bass, pass-through, ... |
58 | } audio_mixer_t; | 58 | } audio_mixer_t; |
59 | 59 | ||
60 | 60 | ||
61 | typedef struct audio_status { | 61 | typedef struct audio_status { |
62 | int AV_sync_state; /* sync audio and video? */ | 62 | int AV_sync_state; /* sync audio and video? */ |
63 | int mute_state; /* audio is muted */ | 63 | int mute_state; /* audio is muted */ |
64 | audio_play_state_t play_state; /* current playback state */ | 64 | audio_play_state_t play_state; /* current playback state */ |
65 | audio_stream_source_t stream_source; /* current stream source */ | 65 | audio_stream_source_t stream_source; /* current stream source */ |
66 | audio_channel_select_t channel_select; /* currently selected channel */ | 66 | audio_channel_select_t channel_select; /* currently selected channel */ |
67 | int bypass_mode; /* pass on audio data to */ | 67 | int bypass_mode; /* pass on audio data to */ |
68 | audio_mixer_t mixer_state; /* current mixer state */ | 68 | audio_mixer_t mixer_state; /* current mixer state */ |
69 | } audio_status_t; /* separate decoder hardware */ | 69 | } audio_status_t; /* separate decoder hardware */ |
70 | 70 | ||
@@ -74,8 +74,8 @@ struct audio_karaoke{ /* if Vocal1 or Vocal2 are non-zero, they get mixed */ | |||
74 | int vocal1; /* into left and right t at 70% each */ | 74 | int vocal1; /* into left and right t at 70% each */ |
75 | int vocal2; /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/ | 75 | int vocal2; /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/ |
76 | int melody; /* mixed into the left channel and */ | 76 | int melody; /* mixed into the left channel and */ |
77 | /* Vocal2 into the right channel at 100% each. */ | 77 | /* Vocal2 into the right channel at 100% each. */ |
78 | /* if Melody is non-zero, the melody channel gets mixed*/ | 78 | /* if Melody is non-zero, the melody channel gets mixed*/ |
79 | } audio_karaoke_t; /* into left and right */ | 79 | } audio_karaoke_t; /* into left and right */ |
80 | 80 | ||
81 | 81 | ||
diff --git a/include/linux/dvb/ca.h b/include/linux/dvb/ca.h index 558af0cc7692..c18537f3e449 100644 --- a/include/linux/dvb/ca.h +++ b/include/linux/dvb/ca.h | |||
@@ -27,16 +27,16 @@ | |||
27 | /* slot interface types and info */ | 27 | /* slot interface types and info */ |
28 | 28 | ||
29 | typedef struct ca_slot_info { | 29 | typedef struct ca_slot_info { |
30 | int num; /* slot number */ | 30 | int num; /* slot number */ |
31 | 31 | ||
32 | int type; /* CA interface this slot supports */ | 32 | int type; /* CA interface this slot supports */ |
33 | #define CA_CI 1 /* CI high level interface */ | 33 | #define CA_CI 1 /* CI high level interface */ |
34 | #define CA_CI_LINK 2 /* CI link layer level interface */ | 34 | #define CA_CI_LINK 2 /* CI link layer level interface */ |
35 | #define CA_CI_PHYS 4 /* CI physical layer level interface */ | 35 | #define CA_CI_PHYS 4 /* CI physical layer level interface */ |
36 | #define CA_DESCR 8 /* built-in descrambler */ | 36 | #define CA_DESCR 8 /* built-in descrambler */ |
37 | #define CA_SC 128 /* simple smart card interface */ | 37 | #define CA_SC 128 /* simple smart card interface */ |
38 | 38 | ||
39 | unsigned int flags; | 39 | unsigned int flags; |
40 | #define CA_CI_MODULE_PRESENT 1 /* module (or card) inserted */ | 40 | #define CA_CI_MODULE_PRESENT 1 /* module (or card) inserted */ |
41 | #define CA_CI_MODULE_READY 2 | 41 | #define CA_CI_MODULE_READY 2 |
42 | } ca_slot_info_t; | 42 | } ca_slot_info_t; |
@@ -45,37 +45,37 @@ typedef struct ca_slot_info { | |||
45 | /* descrambler types and info */ | 45 | /* descrambler types and info */ |
46 | 46 | ||
47 | typedef struct ca_descr_info { | 47 | typedef struct ca_descr_info { |
48 | unsigned int num; /* number of available descramblers (keys) */ | 48 | unsigned int num; /* number of available descramblers (keys) */ |
49 | unsigned int type; /* type of supported scrambling system */ | 49 | unsigned int type; /* type of supported scrambling system */ |
50 | #define CA_ECD 1 | 50 | #define CA_ECD 1 |
51 | #define CA_NDS 2 | 51 | #define CA_NDS 2 |
52 | #define CA_DSS 4 | 52 | #define CA_DSS 4 |
53 | } ca_descr_info_t; | 53 | } ca_descr_info_t; |
54 | 54 | ||
55 | typedef struct ca_caps { | 55 | typedef struct ca_caps { |
56 | unsigned int slot_num; /* total number of CA card and module slots */ | 56 | unsigned int slot_num; /* total number of CA card and module slots */ |
57 | unsigned int slot_type; /* OR of all supported types */ | 57 | unsigned int slot_type; /* OR of all supported types */ |
58 | unsigned int descr_num; /* total number of descrambler slots (keys) */ | 58 | unsigned int descr_num; /* total number of descrambler slots (keys) */ |
59 | unsigned int descr_type; /* OR of all supported types */ | 59 | unsigned int descr_type; /* OR of all supported types */ |
60 | } ca_caps_t; | 60 | } ca_caps_t; |
61 | 61 | ||
62 | /* a message to/from a CI-CAM */ | 62 | /* a message to/from a CI-CAM */ |
63 | typedef struct ca_msg { | 63 | typedef struct ca_msg { |
64 | unsigned int index; | 64 | unsigned int index; |
65 | unsigned int type; | 65 | unsigned int type; |
66 | unsigned int length; | 66 | unsigned int length; |
67 | unsigned char msg[256]; | 67 | unsigned char msg[256]; |
68 | } ca_msg_t; | 68 | } ca_msg_t; |
69 | 69 | ||
70 | typedef struct ca_descr { | 70 | typedef struct ca_descr { |
71 | unsigned int index; | 71 | unsigned int index; |
72 | unsigned int parity; /* 0 == even, 1 == odd */ | 72 | unsigned int parity; /* 0 == even, 1 == odd */ |
73 | unsigned char cw[8]; | 73 | unsigned char cw[8]; |
74 | } ca_descr_t; | 74 | } ca_descr_t; |
75 | 75 | ||
76 | typedef struct ca_pid { | 76 | typedef struct ca_pid { |
77 | unsigned int pid; | 77 | unsigned int pid; |
78 | int index; /* -1 == disable*/ | 78 | int index; /* -1 == disable*/ |
79 | } ca_pid_t; | 79 | } ca_pid_t; |
80 | 80 | ||
81 | #define CA_RESET _IO('o', 128) | 81 | #define CA_RESET _IO('o', 128) |
diff --git a/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h index ce3f829da82c..2787b8a22ff1 100644 --- a/include/linux/dvb/dmx.h +++ b/include/linux/dvb/dmx.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | * dmx.h | 2 | * dmx.h |
3 | * | 3 | * |
4 | * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de> | 4 | * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de> |
@@ -38,10 +38,10 @@ typedef enum | |||
38 | { | 38 | { |
39 | DMX_OUT_DECODER, /* Streaming directly to decoder. */ | 39 | DMX_OUT_DECODER, /* Streaming directly to decoder. */ |
40 | DMX_OUT_TAP, /* Output going to a memory buffer */ | 40 | DMX_OUT_TAP, /* Output going to a memory buffer */ |
41 | /* (to be retrieved via the read command).*/ | 41 | /* (to be retrieved via the read command).*/ |
42 | DMX_OUT_TS_TAP /* Output multiplexed into a new TS */ | 42 | DMX_OUT_TS_TAP /* Output multiplexed into a new TS */ |
43 | /* (to be retrieved by reading from the */ | 43 | /* (to be retrieved by reading from the */ |
44 | /* logical DVR device). */ | 44 | /* logical DVR device). */ |
45 | } dmx_output_t; | 45 | } dmx_output_t; |
46 | 46 | ||
47 | 47 | ||
@@ -54,25 +54,25 @@ typedef enum | |||
54 | 54 | ||
55 | typedef enum | 55 | typedef enum |
56 | { | 56 | { |
57 | DMX_PES_AUDIO0, | 57 | DMX_PES_AUDIO0, |
58 | DMX_PES_VIDEO0, | 58 | DMX_PES_VIDEO0, |
59 | DMX_PES_TELETEXT0, | 59 | DMX_PES_TELETEXT0, |
60 | DMX_PES_SUBTITLE0, | 60 | DMX_PES_SUBTITLE0, |
61 | DMX_PES_PCR0, | 61 | DMX_PES_PCR0, |
62 | 62 | ||
63 | DMX_PES_AUDIO1, | 63 | DMX_PES_AUDIO1, |
64 | DMX_PES_VIDEO1, | 64 | DMX_PES_VIDEO1, |
65 | DMX_PES_TELETEXT1, | 65 | DMX_PES_TELETEXT1, |
66 | DMX_PES_SUBTITLE1, | 66 | DMX_PES_SUBTITLE1, |
67 | DMX_PES_PCR1, | 67 | DMX_PES_PCR1, |
68 | 68 | ||
69 | DMX_PES_AUDIO2, | 69 | DMX_PES_AUDIO2, |
70 | DMX_PES_VIDEO2, | 70 | DMX_PES_VIDEO2, |
71 | DMX_PES_TELETEXT2, | 71 | DMX_PES_TELETEXT2, |
72 | DMX_PES_SUBTITLE2, | 72 | DMX_PES_SUBTITLE2, |
73 | DMX_PES_PCR2, | 73 | DMX_PES_PCR2, |
74 | 74 | ||
75 | DMX_PES_AUDIO3, | 75 | DMX_PES_AUDIO3, |
76 | DMX_PES_VIDEO3, | 76 | DMX_PES_VIDEO3, |
77 | DMX_PES_TELETEXT3, | 77 | DMX_PES_TELETEXT3, |
78 | DMX_PES_SUBTITLE3, | 78 | DMX_PES_SUBTITLE3, |
@@ -90,8 +90,8 @@ typedef enum | |||
90 | 90 | ||
91 | typedef enum | 91 | typedef enum |
92 | { | 92 | { |
93 | DMX_SCRAMBLING_EV, | 93 | DMX_SCRAMBLING_EV, |
94 | DMX_FRONTEND_EV | 94 | DMX_FRONTEND_EV |
95 | } dmx_event_t; | 95 | } dmx_event_t; |
96 | 96 | ||
97 | 97 | ||
diff --git a/include/linux/dvb/osd.h b/include/linux/dvb/osd.h index 0e1973d54a6b..880e68435832 100644 --- a/include/linux/dvb/osd.h +++ b/include/linux/dvb/osd.h | |||
@@ -98,43 +98,43 @@ typedef enum { | |||
98 | } OSD_Command; | 98 | } OSD_Command; |
99 | 99 | ||
100 | typedef struct osd_cmd_s { | 100 | typedef struct osd_cmd_s { |
101 | OSD_Command cmd; | 101 | OSD_Command cmd; |
102 | int x0; | 102 | int x0; |
103 | int y0; | 103 | int y0; |
104 | int x1; | 104 | int x1; |
105 | int y1; | 105 | int y1; |
106 | int color; | 106 | int color; |
107 | void __user *data; | 107 | void __user *data; |
108 | } osd_cmd_t; | 108 | } osd_cmd_t; |
109 | 109 | ||
110 | /* OSD_OpenRaw: set 'color' to desired window type */ | 110 | /* OSD_OpenRaw: set 'color' to desired window type */ |
111 | typedef enum { | 111 | typedef enum { |
112 | OSD_BITMAP1, /* 1 bit bitmap */ | 112 | OSD_BITMAP1, /* 1 bit bitmap */ |
113 | OSD_BITMAP2, /* 2 bit bitmap */ | 113 | OSD_BITMAP2, /* 2 bit bitmap */ |
114 | OSD_BITMAP4, /* 4 bit bitmap */ | 114 | OSD_BITMAP4, /* 4 bit bitmap */ |
115 | OSD_BITMAP8, /* 8 bit bitmap */ | 115 | OSD_BITMAP8, /* 8 bit bitmap */ |
116 | OSD_BITMAP1HR, /* 1 Bit bitmap half resolution */ | 116 | OSD_BITMAP1HR, /* 1 Bit bitmap half resolution */ |
117 | OSD_BITMAP2HR, /* 2 bit bitmap half resolution */ | 117 | OSD_BITMAP2HR, /* 2 bit bitmap half resolution */ |
118 | OSD_BITMAP4HR, /* 4 bit bitmap half resolution */ | 118 | OSD_BITMAP4HR, /* 4 bit bitmap half resolution */ |
119 | OSD_BITMAP8HR, /* 8 bit bitmap half resolution */ | 119 | OSD_BITMAP8HR, /* 8 bit bitmap half resolution */ |
120 | OSD_YCRCB422, /* 4:2:2 YCRCB Graphic Display */ | 120 | OSD_YCRCB422, /* 4:2:2 YCRCB Graphic Display */ |
121 | OSD_YCRCB444, /* 4:4:4 YCRCB Graphic Display */ | 121 | OSD_YCRCB444, /* 4:4:4 YCRCB Graphic Display */ |
122 | OSD_YCRCB444HR, /* 4:4:4 YCRCB graphic half resolution */ | 122 | OSD_YCRCB444HR, /* 4:4:4 YCRCB graphic half resolution */ |
123 | OSD_VIDEOTSIZE, /* True Size Normal MPEG Video Display */ | 123 | OSD_VIDEOTSIZE, /* True Size Normal MPEG Video Display */ |
124 | OSD_VIDEOHSIZE, /* MPEG Video Display Half Resolution */ | 124 | OSD_VIDEOHSIZE, /* MPEG Video Display Half Resolution */ |
125 | OSD_VIDEOQSIZE, /* MPEG Video Display Quarter Resolution */ | 125 | OSD_VIDEOQSIZE, /* MPEG Video Display Quarter Resolution */ |
126 | OSD_VIDEODSIZE, /* MPEG Video Display Double Resolution */ | 126 | OSD_VIDEODSIZE, /* MPEG Video Display Double Resolution */ |
127 | OSD_VIDEOTHSIZE, /* True Size MPEG Video Display Half Resolution */ | 127 | OSD_VIDEOTHSIZE, /* True Size MPEG Video Display Half Resolution */ |
128 | OSD_VIDEOTQSIZE, /* True Size MPEG Video Display Quarter Resolution*/ | 128 | OSD_VIDEOTQSIZE, /* True Size MPEG Video Display Quarter Resolution*/ |
129 | OSD_VIDEOTDSIZE, /* True Size MPEG Video Display Double Resolution */ | 129 | OSD_VIDEOTDSIZE, /* True Size MPEG Video Display Double Resolution */ |
130 | OSD_VIDEONSIZE, /* Full Size MPEG Video Display */ | 130 | OSD_VIDEONSIZE, /* Full Size MPEG Video Display */ |
131 | OSD_CURSOR /* Cursor */ | 131 | OSD_CURSOR /* Cursor */ |
132 | } osd_raw_window_t; | 132 | } osd_raw_window_t; |
133 | 133 | ||
134 | typedef struct osd_cap_s { | 134 | typedef struct osd_cap_s { |
135 | int cmd; | 135 | int cmd; |
136 | #define OSD_CAP_MEMSIZE 1 /* memory size */ | 136 | #define OSD_CAP_MEMSIZE 1 /* memory size */ |
137 | long val; | 137 | long val; |
138 | } osd_cap_t; | 138 | } osd_cap_t; |
139 | 139 | ||
140 | 140 | ||
diff --git a/include/linux/dvb/video.h b/include/linux/dvb/video.h index 941045e9ab89..b1999bfeaa56 100644 --- a/include/linux/dvb/video.h +++ b/include/linux/dvb/video.h | |||
@@ -36,7 +36,7 @@ | |||
36 | 36 | ||
37 | typedef enum { | 37 | typedef enum { |
38 | VIDEO_FORMAT_4_3, /* Select 4:3 format */ | 38 | VIDEO_FORMAT_4_3, /* Select 4:3 format */ |
39 | VIDEO_FORMAT_16_9, /* Select 16:9 format. */ | 39 | VIDEO_FORMAT_16_9, /* Select 16:9 format. */ |
40 | VIDEO_FORMAT_221_1 /* 2.21:1 */ | 40 | VIDEO_FORMAT_221_1 /* 2.21:1 */ |
41 | } video_format_t; | 41 | } video_format_t; |
42 | 42 | ||
@@ -54,7 +54,7 @@ typedef enum { | |||
54 | 54 | ||
55 | 55 | ||
56 | typedef enum { | 56 | typedef enum { |
57 | VIDEO_PAN_SCAN, /* use pan and scan format */ | 57 | VIDEO_PAN_SCAN, /* use pan and scan format */ |
58 | VIDEO_LETTER_BOX, /* use letterbox format */ | 58 | VIDEO_LETTER_BOX, /* use letterbox format */ |
59 | VIDEO_CENTER_CUT_OUT /* use center cut out format */ | 59 | VIDEO_CENTER_CUT_OUT /* use center cut out format */ |
60 | } video_displayformat_t; | 60 | } video_displayformat_t; |
@@ -66,7 +66,7 @@ typedef struct { | |||
66 | } video_size_t; | 66 | } video_size_t; |
67 | 67 | ||
68 | typedef enum { | 68 | typedef enum { |
69 | VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */ | 69 | VIDEO_SOURCE_DEMUX, /* Select the demux as the main source */ |
70 | VIDEO_SOURCE_MEMORY /* If this source is selected, the stream | 70 | VIDEO_SOURCE_MEMORY /* If this source is selected, the stream |
71 | comes from the user through the write | 71 | comes from the user through the write |
72 | system call */ | 72 | system call */ |
@@ -75,35 +75,35 @@ typedef enum { | |||
75 | 75 | ||
76 | typedef enum { | 76 | typedef enum { |
77 | VIDEO_STOPPED, /* Video is stopped */ | 77 | VIDEO_STOPPED, /* Video is stopped */ |
78 | VIDEO_PLAYING, /* Video is currently playing */ | 78 | VIDEO_PLAYING, /* Video is currently playing */ |
79 | VIDEO_FREEZED /* Video is freezed */ | 79 | VIDEO_FREEZED /* Video is freezed */ |
80 | } video_play_state_t; | 80 | } video_play_state_t; |
81 | 81 | ||
82 | 82 | ||
83 | struct video_event { | 83 | struct video_event { |
84 | int32_t type; | 84 | int32_t type; |
85 | #define VIDEO_EVENT_SIZE_CHANGED 1 | 85 | #define VIDEO_EVENT_SIZE_CHANGED 1 |
86 | #define VIDEO_EVENT_FRAME_RATE_CHANGED 2 | 86 | #define VIDEO_EVENT_FRAME_RATE_CHANGED 2 |
87 | time_t timestamp; | 87 | time_t timestamp; |
88 | union { | 88 | union { |
89 | video_size_t size; | 89 | video_size_t size; |
90 | unsigned int frame_rate; /* in frames per 1000sec */ | 90 | unsigned int frame_rate; /* in frames per 1000sec */ |
91 | } u; | 91 | } u; |
92 | }; | 92 | }; |
93 | 93 | ||
94 | 94 | ||
95 | struct video_status { | 95 | struct video_status { |
96 | int video_blank; /* blank video on freeze? */ | 96 | int video_blank; /* blank video on freeze? */ |
97 | video_play_state_t play_state; /* current state of playback */ | 97 | video_play_state_t play_state; /* current state of playback */ |
98 | video_stream_source_t stream_source; /* current source (demux/memory) */ | 98 | video_stream_source_t stream_source; /* current source (demux/memory) */ |
99 | video_format_t video_format; /* current aspect ratio of stream*/ | 99 | video_format_t video_format; /* current aspect ratio of stream*/ |
100 | video_displayformat_t display_format;/* selected cropping mode */ | 100 | video_displayformat_t display_format;/* selected cropping mode */ |
101 | }; | 101 | }; |
102 | 102 | ||
103 | 103 | ||
104 | struct video_still_picture { | 104 | struct video_still_picture { |
105 | char __user *iFrame; /* pointer to a single iframe in memory */ | 105 | char __user *iFrame; /* pointer to a single iframe in memory */ |
106 | int32_t size; | 106 | int32_t size; |
107 | }; | 107 | }; |
108 | 108 | ||
109 | 109 | ||
@@ -111,19 +111,19 @@ typedef | |||
111 | struct video_highlight { | 111 | struct video_highlight { |
112 | int active; /* 1=show highlight, 0=hide highlight */ | 112 | int active; /* 1=show highlight, 0=hide highlight */ |
113 | uint8_t contrast1; /* 7- 4 Pattern pixel contrast */ | 113 | uint8_t contrast1; /* 7- 4 Pattern pixel contrast */ |
114 | /* 3- 0 Background pixel contrast */ | 114 | /* 3- 0 Background pixel contrast */ |
115 | uint8_t contrast2; /* 7- 4 Emphasis pixel-2 contrast */ | 115 | uint8_t contrast2; /* 7- 4 Emphasis pixel-2 contrast */ |
116 | /* 3- 0 Emphasis pixel-1 contrast */ | 116 | /* 3- 0 Emphasis pixel-1 contrast */ |
117 | uint8_t color1; /* 7- 4 Pattern pixel color */ | 117 | uint8_t color1; /* 7- 4 Pattern pixel color */ |
118 | /* 3- 0 Background pixel color */ | 118 | /* 3- 0 Background pixel color */ |
119 | uint8_t color2; /* 7- 4 Emphasis pixel-2 color */ | 119 | uint8_t color2; /* 7- 4 Emphasis pixel-2 color */ |
120 | /* 3- 0 Emphasis pixel-1 color */ | 120 | /* 3- 0 Emphasis pixel-1 color */ |
121 | uint32_t ypos; /* 23-22 auto action mode */ | 121 | uint32_t ypos; /* 23-22 auto action mode */ |
122 | /* 21-12 start y */ | 122 | /* 21-12 start y */ |
123 | /* 9- 0 end y */ | 123 | /* 9- 0 end y */ |
124 | uint32_t xpos; /* 23-22 button color number */ | 124 | uint32_t xpos; /* 23-22 button color number */ |
125 | /* 21-12 start x */ | 125 | /* 21-12 start x */ |
126 | /* 9- 0 end x */ | 126 | /* 9- 0 end x */ |
127 | } video_highlight_t; | 127 | } video_highlight_t; |
128 | 128 | ||
129 | 129 | ||
diff --git a/include/linux/fb.h b/include/linux/fb.h index 04a58f33ec53..a973be2cfe61 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h | |||
@@ -617,6 +617,12 @@ struct fb_ops { | |||
617 | 617 | ||
618 | /* perform fb specific mmap */ | 618 | /* perform fb specific mmap */ |
619 | int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma); | 619 | int (*fb_mmap)(struct fb_info *info, struct file *file, struct vm_area_struct *vma); |
620 | |||
621 | /* save current hardware state */ | ||
622 | void (*fb_save_state)(struct fb_info *info); | ||
623 | |||
624 | /* restore saved state */ | ||
625 | void (*fb_restore_state)(struct fb_info *info); | ||
620 | }; | 626 | }; |
621 | 627 | ||
622 | #ifdef CONFIG_FB_TILEBLITTING | 628 | #ifdef CONFIG_FB_TILEBLITTING |
@@ -726,6 +732,18 @@ struct fb_tile_ops { | |||
726 | from userspace */ | 732 | from userspace */ |
727 | #define FBINFO_MISC_TILEBLITTING 0x20000 /* use tile blitting */ | 733 | #define FBINFO_MISC_TILEBLITTING 0x20000 /* use tile blitting */ |
728 | 734 | ||
735 | /* A driver may set this flag to indicate that it does want a set_par to be | ||
736 | * called every time when fbcon_switch is executed. The advantage is that with | ||
737 | * this flag set you can really be shure that set_par is always called before | ||
738 | * any of the functions dependant on the correct hardware state or altering | ||
739 | * that state, even if you are using some broken X releases. The disadvantage | ||
740 | * is that it introduces unwanted delays to every console switch if set_par | ||
741 | * is slow. It is a good idea to try this flag in the drivers initialization | ||
742 | * code whenever there is a bug report related to switching between X and the | ||
743 | * framebuffer console. | ||
744 | */ | ||
745 | #define FBINFO_MISC_ALWAYS_SETPAR 0x40000 | ||
746 | |||
729 | struct fb_info { | 747 | struct fb_info { |
730 | int node; | 748 | int node; |
731 | int flags; | 749 | int flags; |
@@ -817,6 +835,18 @@ struct fb_info { | |||
817 | 835 | ||
818 | #endif | 836 | #endif |
819 | 837 | ||
838 | #if defined (__BIG_ENDIAN) | ||
839 | #define FB_LEFT_POS(bpp) (32 - bpp) | ||
840 | #define FB_SHIFT_HIGH(val, bits) ((val) >> (bits)) | ||
841 | #define FB_SHIFT_LOW(val, bits) ((val) << (bits)) | ||
842 | #define FB_BIT_NR(b) (7 - (b)) | ||
843 | #else | ||
844 | #define FB_LEFT_POS(bpp) (0) | ||
845 | #define FB_SHIFT_HIGH(val, bits) ((val) << (bits)) | ||
846 | #define FB_SHIFT_LOW(val, bits) ((val) >> (bits)) | ||
847 | #define FB_BIT_NR(b) (b) | ||
848 | #endif | ||
849 | |||
820 | /* | 850 | /* |
821 | * `Generic' versions of the frame buffer device operations | 851 | * `Generic' versions of the frame buffer device operations |
822 | */ | 852 | */ |
diff --git a/include/linux/i2c-id.h b/include/linux/i2c-id.h index ef3b5632e63a..006c81ef4d50 100644 --- a/include/linux/i2c-id.h +++ b/include/linux/i2c-id.h | |||
@@ -108,7 +108,7 @@ | |||
108 | #define I2C_DRIVERID_SAA7127 72 /* saa7124 video encoder */ | 108 | #define I2C_DRIVERID_SAA7127 72 /* saa7124 video encoder */ |
109 | #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ | 109 | #define I2C_DRIVERID_SAA711X 73 /* saa711x video encoders */ |
110 | #define I2C_DRIVERID_AKITAIOEXP 74 /* IO Expander on Sharp SL-C1000 */ | 110 | #define I2C_DRIVERID_AKITAIOEXP 74 /* IO Expander on Sharp SL-C1000 */ |
111 | #define I2C_DRIVERID_I2C_IR 75 /* I2C InfraRed on Video boards */ | 111 | #define I2C_DRIVERID_INFRARED 75 /* I2C InfraRed on Video boards */ |
112 | 112 | ||
113 | #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ | 113 | #define I2C_DRIVERID_EXP0 0xF0 /* experimental use id's */ |
114 | #define I2C_DRIVERID_EXP1 0xF1 | 114 | #define I2C_DRIVERID_EXP1 0xF1 |
diff --git a/include/linux/ide.h b/include/linux/ide.h index a39c3c59789d..7b6a6a58e465 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -23,17 +23,6 @@ | |||
23 | #include <asm/io.h> | 23 | #include <asm/io.h> |
24 | #include <asm/semaphore.h> | 24 | #include <asm/semaphore.h> |
25 | 25 | ||
26 | /* | ||
27 | * This is the multiple IDE interface driver, as evolved from hd.c. | ||
28 | * It supports up to four IDE interfaces, on one or more IRQs (usually 14 & 15). | ||
29 | * There can be up to two drives per interface, as per the ATA-2 spec. | ||
30 | * | ||
31 | * Primary i/f: ide0: major=3; (hda) minor=0; (hdb) minor=64 | ||
32 | * Secondary i/f: ide1: major=22; (hdc or hd1a) minor=0; (hdd or hd1b) minor=64 | ||
33 | * Tertiary i/f: ide2: major=33; (hde) minor=0; (hdf) minor=64 | ||
34 | * Quaternary i/f: ide3: major=34; (hdg) minor=0; (hdh) minor=64 | ||
35 | */ | ||
36 | |||
37 | /****************************************************************************** | 26 | /****************************************************************************** |
38 | * IDE driver configuration options (play with these as desired): | 27 | * IDE driver configuration options (play with these as desired): |
39 | * | 28 | * |
@@ -193,11 +182,6 @@ typedef unsigned char byte; /* used everywhere */ | |||
193 | #define WAIT_CMD (10*HZ) /* 10sec - maximum wait for an IRQ to happen */ | 182 | #define WAIT_CMD (10*HZ) /* 10sec - maximum wait for an IRQ to happen */ |
194 | #define WAIT_MIN_SLEEP (2*HZ/100) /* 20msec - minimum sleep time */ | 183 | #define WAIT_MIN_SLEEP (2*HZ/100) /* 20msec - minimum sleep time */ |
195 | 184 | ||
196 | #define HOST(hwif,chipset) \ | ||
197 | { \ | ||
198 | return ((hwif)->chipset == chipset) ? 1 : 0; \ | ||
199 | } | ||
200 | |||
201 | /* | 185 | /* |
202 | * Check for an interrupt and acknowledge the interrupt status | 186 | * Check for an interrupt and acknowledge the interrupt status |
203 | */ | 187 | */ |
@@ -391,45 +375,6 @@ typedef union { | |||
391 | } ata_nsector_t, ata_data_t, atapi_bcount_t, ata_index_t; | 375 | } ata_nsector_t, ata_data_t, atapi_bcount_t, ata_index_t; |
392 | 376 | ||
393 | /* | 377 | /* |
394 | * ATA-IDE Error Register | ||
395 | * | ||
396 | * mark : Bad address mark | ||
397 | * tzero : Couldn't find track 0 | ||
398 | * abrt : Aborted Command | ||
399 | * mcr : Media Change Request | ||
400 | * id : ID field not found | ||
401 | * mce : Media Change Event | ||
402 | * ecc : Uncorrectable ECC error | ||
403 | * bdd : dual meaing | ||
404 | */ | ||
405 | typedef union { | ||
406 | unsigned all :8; | ||
407 | struct { | ||
408 | #if defined(__LITTLE_ENDIAN_BITFIELD) | ||
409 | unsigned mark :1; | ||
410 | unsigned tzero :1; | ||
411 | unsigned abrt :1; | ||
412 | unsigned mcr :1; | ||
413 | unsigned id :1; | ||
414 | unsigned mce :1; | ||
415 | unsigned ecc :1; | ||
416 | unsigned bdd :1; | ||
417 | #elif defined(__BIG_ENDIAN_BITFIELD) | ||
418 | unsigned bdd :1; | ||
419 | unsigned ecc :1; | ||
420 | unsigned mce :1; | ||
421 | unsigned id :1; | ||
422 | unsigned mcr :1; | ||
423 | unsigned abrt :1; | ||
424 | unsigned tzero :1; | ||
425 | unsigned mark :1; | ||
426 | #else | ||
427 | #error "Please fix <asm/byteorder.h>" | ||
428 | #endif | ||
429 | } b; | ||
430 | } ata_error_t; | ||
431 | |||
432 | /* | ||
433 | * ATA-IDE Select Register, aka Device-Head | 378 | * ATA-IDE Select Register, aka Device-Head |
434 | * | 379 | * |
435 | * head : always zeros here | 380 | * head : always zeros here |
@@ -504,39 +449,6 @@ typedef union { | |||
504 | } ata_status_t, atapi_status_t; | 449 | } ata_status_t, atapi_status_t; |
505 | 450 | ||
506 | /* | 451 | /* |
507 | * ATA-IDE Control Register | ||
508 | * | ||
509 | * bit0 : Should be set to zero | ||
510 | * nIEN : device INTRQ to host | ||
511 | * SRST : host soft reset bit | ||
512 | * bit3 : ATA-2 thingy, Should be set to 1 | ||
513 | * reserved456 : Reserved | ||
514 | * HOB : 48-bit address ordering, High Ordered Bit | ||
515 | */ | ||
516 | typedef union { | ||
517 | unsigned all : 8; | ||
518 | struct { | ||
519 | #if defined(__LITTLE_ENDIAN_BITFIELD) | ||
520 | unsigned bit0 : 1; | ||
521 | unsigned nIEN : 1; | ||
522 | unsigned SRST : 1; | ||
523 | unsigned bit3 : 1; | ||
524 | unsigned reserved456 : 3; | ||
525 | unsigned HOB : 1; | ||
526 | #elif defined(__BIG_ENDIAN_BITFIELD) | ||
527 | unsigned HOB : 1; | ||
528 | unsigned reserved456 : 3; | ||
529 | unsigned bit3 : 1; | ||
530 | unsigned SRST : 1; | ||
531 | unsigned nIEN : 1; | ||
532 | unsigned bit0 : 1; | ||
533 | #else | ||
534 | #error "Please fix <asm/byteorder.h>" | ||
535 | #endif | ||
536 | } b; | ||
537 | } ata_control_t; | ||
538 | |||
539 | /* | ||
540 | * ATAPI Feature Register | 452 | * ATAPI Feature Register |
541 | * | 453 | * |
542 | * dma : Using DMA or PIO | 454 | * dma : Using DMA or PIO |
@@ -618,39 +530,6 @@ typedef union { | |||
618 | } atapi_error_t; | 530 | } atapi_error_t; |
619 | 531 | ||
620 | /* | 532 | /* |
621 | * ATAPI floppy Drive Select Register | ||
622 | * | ||
623 | * sam_lun : Logical unit number | ||
624 | * reserved3 : Reserved | ||
625 | * drv : The responding drive will be drive 0 (0) or drive 1 (1) | ||
626 | * one5 : Should be set to 1 | ||
627 | * reserved6 : Reserved | ||
628 | * one7 : Should be set to 1 | ||
629 | */ | ||
630 | typedef union { | ||
631 | unsigned all :8; | ||
632 | struct { | ||
633 | #if defined(__LITTLE_ENDIAN_BITFIELD) | ||
634 | unsigned sam_lun :3; | ||
635 | unsigned reserved3 :1; | ||
636 | unsigned drv :1; | ||
637 | unsigned one5 :1; | ||
638 | unsigned reserved6 :1; | ||
639 | unsigned one7 :1; | ||
640 | #elif defined(__BIG_ENDIAN_BITFIELD) | ||
641 | unsigned one7 :1; | ||
642 | unsigned reserved6 :1; | ||
643 | unsigned one5 :1; | ||
644 | unsigned drv :1; | ||
645 | unsigned reserved3 :1; | ||
646 | unsigned sam_lun :3; | ||
647 | #else | ||
648 | #error "Please fix <asm/byteorder.h>" | ||
649 | #endif | ||
650 | } b; | ||
651 | } atapi_select_t; | ||
652 | |||
653 | /* | ||
654 | * Status returned from various ide_ functions | 533 | * Status returned from various ide_ functions |
655 | */ | 534 | */ |
656 | typedef enum { | 535 | typedef enum { |
@@ -1101,10 +980,7 @@ typedef struct ide_driver_s { | |||
1101 | int (*end_request)(ide_drive_t *, int, int); | 980 | int (*end_request)(ide_drive_t *, int, int); |
1102 | ide_startstop_t (*error)(ide_drive_t *, struct request *rq, u8, u8); | 981 | ide_startstop_t (*error)(ide_drive_t *, struct request *rq, u8, u8); |
1103 | ide_startstop_t (*abort)(ide_drive_t *, struct request *rq); | 982 | ide_startstop_t (*abort)(ide_drive_t *, struct request *rq); |
1104 | int (*ioctl)(ide_drive_t *, struct inode *, struct file *, unsigned int, unsigned long); | ||
1105 | ide_proc_entry_t *proc; | 983 | ide_proc_entry_t *proc; |
1106 | void (*ata_prebuilder)(ide_drive_t *); | ||
1107 | void (*atapi_prebuilder)(ide_drive_t *); | ||
1108 | struct device_driver gen_driver; | 984 | struct device_driver gen_driver; |
1109 | } ide_driver_t; | 985 | } ide_driver_t; |
1110 | 986 | ||
@@ -1298,7 +1174,6 @@ extern int ide_spin_wait_hwgroup(ide_drive_t *); | |||
1298 | extern void ide_timer_expiry(unsigned long); | 1174 | extern void ide_timer_expiry(unsigned long); |
1299 | extern irqreturn_t ide_intr(int irq, void *dev_id, struct pt_regs *regs); | 1175 | extern irqreturn_t ide_intr(int irq, void *dev_id, struct pt_regs *regs); |
1300 | extern void do_ide_request(request_queue_t *); | 1176 | extern void do_ide_request(request_queue_t *); |
1301 | extern void ide_init_subdrivers(void); | ||
1302 | 1177 | ||
1303 | void ide_init_disk(struct gendisk *, ide_drive_t *); | 1178 | void ide_init_disk(struct gendisk *, ide_drive_t *); |
1304 | 1179 | ||
@@ -1371,6 +1246,12 @@ void ide_init_sg_cmd(ide_drive_t *, struct request *); | |||
1371 | #define GOOD_DMA_DRIVE 1 | 1246 | #define GOOD_DMA_DRIVE 1 |
1372 | 1247 | ||
1373 | #ifdef CONFIG_BLK_DEV_IDEDMA | 1248 | #ifdef CONFIG_BLK_DEV_IDEDMA |
1249 | struct drive_list_entry { | ||
1250 | const char *id_model; | ||
1251 | const char *id_firmware; | ||
1252 | }; | ||
1253 | |||
1254 | int ide_in_drive_list(struct hd_driveid *, const struct drive_list_entry *); | ||
1374 | int __ide_dma_bad_drive(ide_drive_t *); | 1255 | int __ide_dma_bad_drive(ide_drive_t *); |
1375 | int __ide_dma_good_drive(ide_drive_t *); | 1256 | int __ide_dma_good_drive(ide_drive_t *); |
1376 | int ide_use_dma(ide_drive_t *); | 1257 | int ide_use_dma(ide_drive_t *); |
diff --git a/include/linux/inotify.h b/include/linux/inotify.h index ee5b239092ed..267c88b5f742 100644 --- a/include/linux/inotify.h +++ b/include/linux/inotify.h | |||
@@ -47,6 +47,8 @@ struct inotify_event { | |||
47 | #define IN_MOVE (IN_MOVED_FROM | IN_MOVED_TO) /* moves */ | 47 | #define IN_MOVE (IN_MOVED_FROM | IN_MOVED_TO) /* moves */ |
48 | 48 | ||
49 | /* special flags */ | 49 | /* special flags */ |
50 | #define IN_ONLYDIR 0x01000000 /* only watch the path if it is a directory */ | ||
51 | #define IN_DONT_FOLLOW 0x02000000 /* don't follow a sym link */ | ||
50 | #define IN_MASK_ADD 0x20000000 /* add to the mask of an already existing watch */ | 52 | #define IN_MASK_ADD 0x20000000 /* add to the mask of an already existing watch */ |
51 | #define IN_ISDIR 0x40000000 /* event occurred against dir */ | 53 | #define IN_ISDIR 0x40000000 /* event occurred against dir */ |
52 | #define IN_ONESHOT 0x80000000 /* only send event once */ | 54 | #define IN_ONESHOT 0x80000000 /* only send event once */ |
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index e373c4a9de53..c03f2dc933de 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h | |||
@@ -37,6 +37,7 @@ | |||
37 | #include <linux/spinlock.h> | 37 | #include <linux/spinlock.h> |
38 | #include <linux/rcupdate.h> | 38 | #include <linux/rcupdate.h> |
39 | 39 | ||
40 | #ifdef CONFIG_KPROBES | ||
40 | #include <asm/kprobes.h> | 41 | #include <asm/kprobes.h> |
41 | 42 | ||
42 | /* kprobe_status settings */ | 43 | /* kprobe_status settings */ |
@@ -147,7 +148,6 @@ struct kretprobe_instance { | |||
147 | struct task_struct *task; | 148 | struct task_struct *task; |
148 | }; | 149 | }; |
149 | 150 | ||
150 | #ifdef CONFIG_KPROBES | ||
151 | extern spinlock_t kretprobe_lock; | 151 | extern spinlock_t kretprobe_lock; |
152 | extern int arch_prepare_kprobe(struct kprobe *p); | 152 | extern int arch_prepare_kprobe(struct kprobe *p); |
153 | extern void arch_copy_kprobe(struct kprobe *p); | 153 | extern void arch_copy_kprobe(struct kprobe *p); |
@@ -158,6 +158,7 @@ extern int arch_init_kprobes(void); | |||
158 | extern void show_registers(struct pt_regs *regs); | 158 | extern void show_registers(struct pt_regs *regs); |
159 | extern kprobe_opcode_t *get_insn_slot(void); | 159 | extern kprobe_opcode_t *get_insn_slot(void); |
160 | extern void free_insn_slot(kprobe_opcode_t *slot); | 160 | extern void free_insn_slot(kprobe_opcode_t *slot); |
161 | extern void kprobes_inc_nmissed_count(struct kprobe *p); | ||
161 | 162 | ||
162 | /* Get the kprobe at this addr (if any) - called with preemption disabled */ | 163 | /* Get the kprobe at this addr (if any) - called with preemption disabled */ |
163 | struct kprobe *get_kprobe(void *addr); | 164 | struct kprobe *get_kprobe(void *addr); |
@@ -195,6 +196,11 @@ void add_rp_inst(struct kretprobe_instance *ri); | |||
195 | void kprobe_flush_task(struct task_struct *tk); | 196 | void kprobe_flush_task(struct task_struct *tk); |
196 | void recycle_rp_inst(struct kretprobe_instance *ri); | 197 | void recycle_rp_inst(struct kretprobe_instance *ri); |
197 | #else /* CONFIG_KPROBES */ | 198 | #else /* CONFIG_KPROBES */ |
199 | |||
200 | #define __kprobes /**/ | ||
201 | struct jprobe; | ||
202 | struct kretprobe; | ||
203 | |||
198 | static inline struct kprobe *kprobe_running(void) | 204 | static inline struct kprobe *kprobe_running(void) |
199 | { | 205 | { |
200 | return NULL; | 206 | return NULL; |
diff --git a/include/linux/libata.h b/include/linux/libata.h index f2dbb684ce9e..41ea7dbc1755 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -122,6 +122,7 @@ enum { | |||
122 | ATA_FLAG_NOINTR = (1 << 9), /* FIXME: Remove this once | 122 | ATA_FLAG_NOINTR = (1 << 9), /* FIXME: Remove this once |
123 | * proper HSM is in place. */ | 123 | * proper HSM is in place. */ |
124 | ATA_FLAG_DEBUGMSG = (1 << 10), | 124 | ATA_FLAG_DEBUGMSG = (1 << 10), |
125 | ATA_FLAG_NO_ATAPI = (1 << 11), /* No ATAPI support */ | ||
125 | 126 | ||
126 | ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */ | 127 | ATA_QCFLAG_ACTIVE = (1 << 1), /* cmd not yet ack'd to scsi lyer */ |
127 | ATA_QCFLAG_SG = (1 << 3), /* have s/g table? */ | 128 | ATA_QCFLAG_SG = (1 << 3), /* have s/g table? */ |
diff --git a/include/linux/list.h b/include/linux/list.h index fbfca73355a3..8e3388284530 100644 --- a/include/linux/list.h +++ b/include/linux/list.h | |||
@@ -202,12 +202,15 @@ static inline void list_del_rcu(struct list_head *entry) | |||
202 | * | 202 | * |
203 | * The old entry will be replaced with the new entry atomically. | 203 | * The old entry will be replaced with the new entry atomically. |
204 | */ | 204 | */ |
205 | static inline void list_replace_rcu(struct list_head *old, struct list_head *new){ | 205 | static inline void list_replace_rcu(struct list_head *old, |
206 | struct list_head *new) | ||
207 | { | ||
206 | new->next = old->next; | 208 | new->next = old->next; |
207 | new->prev = old->prev; | 209 | new->prev = old->prev; |
208 | smp_wmb(); | 210 | smp_wmb(); |
209 | new->next->prev = new; | 211 | new->next->prev = new; |
210 | new->prev->next = new; | 212 | new->prev->next = new; |
213 | old->prev = LIST_POISON2; | ||
211 | } | 214 | } |
212 | 215 | ||
213 | /** | 216 | /** |
@@ -578,6 +581,27 @@ static inline void hlist_del_init(struct hlist_node *n) | |||
578 | } | 581 | } |
579 | } | 582 | } |
580 | 583 | ||
584 | /* | ||
585 | * hlist_replace_rcu - replace old entry by new one | ||
586 | * @old : the element to be replaced | ||
587 | * @new : the new element to insert | ||
588 | * | ||
589 | * The old entry will be replaced with the new entry atomically. | ||
590 | */ | ||
591 | static inline void hlist_replace_rcu(struct hlist_node *old, | ||
592 | struct hlist_node *new) | ||
593 | { | ||
594 | struct hlist_node *next = old->next; | ||
595 | |||
596 | new->next = next; | ||
597 | new->pprev = old->pprev; | ||
598 | smp_wmb(); | ||
599 | if (next) | ||
600 | new->next->pprev = &new->next; | ||
601 | *new->pprev = new; | ||
602 | old->pprev = LIST_POISON2; | ||
603 | } | ||
604 | |||
581 | static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h) | 605 | static inline void hlist_add_head(struct hlist_node *n, struct hlist_head *h) |
582 | { | 606 | { |
583 | struct hlist_node *first = h->first; | 607 | struct hlist_node *first = h->first; |
diff --git a/include/linux/mm.h b/include/linux/mm.h index 29f02d8513f6..a06a84d347fb 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
@@ -163,7 +163,7 @@ extern unsigned int kobjsize(const void *objp); | |||
163 | #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */ | 163 | #define VM_HUGETLB 0x00400000 /* Huge TLB Page VM */ |
164 | #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */ | 164 | #define VM_NONLINEAR 0x00800000 /* Is non-linear (remap_file_pages) */ |
165 | #define VM_MAPPED_COPY 0x01000000 /* T if mapped copy of data (nommu mmap) */ | 165 | #define VM_MAPPED_COPY 0x01000000 /* T if mapped copy of data (nommu mmap) */ |
166 | #define VM_INCOMPLETE 0x02000000 /* Strange partial PFN mapping marker */ | 166 | #define VM_INSERTPAGE 0x02000000 /* The vma has had "vm_insert_page()" done on it */ |
167 | 167 | ||
168 | #ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */ | 168 | #ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */ |
169 | #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS | 169 | #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS |
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h index f1fd4215686a..7419b5fab133 100644 --- a/include/linux/mtd/onenand.h +++ b/include/linux/mtd/onenand.h | |||
@@ -17,7 +17,6 @@ | |||
17 | #include <linux/mtd/bbm.h> | 17 | #include <linux/mtd/bbm.h> |
18 | 18 | ||
19 | #define MAX_BUFFERRAM 2 | 19 | #define MAX_BUFFERRAM 2 |
20 | #define MAX_ONENAND_PAGESIZE (2048 + 64) | ||
21 | 20 | ||
22 | /* Scan and identify a OneNAND device */ | 21 | /* Scan and identify a OneNAND device */ |
23 | extern int onenand_scan(struct mtd_info *mtd, int max_chips); | 22 | extern int onenand_scan(struct mtd_info *mtd, int max_chips); |
@@ -110,6 +109,7 @@ struct onenand_chip { | |||
110 | spinlock_t chip_lock; | 109 | spinlock_t chip_lock; |
111 | wait_queue_head_t wq; | 110 | wait_queue_head_t wq; |
112 | onenand_state_t state; | 111 | onenand_state_t state; |
112 | unsigned char *page_buf; | ||
113 | 113 | ||
114 | struct nand_oobinfo *autooob; | 114 | struct nand_oobinfo *autooob; |
115 | 115 | ||
@@ -134,13 +134,12 @@ struct onenand_chip { | |||
134 | * Options bits | 134 | * Options bits |
135 | */ | 135 | */ |
136 | #define ONENAND_CONT_LOCK (0x0001) | 136 | #define ONENAND_CONT_LOCK (0x0001) |
137 | 137 | #define ONENAND_PAGEBUF_ALLOC (0x1000) | |
138 | 138 | ||
139 | /* | 139 | /* |
140 | * OneNAND Flash Manufacturer ID Codes | 140 | * OneNAND Flash Manufacturer ID Codes |
141 | */ | 141 | */ |
142 | #define ONENAND_MFR_SAMSUNG 0xec | 142 | #define ONENAND_MFR_SAMSUNG 0xec |
143 | #define ONENAND_MFR_UNKNOWN 0x00 | ||
144 | 143 | ||
145 | /** | 144 | /** |
146 | * struct nand_manufacturers - NAND Flash Manufacturer ID Structure | 145 | * struct nand_manufacturers - NAND Flash Manufacturer ID Structure |
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h index 12787a9b0259..2516adeccecf 100644 --- a/include/linux/nfs_fs.h +++ b/include/linux/nfs_fs.h | |||
@@ -291,6 +291,7 @@ static inline int nfs_verify_change_attribute(struct inode *inode, unsigned long | |||
291 | /* | 291 | /* |
292 | * linux/fs/nfs/inode.c | 292 | * linux/fs/nfs/inode.c |
293 | */ | 293 | */ |
294 | extern int nfs_sync_mapping(struct address_space *mapping); | ||
294 | extern void nfs_zap_caches(struct inode *); | 295 | extern void nfs_zap_caches(struct inode *); |
295 | extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *, | 296 | extern struct inode *nfs_fhget(struct super_block *, struct nfs_fh *, |
296 | struct nfs_fattr *); | 297 | struct nfs_fattr *); |
diff --git a/include/linux/parport_pc.h b/include/linux/parport_pc.h index 7825c76cbd00..c6f762470879 100644 --- a/include/linux/parport_pc.h +++ b/include/linux/parport_pc.h | |||
@@ -86,7 +86,7 @@ extern __inline__ void dump_parport_state (char *str, struct parport *p) | |||
86 | unsigned char dcr = inb (CONTROL (p)); | 86 | unsigned char dcr = inb (CONTROL (p)); |
87 | unsigned char dsr = inb (STATUS (p)); | 87 | unsigned char dsr = inb (STATUS (p)); |
88 | static char *ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"}; | 88 | static char *ecr_modes[] = {"SPP", "PS2", "PPFIFO", "ECP", "xXx", "yYy", "TST", "CFG"}; |
89 | const struct parport_pc_private *priv = (parport_pc_private *)p->physport->private_data; | 89 | const struct parport_pc_private *priv = p->physport->private_data; |
90 | int i; | 90 | int i; |
91 | 91 | ||
92 | printk (KERN_DEBUG "*** parport state (%s): ecr=[%s", str, ecr_modes[(ecr & 0xe0) >> 5]); | 92 | printk (KERN_DEBUG "*** parport state (%s): ecr=[%s", str, ecr_modes[(ecr & 0xe0) >> 5]); |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 1e737e269db9..4db67b3b05cc 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -1244,6 +1244,7 @@ | |||
1244 | #define PCI_DEVICE_ID_VIA_8378_0 0x3205 | 1244 | #define PCI_DEVICE_ID_VIA_8378_0 0x3205 |
1245 | #define PCI_DEVICE_ID_VIA_8783_0 0x3208 | 1245 | #define PCI_DEVICE_ID_VIA_8783_0 0x3208 |
1246 | #define PCI_DEVICE_ID_VIA_8237 0x3227 | 1246 | #define PCI_DEVICE_ID_VIA_8237 0x3227 |
1247 | #define PCI_DEVICE_ID_VIA_8251 0x3287 | ||
1247 | #define PCI_DEVICE_ID_VIA_3296_0 0x0296 | 1248 | #define PCI_DEVICE_ID_VIA_3296_0 0x0296 |
1248 | #define PCI_DEVICE_ID_VIA_8231 0x8231 | 1249 | #define PCI_DEVICE_ID_VIA_8231 0x8231 |
1249 | #define PCI_DEVICE_ID_VIA_8231_4 0x8235 | 1250 | #define PCI_DEVICE_ID_VIA_8231_4 0x8235 |
diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h index cce25591eec2..a471f3bb713e 100644 --- a/include/linux/rcupdate.h +++ b/include/linux/rcupdate.h | |||
@@ -100,6 +100,7 @@ struct rcu_data { | |||
100 | struct rcu_head *donelist; | 100 | struct rcu_head *donelist; |
101 | struct rcu_head **donetail; | 101 | struct rcu_head **donetail; |
102 | int cpu; | 102 | int cpu; |
103 | struct rcu_head barrier; | ||
103 | }; | 104 | }; |
104 | 105 | ||
105 | DECLARE_PER_CPU(struct rcu_data, rcu_data); | 106 | DECLARE_PER_CPU(struct rcu_data, rcu_data); |
@@ -285,6 +286,7 @@ extern void FASTCALL(call_rcu_bh(struct rcu_head *head, | |||
285 | extern __deprecated_for_modules void synchronize_kernel(void); | 286 | extern __deprecated_for_modules void synchronize_kernel(void); |
286 | extern void synchronize_rcu(void); | 287 | extern void synchronize_rcu(void); |
287 | void synchronize_idle(void); | 288 | void synchronize_idle(void); |
289 | extern void rcu_barrier(void); | ||
288 | 290 | ||
289 | #endif /* __KERNEL__ */ | 291 | #endif /* __KERNEL__ */ |
290 | #endif /* __LINUX_RCUPDATE_H */ | 292 | #endif /* __LINUX_RCUPDATE_H */ |
diff --git a/include/linux/relayfs_fs.h b/include/linux/relayfs_fs.h index cfafc3e76bc2..fb7e80737325 100644 --- a/include/linux/relayfs_fs.h +++ b/include/linux/relayfs_fs.h | |||
@@ -20,9 +20,9 @@ | |||
20 | #include <linux/kref.h> | 20 | #include <linux/kref.h> |
21 | 21 | ||
22 | /* | 22 | /* |
23 | * Tracks changes to rchan_buf struct | 23 | * Tracks changes to rchan/rchan_buf structs |
24 | */ | 24 | */ |
25 | #define RELAYFS_CHANNEL_VERSION 5 | 25 | #define RELAYFS_CHANNEL_VERSION 6 |
26 | 26 | ||
27 | /* | 27 | /* |
28 | * Per-cpu relay channel buffer | 28 | * Per-cpu relay channel buffer |
@@ -60,6 +60,7 @@ struct rchan | |||
60 | struct rchan_callbacks *cb; /* client callbacks */ | 60 | struct rchan_callbacks *cb; /* client callbacks */ |
61 | struct kref kref; /* channel refcount */ | 61 | struct kref kref; /* channel refcount */ |
62 | void *private_data; /* for user-defined data */ | 62 | void *private_data; /* for user-defined data */ |
63 | size_t last_toobig; /* tried to log event > subbuf size */ | ||
63 | struct rchan_buf *buf[NR_CPUS]; /* per-cpu channel buffers */ | 64 | struct rchan_buf *buf[NR_CPUS]; /* per-cpu channel buffers */ |
64 | }; | 65 | }; |
65 | 66 | ||
diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index c231e9a08f0b..d50482ba27fe 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h | |||
@@ -866,6 +866,7 @@ enum rtnetlink_groups { | |||
866 | #define RTNLGRP_IPV4_MROUTE RTNLGRP_IPV4_MROUTE | 866 | #define RTNLGRP_IPV4_MROUTE RTNLGRP_IPV4_MROUTE |
867 | RTNLGRP_IPV4_ROUTE, | 867 | RTNLGRP_IPV4_ROUTE, |
868 | #define RTNLGRP_IPV4_ROUTE RTNLGRP_IPV4_ROUTE | 868 | #define RTNLGRP_IPV4_ROUTE RTNLGRP_IPV4_ROUTE |
869 | RTNLGRP_NOP1, | ||
869 | RTNLGRP_IPV6_IFADDR, | 870 | RTNLGRP_IPV6_IFADDR, |
870 | #define RTNLGRP_IPV6_IFADDR RTNLGRP_IPV6_IFADDR | 871 | #define RTNLGRP_IPV6_IFADDR RTNLGRP_IPV6_IFADDR |
871 | RTNLGRP_IPV6_MROUTE, | 872 | RTNLGRP_IPV6_MROUTE, |
@@ -876,8 +877,11 @@ enum rtnetlink_groups { | |||
876 | #define RTNLGRP_IPV6_IFINFO RTNLGRP_IPV6_IFINFO | 877 | #define RTNLGRP_IPV6_IFINFO RTNLGRP_IPV6_IFINFO |
877 | RTNLGRP_DECnet_IFADDR, | 878 | RTNLGRP_DECnet_IFADDR, |
878 | #define RTNLGRP_DECnet_IFADDR RTNLGRP_DECnet_IFADDR | 879 | #define RTNLGRP_DECnet_IFADDR RTNLGRP_DECnet_IFADDR |
880 | RTNLGRP_NOP2, | ||
879 | RTNLGRP_DECnet_ROUTE, | 881 | RTNLGRP_DECnet_ROUTE, |
880 | #define RTNLGRP_DECnet_ROUTE RTNLGRP_DECnet_ROUTE | 882 | #define RTNLGRP_DECnet_ROUTE RTNLGRP_DECnet_ROUTE |
883 | RTNLGRP_NOP3, | ||
884 | RTNLGRP_NOP4, | ||
881 | RTNLGRP_IPV6_PREFIX, | 885 | RTNLGRP_IPV6_PREFIX, |
882 | #define RTNLGRP_IPV6_PREFIX RTNLGRP_IPV6_PREFIX | 886 | #define RTNLGRP_IPV6_PREFIX RTNLGRP_IPV6_PREFIX |
883 | __RTNLGRP_MAX | 887 | __RTNLGRP_MAX |
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 6bc03c911a83..4be34ef8c2f7 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
@@ -670,6 +670,9 @@ enum { | |||
670 | NET_DECNET_DST_GC_INTERVAL = 9, | 670 | NET_DECNET_DST_GC_INTERVAL = 9, |
671 | NET_DECNET_CONF = 10, | 671 | NET_DECNET_CONF = 10, |
672 | NET_DECNET_NO_FC_MAX_CWND = 11, | 672 | NET_DECNET_NO_FC_MAX_CWND = 11, |
673 | NET_DECNET_MEM = 12, | ||
674 | NET_DECNET_RMEM = 13, | ||
675 | NET_DECNET_WMEM = 14, | ||
673 | NET_DECNET_DEBUG_LEVEL = 255 | 676 | NET_DECNET_DEBUG_LEVEL = 255 |
674 | }; | 677 | }; |
675 | 678 | ||
diff --git a/include/linux/time.h b/include/linux/time.h index bfbe92d0767c..797ccd813bb0 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -95,6 +95,7 @@ struct itimerval; | |||
95 | extern int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue); | 95 | extern int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue); |
96 | extern int do_getitimer(int which, struct itimerval *value); | 96 | extern int do_getitimer(int which, struct itimerval *value); |
97 | extern void getnstimeofday (struct timespec *tv); | 97 | extern void getnstimeofday (struct timespec *tv); |
98 | extern void getnstimestamp(struct timespec *ts); | ||
98 | 99 | ||
99 | extern struct timespec timespec_trunc(struct timespec t, unsigned gran); | 100 | extern struct timespec timespec_trunc(struct timespec t, unsigned gran); |
100 | 101 | ||
diff --git a/include/media/saa7146.h b/include/media/saa7146.h index 2a897c3a6a9a..e5be2b9b846b 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <linux/vmalloc.h> /* for vmalloc() */ | 14 | #include <linux/vmalloc.h> /* for vmalloc() */ |
15 | #include <linux/mm.h> /* for vmalloc_to_page() */ | 15 | #include <linux/mm.h> /* for vmalloc_to_page() */ |
16 | 16 | ||
17 | #define SAA7146_VERSION_CODE 0x000500 /* 0.5.0 */ | 17 | #define SAA7146_VERSION_CODE 0x000500 /* 0.5.0 */ |
18 | 18 | ||
19 | #define saa7146_write(sxy,adr,dat) writel((dat),(sxy->mem+(adr))) | 19 | #define saa7146_write(sxy,adr,dat) writel((dat),(sxy->mem+(adr))) |
20 | #define saa7146_read(sxy,adr) readl(sxy->mem+(adr)) | 20 | #define saa7146_read(sxy,adr) readl(sxy->mem+(adr)) |
@@ -112,7 +112,7 @@ struct saa7146_dev | |||
112 | 112 | ||
113 | /* different device locks */ | 113 | /* different device locks */ |
114 | spinlock_t slock; | 114 | spinlock_t slock; |
115 | struct semaphore lock; | 115 | struct semaphore lock; |
116 | 116 | ||
117 | unsigned char __iomem *mem; /* pointer to mapped IO memory */ | 117 | unsigned char __iomem *mem; /* pointer to mapped IO memory */ |
118 | int revision; /* chip revision; needed for bug-workarounds*/ | 118 | int revision; /* chip revision; needed for bug-workarounds*/ |
@@ -133,7 +133,7 @@ struct saa7146_dev | |||
133 | void (*vv_callback)(struct saa7146_dev *dev, unsigned long status); | 133 | void (*vv_callback)(struct saa7146_dev *dev, unsigned long status); |
134 | 134 | ||
135 | /* i2c-stuff */ | 135 | /* i2c-stuff */ |
136 | struct semaphore i2c_lock; | 136 | struct semaphore i2c_lock; |
137 | u32 i2c_bitrate; | 137 | u32 i2c_bitrate; |
138 | struct saa7146_dma d_i2c; /* pointer to i2c memory */ | 138 | struct saa7146_dma d_i2c; /* pointer to i2c memory */ |
139 | wait_queue_head_t i2c_wq; | 139 | wait_queue_head_t i2c_wq; |
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 64691753721e..16af9299315f 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h | |||
@@ -113,7 +113,7 @@ struct saa7146_vv | |||
113 | /* vbi capture */ | 113 | /* vbi capture */ |
114 | struct saa7146_dmaqueue vbi_q; | 114 | struct saa7146_dmaqueue vbi_q; |
115 | /* vbi workaround interrupt queue */ | 115 | /* vbi workaround interrupt queue */ |
116 | wait_queue_head_t vbi_wq; | 116 | wait_queue_head_t vbi_wq; |
117 | int vbi_fieldcount; | 117 | int vbi_fieldcount; |
118 | struct saa7146_fh *vbi_streaming; | 118 | struct saa7146_fh *vbi_streaming; |
119 | 119 | ||
@@ -181,10 +181,10 @@ struct saa7146_ext_vv | |||
181 | }; | 181 | }; |
182 | 182 | ||
183 | struct saa7146_use_ops { | 183 | struct saa7146_use_ops { |
184 | void (*init)(struct saa7146_dev *, struct saa7146_vv *); | 184 | void (*init)(struct saa7146_dev *, struct saa7146_vv *); |
185 | int(*open)(struct saa7146_dev *, struct file *); | 185 | int(*open)(struct saa7146_dev *, struct file *); |
186 | void (*release)(struct saa7146_dev *, struct file *); | 186 | void (*release)(struct saa7146_dev *, struct file *); |
187 | void (*irq_done)(struct saa7146_dev *, unsigned long status); | 187 | void (*irq_done)(struct saa7146_dev *, unsigned long status); |
188 | ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); | 188 | ssize_t (*read)(struct file *, char __user *, size_t, loff_t *); |
189 | }; | 189 | }; |
190 | 190 | ||
diff --git a/include/net/dn.h b/include/net/dn.h index c1dbbd222793..a4b6168e1e25 100644 --- a/include/net/dn.h +++ b/include/net/dn.h | |||
@@ -234,4 +234,8 @@ extern int decnet_di_count; | |||
234 | extern int decnet_dr_count; | 234 | extern int decnet_dr_count; |
235 | extern int decnet_no_fc_max_cwnd; | 235 | extern int decnet_no_fc_max_cwnd; |
236 | 236 | ||
237 | extern int sysctl_decnet_mem[3]; | ||
238 | extern int sysctl_decnet_wmem[3]; | ||
239 | extern int sysctl_decnet_rmem[3]; | ||
240 | |||
237 | #endif /* _NET_DN_H */ | 241 | #endif /* _NET_DN_H */ |
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 5beae1ccd574..1cdb87912137 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -890,6 +890,7 @@ struct xfrm_state * xfrm_find_acq(u8 mode, u32 reqid, u8 proto, | |||
890 | extern void xfrm_policy_flush(void); | 890 | extern void xfrm_policy_flush(void); |
891 | extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol); | 891 | extern int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol); |
892 | extern int xfrm_flush_bundles(void); | 892 | extern int xfrm_flush_bundles(void); |
893 | extern void xfrm_flush_all_bundles(void); | ||
893 | extern int xfrm_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl, int family); | 894 | extern int xfrm_bundle_ok(struct xfrm_dst *xdst, struct flowi *fl, int family); |
894 | extern void xfrm_init_pmtu(struct dst_entry *dst); | 895 | extern void xfrm_init_pmtu(struct dst_entry *dst); |
895 | 896 | ||
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index 7529f4388bb4..20da282d4abb 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h | |||
@@ -151,5 +151,6 @@ extern struct scsi_cmnd *scsi_get_command(struct scsi_device *, gfp_t); | |||
151 | extern void scsi_put_command(struct scsi_cmnd *); | 151 | extern void scsi_put_command(struct scsi_cmnd *); |
152 | extern void scsi_io_completion(struct scsi_cmnd *, unsigned int, unsigned int); | 152 | extern void scsi_io_completion(struct scsi_cmnd *, unsigned int, unsigned int); |
153 | extern void scsi_finish_command(struct scsi_cmnd *cmd); | 153 | extern void scsi_finish_command(struct scsi_cmnd *cmd); |
154 | extern void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd, int retries); | ||
154 | 155 | ||
155 | #endif /* _SCSI_SCSI_CMND_H */ | 156 | #endif /* _SCSI_SCSI_CMND_H */ |
diff --git a/init/Kconfig b/init/Kconfig index ea097e0a9c02..9fc0759fa942 100644 --- a/init/Kconfig +++ b/init/Kconfig | |||
@@ -206,7 +206,7 @@ config HOTPLUG | |||
206 | outside the kernel tree does. Such modules require Y here. | 206 | outside the kernel tree does. Such modules require Y here. |
207 | 207 | ||
208 | config KOBJECT_UEVENT | 208 | config KOBJECT_UEVENT |
209 | bool "Kernel Userspace Events" | 209 | bool "Kernel Userspace Events" if EMBEDDED |
210 | depends on NET | 210 | depends on NET |
211 | default y | 211 | default y |
212 | help | 212 | help |
@@ -256,6 +256,19 @@ config CPUSETS | |||
256 | 256 | ||
257 | source "usr/Kconfig" | 257 | source "usr/Kconfig" |
258 | 258 | ||
259 | config CC_OPTIMIZE_FOR_SIZE | ||
260 | bool "Optimize for size (Look out for broken compilers!)" | ||
261 | default y | ||
262 | depends on ARM || H8300 || EXPERIMENTAL | ||
263 | help | ||
264 | Enabling this option will pass "-Os" instead of "-O2" to gcc | ||
265 | resulting in a smaller kernel. | ||
266 | |||
267 | WARNING: some versions of gcc may generate incorrect code with this | ||
268 | option. If problems are observed, a gcc upgrade may be needed. | ||
269 | |||
270 | If unsure, say N. | ||
271 | |||
259 | menuconfig EMBEDDED | 272 | menuconfig EMBEDDED |
260 | bool "Configure standard kernel features (for small systems)" | 273 | bool "Configure standard kernel features (for small systems)" |
261 | help | 274 | help |
@@ -338,18 +351,6 @@ config EPOLL | |||
338 | Disabling this option will cause the kernel to be built without | 351 | Disabling this option will cause the kernel to be built without |
339 | support for epoll family of system calls. | 352 | support for epoll family of system calls. |
340 | 353 | ||
341 | config CC_OPTIMIZE_FOR_SIZE | ||
342 | bool "Optimize for size" if EMBEDDED | ||
343 | default y if ARM || H8300 | ||
344 | help | ||
345 | Enabling this option will pass "-Os" instead of "-O2" to gcc | ||
346 | resulting in a smaller kernel. | ||
347 | |||
348 | WARNING: some versions of gcc may generate incorrect code with this | ||
349 | option. If problems are observed, a gcc upgrade may be needed. | ||
350 | |||
351 | If unsure, say N. | ||
352 | |||
353 | config SHMEM | 354 | config SHMEM |
354 | bool "Use full shmem filesystem" if EMBEDDED | 355 | bool "Use full shmem filesystem" if EMBEDDED |
355 | default y | 356 | default y |
diff --git a/kernel/audit.c b/kernel/audit.c index 0c56320d38dc..32fa03ad1984 100644 --- a/kernel/audit.c +++ b/kernel/audit.c | |||
@@ -291,8 +291,10 @@ int kauditd_thread(void *dummy) | |||
291 | set_current_state(TASK_INTERRUPTIBLE); | 291 | set_current_state(TASK_INTERRUPTIBLE); |
292 | add_wait_queue(&kauditd_wait, &wait); | 292 | add_wait_queue(&kauditd_wait, &wait); |
293 | 293 | ||
294 | if (!skb_queue_len(&audit_skb_queue)) | 294 | if (!skb_queue_len(&audit_skb_queue)) { |
295 | try_to_freeze(); | ||
295 | schedule(); | 296 | schedule(); |
297 | } | ||
296 | 298 | ||
297 | __set_current_state(TASK_RUNNING); | 299 | __set_current_state(TASK_RUNNING); |
298 | remove_wait_queue(&kauditd_wait, &wait); | 300 | remove_wait_queue(&kauditd_wait, &wait); |
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 5beda378cc75..3bb71e63a37e 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c | |||
@@ -246,6 +246,19 @@ static int __kprobes aggr_break_handler(struct kprobe *p, struct pt_regs *regs) | |||
246 | return ret; | 246 | return ret; |
247 | } | 247 | } |
248 | 248 | ||
249 | /* Walks the list and increments nmissed count for multiprobe case */ | ||
250 | void __kprobes kprobes_inc_nmissed_count(struct kprobe *p) | ||
251 | { | ||
252 | struct kprobe *kp; | ||
253 | if (p->pre_handler != aggr_pre_handler) { | ||
254 | p->nmissed++; | ||
255 | } else { | ||
256 | list_for_each_entry_rcu(kp, &p->list, list) | ||
257 | kp->nmissed++; | ||
258 | } | ||
259 | return; | ||
260 | } | ||
261 | |||
249 | /* Called with kretprobe_lock held */ | 262 | /* Called with kretprobe_lock held */ |
250 | struct kretprobe_instance __kprobes *get_free_rp_inst(struct kretprobe *rp) | 263 | struct kretprobe_instance __kprobes *get_free_rp_inst(struct kretprobe *rp) |
251 | { | 264 | { |
@@ -399,10 +412,7 @@ static inline void add_aggr_kprobe(struct kprobe *ap, struct kprobe *p) | |||
399 | INIT_LIST_HEAD(&ap->list); | 412 | INIT_LIST_HEAD(&ap->list); |
400 | list_add_rcu(&p->list, &ap->list); | 413 | list_add_rcu(&p->list, &ap->list); |
401 | 414 | ||
402 | INIT_HLIST_NODE(&ap->hlist); | 415 | hlist_replace_rcu(&p->hlist, &ap->hlist); |
403 | hlist_del_rcu(&p->hlist); | ||
404 | hlist_add_head_rcu(&ap->hlist, | ||
405 | &kprobe_table[hash_ptr(ap->addr, KPROBE_HASH_BITS)]); | ||
406 | } | 416 | } |
407 | 417 | ||
408 | /* | 418 | /* |
@@ -462,9 +472,16 @@ int __kprobes register_kprobe(struct kprobe *p) | |||
462 | int ret = 0; | 472 | int ret = 0; |
463 | unsigned long flags = 0; | 473 | unsigned long flags = 0; |
464 | struct kprobe *old_p; | 474 | struct kprobe *old_p; |
475 | struct module *mod; | ||
476 | |||
477 | if ((!kernel_text_address((unsigned long) p->addr)) || | ||
478 | in_kprobes_functions((unsigned long) p->addr)) | ||
479 | return -EINVAL; | ||
480 | |||
481 | if ((mod = module_text_address((unsigned long) p->addr)) && | ||
482 | (unlikely(!try_module_get(mod)))) | ||
483 | return -EINVAL; | ||
465 | 484 | ||
466 | if ((ret = in_kprobes_functions((unsigned long) p->addr)) != 0) | ||
467 | return ret; | ||
468 | if ((ret = arch_prepare_kprobe(p)) != 0) | 485 | if ((ret = arch_prepare_kprobe(p)) != 0) |
469 | goto rm_kprobe; | 486 | goto rm_kprobe; |
470 | 487 | ||
@@ -488,6 +505,8 @@ out: | |||
488 | rm_kprobe: | 505 | rm_kprobe: |
489 | if (ret == -EEXIST) | 506 | if (ret == -EEXIST) |
490 | arch_remove_kprobe(p); | 507 | arch_remove_kprobe(p); |
508 | if (ret && mod) | ||
509 | module_put(mod); | ||
491 | return ret; | 510 | return ret; |
492 | } | 511 | } |
493 | 512 | ||
@@ -495,6 +514,7 @@ void __kprobes unregister_kprobe(struct kprobe *p) | |||
495 | { | 514 | { |
496 | unsigned long flags; | 515 | unsigned long flags; |
497 | struct kprobe *old_p; | 516 | struct kprobe *old_p; |
517 | struct module *mod; | ||
498 | 518 | ||
499 | spin_lock_irqsave(&kprobe_lock, flags); | 519 | spin_lock_irqsave(&kprobe_lock, flags); |
500 | old_p = get_kprobe(p->addr); | 520 | old_p = get_kprobe(p->addr); |
@@ -506,6 +526,10 @@ void __kprobes unregister_kprobe(struct kprobe *p) | |||
506 | cleanup_kprobe(p, flags); | 526 | cleanup_kprobe(p, flags); |
507 | 527 | ||
508 | synchronize_sched(); | 528 | synchronize_sched(); |
529 | |||
530 | if ((mod = module_text_address((unsigned long)p->addr))) | ||
531 | module_put(mod); | ||
532 | |||
509 | if (old_p->pre_handler == aggr_pre_handler && | 533 | if (old_p->pre_handler == aggr_pre_handler && |
510 | list_empty(&old_p->list)) | 534 | list_empty(&old_p->list)) |
511 | kfree(old_p); | 535 | kfree(old_p); |
diff --git a/kernel/params.c b/kernel/params.c index 47ba69547945..c76ad25e6a21 100644 --- a/kernel/params.c +++ b/kernel/params.c | |||
@@ -619,7 +619,7 @@ static void __init param_sysfs_builtin(void) | |||
619 | 619 | ||
620 | 620 | ||
621 | /* module-related sysfs stuff */ | 621 | /* module-related sysfs stuff */ |
622 | #ifdef CONFIG_MODULES | 622 | #ifdef CONFIG_SYSFS |
623 | 623 | ||
624 | #define to_module_attr(n) container_of(n, struct module_attribute, attr); | 624 | #define to_module_attr(n) container_of(n, struct module_attribute, attr); |
625 | #define to_module_kobject(n) container_of(n, struct module_kobject, kobj); | 625 | #define to_module_kobject(n) container_of(n, struct module_kobject, kobj); |
diff --git a/kernel/rcupdate.c b/kernel/rcupdate.c index c4d159a21e04..48d3bce465b8 100644 --- a/kernel/rcupdate.c +++ b/kernel/rcupdate.c | |||
@@ -116,6 +116,10 @@ void fastcall call_rcu(struct rcu_head *head, | |||
116 | local_irq_restore(flags); | 116 | local_irq_restore(flags); |
117 | } | 117 | } |
118 | 118 | ||
119 | static atomic_t rcu_barrier_cpu_count; | ||
120 | static struct semaphore rcu_barrier_sema; | ||
121 | static struct completion rcu_barrier_completion; | ||
122 | |||
119 | /** | 123 | /** |
120 | * call_rcu_bh - Queue an RCU for invocation after a quicker grace period. | 124 | * call_rcu_bh - Queue an RCU for invocation after a quicker grace period. |
121 | * @head: structure to be used for queueing the RCU updates. | 125 | * @head: structure to be used for queueing the RCU updates. |
@@ -162,6 +166,42 @@ long rcu_batches_completed(void) | |||
162 | return rcu_ctrlblk.completed; | 166 | return rcu_ctrlblk.completed; |
163 | } | 167 | } |
164 | 168 | ||
169 | static void rcu_barrier_callback(struct rcu_head *notused) | ||
170 | { | ||
171 | if (atomic_dec_and_test(&rcu_barrier_cpu_count)) | ||
172 | complete(&rcu_barrier_completion); | ||
173 | } | ||
174 | |||
175 | /* | ||
176 | * Called with preemption disabled, and from cross-cpu IRQ context. | ||
177 | */ | ||
178 | static void rcu_barrier_func(void *notused) | ||
179 | { | ||
180 | int cpu = smp_processor_id(); | ||
181 | struct rcu_data *rdp = &per_cpu(rcu_data, cpu); | ||
182 | struct rcu_head *head; | ||
183 | |||
184 | head = &rdp->barrier; | ||
185 | atomic_inc(&rcu_barrier_cpu_count); | ||
186 | call_rcu(head, rcu_barrier_callback); | ||
187 | } | ||
188 | |||
189 | /** | ||
190 | * rcu_barrier - Wait until all the in-flight RCUs are complete. | ||
191 | */ | ||
192 | void rcu_barrier(void) | ||
193 | { | ||
194 | BUG_ON(in_interrupt()); | ||
195 | /* Take cpucontrol semaphore to protect against CPU hotplug */ | ||
196 | down(&rcu_barrier_sema); | ||
197 | init_completion(&rcu_barrier_completion); | ||
198 | atomic_set(&rcu_barrier_cpu_count, 0); | ||
199 | on_each_cpu(rcu_barrier_func, NULL, 0, 1); | ||
200 | wait_for_completion(&rcu_barrier_completion); | ||
201 | up(&rcu_barrier_sema); | ||
202 | } | ||
203 | EXPORT_SYMBOL_GPL(rcu_barrier); | ||
204 | |||
165 | /* | 205 | /* |
166 | * Invoke the completed RCU callbacks. They are expected to be in | 206 | * Invoke the completed RCU callbacks. They are expected to be in |
167 | * a per-cpu list. | 207 | * a per-cpu list. |
@@ -217,15 +257,23 @@ static void rcu_start_batch(struct rcu_ctrlblk *rcp, struct rcu_state *rsp, | |||
217 | 257 | ||
218 | if (rcp->next_pending && | 258 | if (rcp->next_pending && |
219 | rcp->completed == rcp->cur) { | 259 | rcp->completed == rcp->cur) { |
220 | /* Can't change, since spin lock held. */ | ||
221 | cpus_andnot(rsp->cpumask, cpu_online_map, nohz_cpu_mask); | ||
222 | |||
223 | rcp->next_pending = 0; | 260 | rcp->next_pending = 0; |
224 | /* next_pending == 0 must be visible in __rcu_process_callbacks() | 261 | /* |
225 | * before it can see new value of cur. | 262 | * next_pending == 0 must be visible in |
263 | * __rcu_process_callbacks() before it can see new value of cur. | ||
226 | */ | 264 | */ |
227 | smp_wmb(); | 265 | smp_wmb(); |
228 | rcp->cur++; | 266 | rcp->cur++; |
267 | |||
268 | /* | ||
269 | * Accessing nohz_cpu_mask before incrementing rcp->cur needs a | ||
270 | * Barrier Otherwise it can cause tickless idle CPUs to be | ||
271 | * included in rsp->cpumask, which will extend graceperiods | ||
272 | * unnecessarily. | ||
273 | */ | ||
274 | smp_mb(); | ||
275 | cpus_andnot(rsp->cpumask, cpu_online_map, nohz_cpu_mask); | ||
276 | |||
229 | } | 277 | } |
230 | } | 278 | } |
231 | 279 | ||
@@ -457,6 +505,7 @@ static struct notifier_block __devinitdata rcu_nb = { | |||
457 | */ | 505 | */ |
458 | void __init rcu_init(void) | 506 | void __init rcu_init(void) |
459 | { | 507 | { |
508 | sema_init(&rcu_barrier_sema, 1); | ||
460 | rcu_cpu_notify(&rcu_nb, CPU_UP_PREPARE, | 509 | rcu_cpu_notify(&rcu_nb, CPU_UP_PREPARE, |
461 | (void *)(long)smp_processor_id()); | 510 | (void *)(long)smp_processor_id()); |
462 | /* Register notifier for non-boot CPUs */ | 511 | /* Register notifier for non-boot CPUs */ |
diff --git a/kernel/rcutorture.c b/kernel/rcutorture.c index 88c28d476550..49fbbeff201c 100644 --- a/kernel/rcutorture.c +++ b/kernel/rcutorture.c | |||
@@ -409,9 +409,8 @@ rcu_torture_cleanup(void) | |||
409 | stats_task = NULL; | 409 | stats_task = NULL; |
410 | 410 | ||
411 | /* Wait for all RCU callbacks to fire. */ | 411 | /* Wait for all RCU callbacks to fire. */ |
412 | rcu_barrier(); | ||
412 | 413 | ||
413 | for (i = 0; i < RCU_TORTURE_PIPE_LEN; i++) | ||
414 | synchronize_rcu(); | ||
415 | rcu_torture_stats_print(); /* -After- the stats thread is stopped! */ | 414 | rcu_torture_stats_print(); /* -After- the stats thread is stopped! */ |
416 | printk(KERN_ALERT TORTURE_FLAG | 415 | printk(KERN_ALERT TORTURE_FLAG |
417 | "--- End of test: %s\n", | 416 | "--- End of test: %s\n", |
diff --git a/kernel/sys.c b/kernel/sys.c index bce933ebb29f..eecf84526afe 100644 --- a/kernel/sys.c +++ b/kernel/sys.c | |||
@@ -32,6 +32,7 @@ | |||
32 | 32 | ||
33 | #include <linux/compat.h> | 33 | #include <linux/compat.h> |
34 | #include <linux/syscalls.h> | 34 | #include <linux/syscalls.h> |
35 | #include <linux/kprobes.h> | ||
35 | 36 | ||
36 | #include <asm/uaccess.h> | 37 | #include <asm/uaccess.h> |
37 | #include <asm/io.h> | 38 | #include <asm/io.h> |
@@ -168,7 +169,7 @@ EXPORT_SYMBOL(notifier_chain_unregister); | |||
168 | * of the last notifier function called. | 169 | * of the last notifier function called. |
169 | */ | 170 | */ |
170 | 171 | ||
171 | int notifier_call_chain(struct notifier_block **n, unsigned long val, void *v) | 172 | int __kprobes notifier_call_chain(struct notifier_block **n, unsigned long val, void *v) |
172 | { | 173 | { |
173 | int ret=NOTIFY_DONE; | 174 | int ret=NOTIFY_DONE; |
174 | struct notifier_block *nb = *n; | 175 | struct notifier_block *nb = *n; |
diff --git a/kernel/time.c b/kernel/time.c index 245d595a13cb..b94bfa8c03e0 100644 --- a/kernel/time.c +++ b/kernel/time.c | |||
@@ -561,6 +561,28 @@ void getnstimeofday(struct timespec *tv) | |||
561 | EXPORT_SYMBOL_GPL(getnstimeofday); | 561 | EXPORT_SYMBOL_GPL(getnstimeofday); |
562 | #endif | 562 | #endif |
563 | 563 | ||
564 | void getnstimestamp(struct timespec *ts) | ||
565 | { | ||
566 | unsigned int seq; | ||
567 | struct timespec wall2mono; | ||
568 | |||
569 | /* synchronize with settimeofday() changes */ | ||
570 | do { | ||
571 | seq = read_seqbegin(&xtime_lock); | ||
572 | getnstimeofday(ts); | ||
573 | wall2mono = wall_to_monotonic; | ||
574 | } while(unlikely(read_seqretry(&xtime_lock, seq))); | ||
575 | |||
576 | /* adjust to monotonicaly-increasing values */ | ||
577 | ts->tv_sec += wall2mono.tv_sec; | ||
578 | ts->tv_nsec += wall2mono.tv_nsec; | ||
579 | while (unlikely(ts->tv_nsec >= NSEC_PER_SEC)) { | ||
580 | ts->tv_nsec -= NSEC_PER_SEC; | ||
581 | ts->tv_sec++; | ||
582 | } | ||
583 | } | ||
584 | EXPORT_SYMBOL_GPL(getnstimestamp); | ||
585 | |||
564 | #if (BITS_PER_LONG < 64) | 586 | #if (BITS_PER_LONG < 64) |
565 | u64 get_jiffies_64(void) | 587 | u64 get_jiffies_64(void) |
566 | { | 588 | { |
diff --git a/lib/spinlock_debug.c b/lib/spinlock_debug.c index 906ad101eab3..dcd4be9bd4e5 100644 --- a/lib/spinlock_debug.c +++ b/lib/spinlock_debug.c | |||
@@ -20,7 +20,8 @@ static void spin_bug(spinlock_t *lock, const char *msg) | |||
20 | if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT) | 20 | if (lock->owner && lock->owner != SPINLOCK_OWNER_INIT) |
21 | owner = lock->owner; | 21 | owner = lock->owner; |
22 | printk("BUG: spinlock %s on CPU#%d, %s/%d\n", | 22 | printk("BUG: spinlock %s on CPU#%d, %s/%d\n", |
23 | msg, smp_processor_id(), current->comm, current->pid); | 23 | msg, raw_smp_processor_id(), |
24 | current->comm, current->pid); | ||
24 | printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n", | 25 | printk(" lock: %p, .magic: %08x, .owner: %s/%d, .owner_cpu: %d\n", |
25 | lock, lock->magic, | 26 | lock, lock->magic, |
26 | owner ? owner->comm : "<none>", | 27 | owner ? owner->comm : "<none>", |
@@ -78,8 +79,8 @@ static void __spin_lock_debug(spinlock_t *lock) | |||
78 | if (print_once) { | 79 | if (print_once) { |
79 | print_once = 0; | 80 | print_once = 0; |
80 | printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n", | 81 | printk("BUG: spinlock lockup on CPU#%d, %s/%d, %p\n", |
81 | smp_processor_id(), current->comm, current->pid, | 82 | raw_smp_processor_id(), current->comm, |
82 | lock); | 83 | current->pid, lock); |
83 | dump_stack(); | 84 | dump_stack(); |
84 | } | 85 | } |
85 | } | 86 | } |
@@ -120,7 +121,8 @@ static void rwlock_bug(rwlock_t *lock, const char *msg) | |||
120 | 121 | ||
121 | if (xchg(&print_once, 0)) { | 122 | if (xchg(&print_once, 0)) { |
122 | printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg, | 123 | printk("BUG: rwlock %s on CPU#%d, %s/%d, %p\n", msg, |
123 | smp_processor_id(), current->comm, current->pid, lock); | 124 | raw_smp_processor_id(), current->comm, |
125 | current->pid, lock); | ||
124 | dump_stack(); | 126 | dump_stack(); |
125 | #ifdef CONFIG_SMP | 127 | #ifdef CONFIG_SMP |
126 | /* | 128 | /* |
@@ -148,8 +150,8 @@ static void __read_lock_debug(rwlock_t *lock) | |||
148 | if (print_once) { | 150 | if (print_once) { |
149 | print_once = 0; | 151 | print_once = 0; |
150 | printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n", | 152 | printk("BUG: read-lock lockup on CPU#%d, %s/%d, %p\n", |
151 | smp_processor_id(), current->comm, current->pid, | 153 | raw_smp_processor_id(), current->comm, |
152 | lock); | 154 | current->pid, lock); |
153 | dump_stack(); | 155 | dump_stack(); |
154 | } | 156 | } |
155 | } | 157 | } |
@@ -220,8 +222,8 @@ static void __write_lock_debug(rwlock_t *lock) | |||
220 | if (print_once) { | 222 | if (print_once) { |
221 | print_once = 0; | 223 | print_once = 0; |
222 | printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n", | 224 | printk("BUG: write-lock lockup on CPU#%d, %s/%d, %p\n", |
223 | smp_processor_id(), current->comm, current->pid, | 225 | raw_smp_processor_id(), current->comm, |
224 | lock); | 226 | current->pid, lock); |
225 | dump_stack(); | 227 | dump_stack(); |
226 | } | 228 | } |
227 | } | 229 | } |
diff --git a/lib/swiotlb.c b/lib/swiotlb.c index 57216f3544ca..1ff8dcebf7c6 100644 --- a/lib/swiotlb.c +++ b/lib/swiotlb.c | |||
@@ -704,8 +704,9 @@ swiotlb_map_sg(struct device *hwdev, struct scatterlist *sg, int nelems, | |||
704 | addr = SG_ENT_VIRT_ADDRESS(sg); | 704 | addr = SG_ENT_VIRT_ADDRESS(sg); |
705 | dev_addr = virt_to_phys(addr); | 705 | dev_addr = virt_to_phys(addr); |
706 | if (swiotlb_force || address_needs_mapping(hwdev, dev_addr)) { | 706 | if (swiotlb_force || address_needs_mapping(hwdev, dev_addr)) { |
707 | sg->dma_address = (dma_addr_t) virt_to_phys(map_single(hwdev, addr, sg->length, dir)); | 707 | void *map = map_single(hwdev, addr, sg->length, dir); |
708 | if (!sg->dma_address) { | 708 | sg->dma_address = virt_to_bus(map); |
709 | if (!map) { | ||
709 | /* Don't panic here, we expect map_sg users | 710 | /* Don't panic here, we expect map_sg users |
710 | to do proper error handling. */ | 711 | to do proper error handling. */ |
711 | swiotlb_full(hwdev, sg->length, dir, 0); | 712 | swiotlb_full(hwdev, sg->length, dir, 0); |
diff --git a/mm/bootmem.c b/mm/bootmem.c index e8c567177dcf..16b9465eb4eb 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c | |||
@@ -204,6 +204,8 @@ restart_scan: | |||
204 | unsigned long j; | 204 | unsigned long j; |
205 | i = find_next_zero_bit(bdata->node_bootmem_map, eidx, i); | 205 | i = find_next_zero_bit(bdata->node_bootmem_map, eidx, i); |
206 | i = ALIGN(i, incr); | 206 | i = ALIGN(i, incr); |
207 | if (i >= eidx) | ||
208 | break; | ||
207 | if (test_bit(i, bdata->node_bootmem_map)) | 209 | if (test_bit(i, bdata->node_bootmem_map)) |
208 | continue; | 210 | continue; |
209 | for (j = i + 1; j < i + areasize; ++j) { | 211 | for (j = i + 1; j < i + areasize; ++j) { |
diff --git a/mm/memory.c b/mm/memory.c index aa8af0e20269..d8dde07a3656 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
@@ -349,6 +349,11 @@ void print_bad_pte(struct vm_area_struct *vma, pte_t pte, unsigned long vaddr) | |||
349 | dump_stack(); | 349 | dump_stack(); |
350 | } | 350 | } |
351 | 351 | ||
352 | static inline int is_cow_mapping(unsigned int flags) | ||
353 | { | ||
354 | return (flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE; | ||
355 | } | ||
356 | |||
352 | /* | 357 | /* |
353 | * This function gets the "struct page" associated with a pte. | 358 | * This function gets the "struct page" associated with a pte. |
354 | * | 359 | * |
@@ -377,6 +382,8 @@ struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr, pte_ | |||
377 | unsigned long off = (addr - vma->vm_start) >> PAGE_SHIFT; | 382 | unsigned long off = (addr - vma->vm_start) >> PAGE_SHIFT; |
378 | if (pfn == vma->vm_pgoff + off) | 383 | if (pfn == vma->vm_pgoff + off) |
379 | return NULL; | 384 | return NULL; |
385 | if (!is_cow_mapping(vma->vm_flags)) | ||
386 | return NULL; | ||
380 | } | 387 | } |
381 | 388 | ||
382 | /* | 389 | /* |
@@ -437,7 +444,7 @@ copy_one_pte(struct mm_struct *dst_mm, struct mm_struct *src_mm, | |||
437 | * If it's a COW mapping, write protect it both | 444 | * If it's a COW mapping, write protect it both |
438 | * in the parent and the child | 445 | * in the parent and the child |
439 | */ | 446 | */ |
440 | if ((vm_flags & (VM_SHARED | VM_MAYWRITE)) == VM_MAYWRITE) { | 447 | if (is_cow_mapping(vm_flags)) { |
441 | ptep_set_wrprotect(src_mm, addr, src_pte); | 448 | ptep_set_wrprotect(src_mm, addr, src_pte); |
442 | pte = *src_pte; | 449 | pte = *src_pte; |
443 | } | 450 | } |
@@ -567,7 +574,7 @@ int copy_page_range(struct mm_struct *dst_mm, struct mm_struct *src_mm, | |||
567 | * readonly mappings. The tradeoff is that copy_page_range is more | 574 | * readonly mappings. The tradeoff is that copy_page_range is more |
568 | * efficient than faulting. | 575 | * efficient than faulting. |
569 | */ | 576 | */ |
570 | if (!(vma->vm_flags & (VM_HUGETLB|VM_NONLINEAR|VM_PFNMAP))) { | 577 | if (!(vma->vm_flags & (VM_HUGETLB|VM_NONLINEAR|VM_PFNMAP|VM_INSERTPAGE))) { |
571 | if (!vma->anon_vma) | 578 | if (!vma->anon_vma) |
572 | return 0; | 579 | return 0; |
573 | } | 580 | } |
@@ -1002,7 +1009,7 @@ int get_user_pages(struct task_struct *tsk, struct mm_struct *mm, | |||
1002 | continue; | 1009 | continue; |
1003 | } | 1010 | } |
1004 | 1011 | ||
1005 | if (!vma || (vma->vm_flags & VM_IO) | 1012 | if (!vma || (vma->vm_flags & (VM_IO | VM_PFNMAP)) |
1006 | || !(vm_flags & vma->vm_flags)) | 1013 | || !(vm_flags & vma->vm_flags)) |
1007 | return i ? : -EFAULT; | 1014 | return i ? : -EFAULT; |
1008 | 1015 | ||
@@ -1221,55 +1228,12 @@ int vm_insert_page(struct vm_area_struct *vma, unsigned long addr, struct page * | |||
1221 | return -EFAULT; | 1228 | return -EFAULT; |
1222 | if (!page_count(page)) | 1229 | if (!page_count(page)) |
1223 | return -EINVAL; | 1230 | return -EINVAL; |
1231 | vma->vm_flags |= VM_INSERTPAGE; | ||
1224 | return insert_page(vma->vm_mm, addr, page, vma->vm_page_prot); | 1232 | return insert_page(vma->vm_mm, addr, page, vma->vm_page_prot); |
1225 | } | 1233 | } |
1226 | EXPORT_SYMBOL(vm_insert_page); | 1234 | EXPORT_SYMBOL(vm_insert_page); |
1227 | 1235 | ||
1228 | /* | 1236 | /* |
1229 | * Somebody does a pfn remapping that doesn't actually work as a vma. | ||
1230 | * | ||
1231 | * Do it as individual pages instead, and warn about it. It's bad form, | ||
1232 | * and very inefficient. | ||
1233 | */ | ||
1234 | static int incomplete_pfn_remap(struct vm_area_struct *vma, | ||
1235 | unsigned long start, unsigned long end, | ||
1236 | unsigned long pfn, pgprot_t prot) | ||
1237 | { | ||
1238 | static int warn = 10; | ||
1239 | struct page *page; | ||
1240 | int retval; | ||
1241 | |||
1242 | if (!(vma->vm_flags & VM_INCOMPLETE)) { | ||
1243 | if (warn) { | ||
1244 | warn--; | ||
1245 | printk("%s does an incomplete pfn remapping", current->comm); | ||
1246 | dump_stack(); | ||
1247 | } | ||
1248 | } | ||
1249 | vma->vm_flags |= VM_INCOMPLETE | VM_IO | VM_RESERVED; | ||
1250 | |||
1251 | if (start < vma->vm_start || end > vma->vm_end) | ||
1252 | return -EINVAL; | ||
1253 | |||
1254 | if (!pfn_valid(pfn)) | ||
1255 | return -EINVAL; | ||
1256 | |||
1257 | page = pfn_to_page(pfn); | ||
1258 | if (!PageReserved(page)) | ||
1259 | return -EINVAL; | ||
1260 | |||
1261 | retval = 0; | ||
1262 | while (start < end) { | ||
1263 | retval = insert_page(vma->vm_mm, start, page, prot); | ||
1264 | if (retval < 0) | ||
1265 | break; | ||
1266 | start += PAGE_SIZE; | ||
1267 | page++; | ||
1268 | } | ||
1269 | return retval; | ||
1270 | } | ||
1271 | |||
1272 | /* | ||
1273 | * maps a range of physical memory into the requested pages. the old | 1237 | * maps a range of physical memory into the requested pages. the old |
1274 | * mappings are removed. any references to nonexistent pages results | 1238 | * mappings are removed. any references to nonexistent pages results |
1275 | * in null mappings (currently treated as "copy-on-access") | 1239 | * in null mappings (currently treated as "copy-on-access") |
@@ -1343,9 +1307,6 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr, | |||
1343 | struct mm_struct *mm = vma->vm_mm; | 1307 | struct mm_struct *mm = vma->vm_mm; |
1344 | int err; | 1308 | int err; |
1345 | 1309 | ||
1346 | if (addr != vma->vm_start || end != vma->vm_end) | ||
1347 | return incomplete_pfn_remap(vma, addr, end, pfn, prot); | ||
1348 | |||
1349 | /* | 1310 | /* |
1350 | * Physically remapped pages are special. Tell the | 1311 | * Physically remapped pages are special. Tell the |
1351 | * rest of the world about it: | 1312 | * rest of the world about it: |
@@ -1359,9 +1320,18 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr, | |||
1359 | * VM_PFNMAP tells the core MM that the base pages are just | 1320 | * VM_PFNMAP tells the core MM that the base pages are just |
1360 | * raw PFN mappings, and do not have a "struct page" associated | 1321 | * raw PFN mappings, and do not have a "struct page" associated |
1361 | * with them. | 1322 | * with them. |
1323 | * | ||
1324 | * There's a horrible special case to handle copy-on-write | ||
1325 | * behaviour that some programs depend on. We mark the "original" | ||
1326 | * un-COW'ed pages by matching them up with "vma->vm_pgoff". | ||
1362 | */ | 1327 | */ |
1328 | if (is_cow_mapping(vma->vm_flags)) { | ||
1329 | if (addr != vma->vm_start || end != vma->vm_end) | ||
1330 | return -EINVAL; | ||
1331 | vma->vm_pgoff = pfn; | ||
1332 | } | ||
1333 | |||
1363 | vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP; | 1334 | vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP; |
1364 | vma->vm_pgoff = pfn; | ||
1365 | 1335 | ||
1366 | BUG_ON(addr >= end); | 1336 | BUG_ON(addr >= end); |
1367 | pfn -= addr >> PAGE_SHIFT; | 1337 | pfn -= addr >> PAGE_SHIFT; |
diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index 431a64f021c0..f6d4af8af8a8 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c | |||
@@ -104,7 +104,7 @@ static void grow_pgdat_span(struct pglist_data *pgdat, | |||
104 | pgdat->node_start_pfn = start_pfn; | 104 | pgdat->node_start_pfn = start_pfn; |
105 | 105 | ||
106 | if (end_pfn > old_pgdat_end_pfn) | 106 | if (end_pfn > old_pgdat_end_pfn) |
107 | pgdat->node_spanned_pages = end_pfn - pgdat->node_spanned_pages; | 107 | pgdat->node_spanned_pages = end_pfn - pgdat->node_start_pfn; |
108 | } | 108 | } |
109 | 109 | ||
110 | int online_pages(unsigned long pfn, unsigned long nr_pages) | 110 | int online_pages(unsigned long pfn, unsigned long nr_pages) |
@@ -611,7 +611,7 @@ again: remove_next = 1 + (end > next->vm_end); | |||
611 | * If the vma has a ->close operation then the driver probably needs to release | 611 | * If the vma has a ->close operation then the driver probably needs to release |
612 | * per-vma resources, so we don't attempt to merge those. | 612 | * per-vma resources, so we don't attempt to merge those. |
613 | */ | 613 | */ |
614 | #define VM_SPECIAL (VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED) | 614 | #define VM_SPECIAL (VM_IO | VM_DONTCOPY | VM_DONTEXPAND | VM_RESERVED | VM_PFNMAP) |
615 | 615 | ||
616 | static inline int is_mergeable_vma(struct vm_area_struct *vma, | 616 | static inline int is_mergeable_vma(struct vm_area_struct *vma, |
617 | struct file *file, unsigned long vm_flags) | 617 | struct file *file, unsigned long vm_flags) |
diff --git a/mm/mremap.c b/mm/mremap.c index b535438c363c..ddaeee9a0b69 100644 --- a/mm/mremap.c +++ b/mm/mremap.c | |||
@@ -323,7 +323,7 @@ unsigned long do_mremap(unsigned long addr, | |||
323 | /* We can't remap across vm area boundaries */ | 323 | /* We can't remap across vm area boundaries */ |
324 | if (old_len > vma->vm_end - addr) | 324 | if (old_len > vma->vm_end - addr) |
325 | goto out; | 325 | goto out; |
326 | if (vma->vm_flags & VM_DONTEXPAND) { | 326 | if (vma->vm_flags & (VM_DONTEXPAND | VM_PFNMAP)) { |
327 | if (new_len > old_len) | 327 | if (new_len > old_len) |
328 | goto out; | 328 | goto out; |
329 | } | 329 | } |
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 3b21a13d841c..fe14a8c87fc2 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -1896,7 +1896,7 @@ static int __devinit pageset_cpuup_callback(struct notifier_block *nfb, | |||
1896 | static struct notifier_block pageset_notifier = | 1896 | static struct notifier_block pageset_notifier = |
1897 | { &pageset_cpuup_callback, NULL, 0 }; | 1897 | { &pageset_cpuup_callback, NULL, 0 }; |
1898 | 1898 | ||
1899 | void __init setup_per_cpu_pageset() | 1899 | void __init setup_per_cpu_pageset(void) |
1900 | { | 1900 | { |
1901 | int err; | 1901 | int err; |
1902 | 1902 | ||
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index b74864889670..f2a8750bbf1d 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c | |||
@@ -165,6 +165,9 @@ int vlan_skb_recv(struct sk_buff *skb, struct net_device *dev, | |||
165 | 165 | ||
166 | skb_pull(skb, VLAN_HLEN); /* take off the VLAN header (4 bytes currently) */ | 166 | skb_pull(skb, VLAN_HLEN); /* take off the VLAN header (4 bytes currently) */ |
167 | 167 | ||
168 | /* Need to correct hardware checksum */ | ||
169 | skb_postpull_rcsum(skb, vhdr, VLAN_HLEN); | ||
170 | |||
168 | /* Ok, lets check to make sure the device (dev) we | 171 | /* Ok, lets check to make sure the device (dev) we |
169 | * came in on is what this VLAN is attached to. | 172 | * came in on is what this VLAN is attached to. |
170 | */ | 173 | */ |
diff --git a/net/bridge/br_netfilter.c b/net/bridge/br_netfilter.c index d8e36b775125..43a0b35dfe6f 100644 --- a/net/bridge/br_netfilter.c +++ b/net/bridge/br_netfilter.c | |||
@@ -295,7 +295,7 @@ static int check_hbh_len(struct sk_buff *skb) | |||
295 | len -= 2; | 295 | len -= 2; |
296 | 296 | ||
297 | while (len > 0) { | 297 | while (len > 0) { |
298 | int optlen = raw[off+1]+2; | 298 | int optlen = skb->nh.raw[off+1]+2; |
299 | 299 | ||
300 | switch (skb->nh.raw[off]) { | 300 | switch (skb->nh.raw[off]) { |
301 | case IPV6_TLV_PAD0: | 301 | case IPV6_TLV_PAD0: |
@@ -308,18 +308,15 @@ static int check_hbh_len(struct sk_buff *skb) | |||
308 | case IPV6_TLV_JUMBO: | 308 | case IPV6_TLV_JUMBO: |
309 | if (skb->nh.raw[off+1] != 4 || (off&3) != 2) | 309 | if (skb->nh.raw[off+1] != 4 || (off&3) != 2) |
310 | goto bad; | 310 | goto bad; |
311 | |||
312 | pkt_len = ntohl(*(u32*)(skb->nh.raw+off+2)); | 311 | pkt_len = ntohl(*(u32*)(skb->nh.raw+off+2)); |
313 | 312 | if (pkt_len <= IPV6_MAXPLEN || | |
313 | skb->nh.ipv6h->payload_len) | ||
314 | goto bad; | ||
314 | if (pkt_len > skb->len - sizeof(struct ipv6hdr)) | 315 | if (pkt_len > skb->len - sizeof(struct ipv6hdr)) |
315 | goto bad; | 316 | goto bad; |
316 | if (pkt_len + sizeof(struct ipv6hdr) < skb->len) { | 317 | if (pskb_trim_rcsum(skb, |
317 | if (__pskb_trim(skb, | 318 | pkt_len+sizeof(struct ipv6hdr))) |
318 | pkt_len + sizeof(struct ipv6hdr))) | 319 | goto bad; |
319 | goto bad; | ||
320 | if (skb->ip_summed == CHECKSUM_HW) | ||
321 | skb->ip_summed = CHECKSUM_NONE; | ||
322 | } | ||
323 | break; | 320 | break; |
324 | default: | 321 | default: |
325 | if (optlen > len) | 322 | if (optlen > len) |
diff --git a/net/core/dev.c b/net/core/dev.c index 0b48e294aafe..a5efc9ae010b 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
@@ -1113,7 +1113,8 @@ out: | |||
1113 | void netdev_rx_csum_fault(struct net_device *dev) | 1113 | void netdev_rx_csum_fault(struct net_device *dev) |
1114 | { | 1114 | { |
1115 | if (net_ratelimit()) { | 1115 | if (net_ratelimit()) { |
1116 | printk(KERN_ERR "%s: hw csum failure.\n", dev->name); | 1116 | printk(KERN_ERR "%s: hw csum failure.\n", |
1117 | dev ? dev->name : "<unknown>"); | ||
1117 | dump_stack(); | 1118 | dump_stack(); |
1118 | } | 1119 | } |
1119 | } | 1120 | } |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index b7d13a4fff48..83fee37de38e 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -1725,7 +1725,7 @@ unsigned int skb_find_text(struct sk_buff *skb, unsigned int from, | |||
1725 | * of the skb if any page alloc fails user this procedure returns -ENOMEM | 1725 | * of the skb if any page alloc fails user this procedure returns -ENOMEM |
1726 | */ | 1726 | */ |
1727 | int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, | 1727 | int skb_append_datato_frags(struct sock *sk, struct sk_buff *skb, |
1728 | int getfrag(void *from, char *to, int offset, | 1728 | int (*getfrag)(void *from, char *to, int offset, |
1729 | int len, int odd, struct sk_buff *skb), | 1729 | int len, int odd, struct sk_buff *skb), |
1730 | void *from, int length) | 1730 | void *from, int length) |
1731 | { | 1731 | { |
diff --git a/net/decnet/af_decnet.c b/net/decnet/af_decnet.c index f89e55f814d9..d402e9020c68 100644 --- a/net/decnet/af_decnet.c +++ b/net/decnet/af_decnet.c | |||
@@ -153,6 +153,7 @@ static struct proto_ops dn_proto_ops; | |||
153 | static DEFINE_RWLOCK(dn_hash_lock); | 153 | static DEFINE_RWLOCK(dn_hash_lock); |
154 | static struct hlist_head dn_sk_hash[DN_SK_HASH_SIZE]; | 154 | static struct hlist_head dn_sk_hash[DN_SK_HASH_SIZE]; |
155 | static struct hlist_head dn_wild_sk; | 155 | static struct hlist_head dn_wild_sk; |
156 | static atomic_t decnet_memory_allocated; | ||
156 | 157 | ||
157 | static int __dn_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen, int flags); | 158 | static int __dn_setsockopt(struct socket *sock, int level, int optname, char __user *optval, int optlen, int flags); |
158 | static int __dn_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen, int flags); | 159 | static int __dn_getsockopt(struct socket *sock, int level, int optname, char __user *optval, int __user *optlen, int flags); |
@@ -446,10 +447,26 @@ static void dn_destruct(struct sock *sk) | |||
446 | dst_release(xchg(&sk->sk_dst_cache, NULL)); | 447 | dst_release(xchg(&sk->sk_dst_cache, NULL)); |
447 | } | 448 | } |
448 | 449 | ||
450 | static int dn_memory_pressure; | ||
451 | |||
452 | static void dn_enter_memory_pressure(void) | ||
453 | { | ||
454 | if (!dn_memory_pressure) { | ||
455 | dn_memory_pressure = 1; | ||
456 | } | ||
457 | } | ||
458 | |||
449 | static struct proto dn_proto = { | 459 | static struct proto dn_proto = { |
450 | .name = "DECNET", | 460 | .name = "NSP", |
451 | .owner = THIS_MODULE, | 461 | .owner = THIS_MODULE, |
452 | .obj_size = sizeof(struct dn_sock), | 462 | .enter_memory_pressure = dn_enter_memory_pressure, |
463 | .memory_pressure = &dn_memory_pressure, | ||
464 | .memory_allocated = &decnet_memory_allocated, | ||
465 | .sysctl_mem = sysctl_decnet_mem, | ||
466 | .sysctl_wmem = sysctl_decnet_wmem, | ||
467 | .sysctl_rmem = sysctl_decnet_rmem, | ||
468 | .max_header = DN_MAX_NSP_DATA_HEADER + 64, | ||
469 | .obj_size = sizeof(struct dn_sock), | ||
453 | }; | 470 | }; |
454 | 471 | ||
455 | static struct sock *dn_alloc_sock(struct socket *sock, gfp_t gfp) | 472 | static struct sock *dn_alloc_sock(struct socket *sock, gfp_t gfp) |
@@ -470,6 +487,8 @@ static struct sock *dn_alloc_sock(struct socket *sock, gfp_t gfp) | |||
470 | sk->sk_family = PF_DECnet; | 487 | sk->sk_family = PF_DECnet; |
471 | sk->sk_protocol = 0; | 488 | sk->sk_protocol = 0; |
472 | sk->sk_allocation = gfp; | 489 | sk->sk_allocation = gfp; |
490 | sk->sk_sndbuf = sysctl_decnet_wmem[1]; | ||
491 | sk->sk_rcvbuf = sysctl_decnet_rmem[1]; | ||
473 | 492 | ||
474 | /* Initialization of DECnet Session Control Port */ | 493 | /* Initialization of DECnet Session Control Port */ |
475 | scp = DN_SK(sk); | 494 | scp = DN_SK(sk); |
diff --git a/net/decnet/sysctl_net_decnet.c b/net/decnet/sysctl_net_decnet.c index 02bca49cb508..0e9d2c571165 100644 --- a/net/decnet/sysctl_net_decnet.c +++ b/net/decnet/sysctl_net_decnet.c | |||
@@ -10,6 +10,7 @@ | |||
10 | * | 10 | * |
11 | * Changes: | 11 | * Changes: |
12 | * Steve Whitehouse - C99 changes and default device handling | 12 | * Steve Whitehouse - C99 changes and default device handling |
13 | * Steve Whitehouse - Memory buffer settings, like the tcp ones | ||
13 | * | 14 | * |
14 | */ | 15 | */ |
15 | #include <linux/config.h> | 16 | #include <linux/config.h> |
@@ -37,6 +38,11 @@ int decnet_dr_count = 3; | |||
37 | int decnet_log_martians = 1; | 38 | int decnet_log_martians = 1; |
38 | int decnet_no_fc_max_cwnd = NSP_MIN_WINDOW; | 39 | int decnet_no_fc_max_cwnd = NSP_MIN_WINDOW; |
39 | 40 | ||
41 | /* Reasonable defaults, I hope, based on tcp's defaults */ | ||
42 | int sysctl_decnet_mem[3] = { 768 << 3, 1024 << 3, 1536 << 3 }; | ||
43 | int sysctl_decnet_wmem[3] = { 4 * 1024, 16 * 1024, 128 * 1024 }; | ||
44 | int sysctl_decnet_rmem[3] = { 4 * 1024, 87380, 87380 * 2 }; | ||
45 | |||
40 | #ifdef CONFIG_SYSCTL | 46 | #ifdef CONFIG_SYSCTL |
41 | extern int decnet_dst_gc_interval; | 47 | extern int decnet_dst_gc_interval; |
42 | static int min_decnet_time_wait[] = { 5 }; | 48 | static int min_decnet_time_wait[] = { 5 }; |
@@ -428,6 +434,33 @@ static ctl_table dn_table[] = { | |||
428 | .extra1 = &min_decnet_no_fc_max_cwnd, | 434 | .extra1 = &min_decnet_no_fc_max_cwnd, |
429 | .extra2 = &max_decnet_no_fc_max_cwnd | 435 | .extra2 = &max_decnet_no_fc_max_cwnd |
430 | }, | 436 | }, |
437 | { | ||
438 | .ctl_name = NET_DECNET_MEM, | ||
439 | .procname = "decnet_mem", | ||
440 | .data = &sysctl_decnet_mem, | ||
441 | .maxlen = sizeof(sysctl_decnet_mem), | ||
442 | .mode = 0644, | ||
443 | .proc_handler = &proc_dointvec, | ||
444 | .strategy = &sysctl_intvec, | ||
445 | }, | ||
446 | { | ||
447 | .ctl_name = NET_DECNET_RMEM, | ||
448 | .procname = "decnet_rmem", | ||
449 | .data = &sysctl_decnet_rmem, | ||
450 | .maxlen = sizeof(sysctl_decnet_rmem), | ||
451 | .mode = 0644, | ||
452 | .proc_handler = &proc_dointvec, | ||
453 | .strategy = &sysctl_intvec, | ||
454 | }, | ||
455 | { | ||
456 | .ctl_name = NET_DECNET_WMEM, | ||
457 | .procname = "decnet_wmem", | ||
458 | .data = &sysctl_decnet_wmem, | ||
459 | .maxlen = sizeof(sysctl_decnet_wmem), | ||
460 | .mode = 0644, | ||
461 | .proc_handler = &proc_dointvec, | ||
462 | .strategy = &sysctl_intvec, | ||
463 | }, | ||
431 | { | 464 | { |
432 | .ctl_name = NET_DECNET_DEBUG_LEVEL, | 465 | .ctl_name = NET_DECNET_DEBUG_LEVEL, |
433 | .procname = "debug", | 466 | .procname = "debug", |
diff --git a/net/ieee80211/Kconfig b/net/ieee80211/Kconfig index 91b16fbf91f0..d18ccba3ea9e 100644 --- a/net/ieee80211/Kconfig +++ b/net/ieee80211/Kconfig | |||
@@ -55,7 +55,7 @@ config IEEE80211_CRYPT_CCMP | |||
55 | 55 | ||
56 | config IEEE80211_CRYPT_TKIP | 56 | config IEEE80211_CRYPT_TKIP |
57 | tristate "IEEE 802.11i TKIP encryption" | 57 | tristate "IEEE 802.11i TKIP encryption" |
58 | depends on IEEE80211 | 58 | depends on IEEE80211 && NET_RADIO |
59 | select CRYPTO | 59 | select CRYPTO |
60 | select CRYPTO_MICHAEL_MIC | 60 | select CRYPTO_MICHAEL_MIC |
61 | ---help--- | 61 | ---help--- |
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index a4c347c3b8e3..46f9d9cf7a5f 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c | |||
@@ -618,7 +618,7 @@ static int ipgre_rcv(struct sk_buff *skb) | |||
618 | 618 | ||
619 | skb->mac.raw = skb->nh.raw; | 619 | skb->mac.raw = skb->nh.raw; |
620 | skb->nh.raw = __pskb_pull(skb, offset); | 620 | skb->nh.raw = __pskb_pull(skb, offset); |
621 | skb_postpull_rcsum(skb, skb->mac.raw, offset); | 621 | skb_postpull_rcsum(skb, skb->h.raw, offset); |
622 | memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options)); | 622 | memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options)); |
623 | skb->pkt_type = PACKET_HOST; | 623 | skb->pkt_type = PACKET_HOST; |
624 | #ifdef CONFIG_NET_IPGRE_BROADCAST | 624 | #ifdef CONFIG_NET_IPGRE_BROADCAST |
diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig index 0bc00528d888..88a60650e6b8 100644 --- a/net/ipv4/netfilter/Kconfig +++ b/net/ipv4/netfilter/Kconfig | |||
@@ -56,8 +56,8 @@ config IP_NF_CONNTRACK_MARK | |||
56 | instead of the individual packets. | 56 | instead of the individual packets. |
57 | 57 | ||
58 | config IP_NF_CONNTRACK_EVENTS | 58 | config IP_NF_CONNTRACK_EVENTS |
59 | bool "Connection tracking events" | 59 | bool "Connection tracking events (EXPERIMENTAL)" |
60 | depends on IP_NF_CONNTRACK | 60 | depends on EXPERIMENTAL && IP_NF_CONNTRACK |
61 | help | 61 | help |
62 | If this option is enabled, the connection tracking code will | 62 | If this option is enabled, the connection tracking code will |
63 | provide a notifier chain that can be used by other kernel code | 63 | provide a notifier chain that can be used by other kernel code |
@@ -66,8 +66,8 @@ config IP_NF_CONNTRACK_EVENTS | |||
66 | IF unsure, say `N'. | 66 | IF unsure, say `N'. |
67 | 67 | ||
68 | config IP_NF_CONNTRACK_NETLINK | 68 | config IP_NF_CONNTRACK_NETLINK |
69 | tristate 'Connection tracking netlink interface' | 69 | tristate 'Connection tracking netlink interface (EXPERIMENTAL)' |
70 | depends on IP_NF_CONNTRACK && NETFILTER_NETLINK | 70 | depends on EXPERIMENTAL && IP_NF_CONNTRACK && NETFILTER_NETLINK |
71 | depends on IP_NF_CONNTRACK!=y || NETFILTER_NETLINK!=m | 71 | depends on IP_NF_CONNTRACK!=y || NETFILTER_NETLINK!=m |
72 | help | 72 | help |
73 | This option enables support for a netlink-based userspace interface | 73 | This option enables support for a netlink-based userspace interface |
diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile index 058c48e258fc..d0a447e520a2 100644 --- a/net/ipv4/netfilter/Makefile +++ b/net/ipv4/netfilter/Makefile | |||
@@ -12,6 +12,7 @@ ip_nat_pptp-objs := ip_nat_helper_pptp.o ip_nat_proto_gre.o | |||
12 | 12 | ||
13 | # connection tracking | 13 | # connection tracking |
14 | obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o | 14 | obj-$(CONFIG_IP_NF_CONNTRACK) += ip_conntrack.o |
15 | obj-$(CONFIG_IP_NF_NAT) += ip_nat.o | ||
15 | 16 | ||
16 | # conntrack netlink interface | 17 | # conntrack netlink interface |
17 | obj-$(CONFIG_IP_NF_CONNTRACK_NETLINK) += ip_conntrack_netlink.o | 18 | obj-$(CONFIG_IP_NF_CONNTRACK_NETLINK) += ip_conntrack_netlink.o |
@@ -41,7 +42,7 @@ obj-$(CONFIG_IP_NF_IPTABLES) += ip_tables.o | |||
41 | # the three instances of ip_tables | 42 | # the three instances of ip_tables |
42 | obj-$(CONFIG_IP_NF_FILTER) += iptable_filter.o | 43 | obj-$(CONFIG_IP_NF_FILTER) += iptable_filter.o |
43 | obj-$(CONFIG_IP_NF_MANGLE) += iptable_mangle.o | 44 | obj-$(CONFIG_IP_NF_MANGLE) += iptable_mangle.o |
44 | obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o ip_nat.o | 45 | obj-$(CONFIG_IP_NF_NAT) += iptable_nat.o |
45 | obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o | 46 | obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o |
46 | 47 | ||
47 | # matches | 48 | # matches |
diff --git a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c index 7a4ecddd597b..84c66dbfedaf 100644 --- a/net/ipv4/netfilter/ip_conntrack_core.c +++ b/net/ipv4/netfilter/ip_conntrack_core.c | |||
@@ -1345,6 +1345,11 @@ static int kill_all(struct ip_conntrack *i, void *data) | |||
1345 | return 1; | 1345 | return 1; |
1346 | } | 1346 | } |
1347 | 1347 | ||
1348 | void ip_conntrack_flush(void) | ||
1349 | { | ||
1350 | ip_ct_iterate_cleanup(kill_all, NULL); | ||
1351 | } | ||
1352 | |||
1348 | static void free_conntrack_hash(struct list_head *hash, int vmalloced,int size) | 1353 | static void free_conntrack_hash(struct list_head *hash, int vmalloced,int size) |
1349 | { | 1354 | { |
1350 | if (vmalloced) | 1355 | if (vmalloced) |
@@ -1354,8 +1359,12 @@ static void free_conntrack_hash(struct list_head *hash, int vmalloced,int size) | |||
1354 | get_order(sizeof(struct list_head) * size)); | 1359 | get_order(sizeof(struct list_head) * size)); |
1355 | } | 1360 | } |
1356 | 1361 | ||
1357 | void ip_conntrack_flush(void) | 1362 | /* Mishearing the voices in his head, our hero wonders how he's |
1363 | supposed to kill the mall. */ | ||
1364 | void ip_conntrack_cleanup(void) | ||
1358 | { | 1365 | { |
1366 | ip_ct_attach = NULL; | ||
1367 | |||
1359 | /* This makes sure all current packets have passed through | 1368 | /* This makes sure all current packets have passed through |
1360 | netfilter framework. Roll on, two-stage module | 1369 | netfilter framework. Roll on, two-stage module |
1361 | delete... */ | 1370 | delete... */ |
@@ -1363,7 +1372,7 @@ void ip_conntrack_flush(void) | |||
1363 | 1372 | ||
1364 | ip_ct_event_cache_flush(); | 1373 | ip_ct_event_cache_flush(); |
1365 | i_see_dead_people: | 1374 | i_see_dead_people: |
1366 | ip_ct_iterate_cleanup(kill_all, NULL); | 1375 | ip_conntrack_flush(); |
1367 | if (atomic_read(&ip_conntrack_count) != 0) { | 1376 | if (atomic_read(&ip_conntrack_count) != 0) { |
1368 | schedule(); | 1377 | schedule(); |
1369 | goto i_see_dead_people; | 1378 | goto i_see_dead_people; |
@@ -1371,14 +1380,7 @@ void ip_conntrack_flush(void) | |||
1371 | /* wait until all references to ip_conntrack_untracked are dropped */ | 1380 | /* wait until all references to ip_conntrack_untracked are dropped */ |
1372 | while (atomic_read(&ip_conntrack_untracked.ct_general.use) > 1) | 1381 | while (atomic_read(&ip_conntrack_untracked.ct_general.use) > 1) |
1373 | schedule(); | 1382 | schedule(); |
1374 | } | ||
1375 | 1383 | ||
1376 | /* Mishearing the voices in his head, our hero wonders how he's | ||
1377 | supposed to kill the mall. */ | ||
1378 | void ip_conntrack_cleanup(void) | ||
1379 | { | ||
1380 | ip_ct_attach = NULL; | ||
1381 | ip_conntrack_flush(); | ||
1382 | kmem_cache_destroy(ip_conntrack_cachep); | 1384 | kmem_cache_destroy(ip_conntrack_cachep); |
1383 | kmem_cache_destroy(ip_conntrack_expect_cachep); | 1385 | kmem_cache_destroy(ip_conntrack_expect_cachep); |
1384 | free_conntrack_hash(ip_conntrack_hash, ip_conntrack_vmalloc, | 1386 | free_conntrack_hash(ip_conntrack_hash, ip_conntrack_vmalloc, |
diff --git a/net/ipv4/netfilter/ip_conntrack_netlink.c b/net/ipv4/netfilter/ip_conntrack_netlink.c index 3fce91bcc0ba..91fe8f2e38ff 100644 --- a/net/ipv4/netfilter/ip_conntrack_netlink.c +++ b/net/ipv4/netfilter/ip_conntrack_netlink.c | |||
@@ -503,7 +503,7 @@ ctnetlink_parse_tuple_ip(struct nfattr *attr, struct ip_conntrack_tuple *tuple) | |||
503 | } | 503 | } |
504 | 504 | ||
505 | static const size_t cta_min_proto[CTA_PROTO_MAX] = { | 505 | static const size_t cta_min_proto[CTA_PROTO_MAX] = { |
506 | [CTA_PROTO_NUM-1] = sizeof(u_int16_t), | 506 | [CTA_PROTO_NUM-1] = sizeof(u_int8_t), |
507 | [CTA_PROTO_SRC_PORT-1] = sizeof(u_int16_t), | 507 | [CTA_PROTO_SRC_PORT-1] = sizeof(u_int16_t), |
508 | [CTA_PROTO_DST_PORT-1] = sizeof(u_int16_t), | 508 | [CTA_PROTO_DST_PORT-1] = sizeof(u_int16_t), |
509 | [CTA_PROTO_ICMP_TYPE-1] = sizeof(u_int8_t), | 509 | [CTA_PROTO_ICMP_TYPE-1] = sizeof(u_int8_t), |
@@ -528,7 +528,7 @@ ctnetlink_parse_tuple_proto(struct nfattr *attr, | |||
528 | 528 | ||
529 | if (!tb[CTA_PROTO_NUM-1]) | 529 | if (!tb[CTA_PROTO_NUM-1]) |
530 | return -EINVAL; | 530 | return -EINVAL; |
531 | tuple->dst.protonum = *(u_int16_t *)NFA_DATA(tb[CTA_PROTO_NUM-1]); | 531 | tuple->dst.protonum = *(u_int8_t *)NFA_DATA(tb[CTA_PROTO_NUM-1]); |
532 | 532 | ||
533 | proto = ip_conntrack_proto_find_get(tuple->dst.protonum); | 533 | proto = ip_conntrack_proto_find_get(tuple->dst.protonum); |
534 | 534 | ||
@@ -728,11 +728,9 @@ ctnetlink_del_conntrack(struct sock *ctnl, struct sk_buff *skb, | |||
728 | return -ENOENT; | 728 | return -ENOENT; |
729 | } | 729 | } |
730 | } | 730 | } |
731 | if (del_timer(&ct->timeout)) { | 731 | if (del_timer(&ct->timeout)) |
732 | ip_conntrack_put(ct); | ||
733 | ct->timeout.function((unsigned long)ct); | 732 | ct->timeout.function((unsigned long)ct); |
734 | return 0; | 733 | |
735 | } | ||
736 | ip_conntrack_put(ct); | 734 | ip_conntrack_put(ct); |
737 | DEBUGP("leaving\n"); | 735 | DEBUGP("leaving\n"); |
738 | 736 | ||
@@ -877,7 +875,7 @@ ctnetlink_change_status(struct ip_conntrack *ct, struct nfattr *cda[]) | |||
877 | DEBUGP("NAT status: %lu\n", | 875 | DEBUGP("NAT status: %lu\n", |
878 | status & (IPS_NAT_MASK | IPS_NAT_DONE_MASK)); | 876 | status & (IPS_NAT_MASK | IPS_NAT_DONE_MASK)); |
879 | 877 | ||
880 | if (ip_nat_initialized(ct, hooknum)) | 878 | if (ip_nat_initialized(ct, HOOK2MANIP(hooknum))) |
881 | return -EEXIST; | 879 | return -EEXIST; |
882 | ip_nat_setup_info(ct, &range, hooknum); | 880 | ip_nat_setup_info(ct, &range, hooknum); |
883 | 881 | ||
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c index aeb7353d4777..e7fa29e576dc 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_tcp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_tcp.c | |||
@@ -341,9 +341,10 @@ static int tcp_print_conntrack(struct seq_file *s, | |||
341 | static int tcp_to_nfattr(struct sk_buff *skb, struct nfattr *nfa, | 341 | static int tcp_to_nfattr(struct sk_buff *skb, struct nfattr *nfa, |
342 | const struct ip_conntrack *ct) | 342 | const struct ip_conntrack *ct) |
343 | { | 343 | { |
344 | struct nfattr *nest_parms = NFA_NEST(skb, CTA_PROTOINFO_TCP); | 344 | struct nfattr *nest_parms; |
345 | 345 | ||
346 | read_lock_bh(&tcp_lock); | 346 | read_lock_bh(&tcp_lock); |
347 | nest_parms = NFA_NEST(skb, CTA_PROTOINFO_TCP); | ||
347 | NFA_PUT(skb, CTA_PROTOINFO_TCP_STATE, sizeof(u_int8_t), | 348 | NFA_PUT(skb, CTA_PROTOINFO_TCP_STATE, sizeof(u_int8_t), |
348 | &ct->proto.tcp.state); | 349 | &ct->proto.tcp.state); |
349 | read_unlock_bh(&tcp_lock); | 350 | read_unlock_bh(&tcp_lock); |
diff --git a/net/ipv4/netfilter/ip_nat_tftp.c b/net/ipv4/netfilter/ip_nat_tftp.c index 2215317c76b7..43c3bd7c118e 100644 --- a/net/ipv4/netfilter/ip_nat_tftp.c +++ b/net/ipv4/netfilter/ip_nat_tftp.c | |||
@@ -42,7 +42,10 @@ static unsigned int help(struct sk_buff **pskb, | |||
42 | enum ip_conntrack_info ctinfo, | 42 | enum ip_conntrack_info ctinfo, |
43 | struct ip_conntrack_expect *exp) | 43 | struct ip_conntrack_expect *exp) |
44 | { | 44 | { |
45 | exp->saved_proto.udp.port = exp->tuple.dst.u.tcp.port; | 45 | struct ip_conntrack *ct = exp->master; |
46 | |||
47 | exp->saved_proto.udp.port | ||
48 | = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.u.udp.port; | ||
46 | exp->dir = IP_CT_DIR_REPLY; | 49 | exp->dir = IP_CT_DIR_REPLY; |
47 | exp->expectfn = ip_nat_follow_master; | 50 | exp->expectfn = ip_nat_follow_master; |
48 | if (ip_conntrack_expect_related(exp) != 0) | 51 | if (ip_conntrack_expect_related(exp) != 0) |
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 029c70dfb585..b7325e0b406a 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c | |||
@@ -262,122 +262,139 @@ static __inline__ u16 tcp_select_window(struct sock *sk) | |||
262 | * We are working here with either a clone of the original | 262 | * We are working here with either a clone of the original |
263 | * SKB, or a fresh unique copy made by the retransmit engine. | 263 | * SKB, or a fresh unique copy made by the retransmit engine. |
264 | */ | 264 | */ |
265 | static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb) | 265 | static int tcp_transmit_skb(struct sock *sk, struct sk_buff *skb, int clone_it, gfp_t gfp_mask) |
266 | { | 266 | { |
267 | if (skb != NULL) { | 267 | const struct inet_connection_sock *icsk = inet_csk(sk); |
268 | const struct inet_connection_sock *icsk = inet_csk(sk); | 268 | struct inet_sock *inet; |
269 | struct inet_sock *inet = inet_sk(sk); | 269 | struct tcp_sock *tp; |
270 | struct tcp_sock *tp = tcp_sk(sk); | 270 | struct tcp_skb_cb *tcb; |
271 | struct tcp_skb_cb *tcb = TCP_SKB_CB(skb); | 271 | int tcp_header_size; |
272 | int tcp_header_size = tp->tcp_header_len; | 272 | struct tcphdr *th; |
273 | struct tcphdr *th; | 273 | int sysctl_flags; |
274 | int sysctl_flags; | 274 | int err; |
275 | int err; | 275 | |
276 | BUG_ON(!skb || !tcp_skb_pcount(skb)); | ||
277 | |||
278 | /* If congestion control is doing timestamping, we must | ||
279 | * take such a timestamp before we potentially clone/copy. | ||
280 | */ | ||
281 | if (icsk->icsk_ca_ops->rtt_sample) | ||
282 | __net_timestamp(skb); | ||
283 | |||
284 | if (likely(clone_it)) { | ||
285 | if (unlikely(skb_cloned(skb))) | ||
286 | skb = pskb_copy(skb, gfp_mask); | ||
287 | else | ||
288 | skb = skb_clone(skb, gfp_mask); | ||
289 | if (unlikely(!skb)) | ||
290 | return -ENOBUFS; | ||
291 | } | ||
276 | 292 | ||
277 | BUG_ON(!tcp_skb_pcount(skb)); | 293 | inet = inet_sk(sk); |
294 | tp = tcp_sk(sk); | ||
295 | tcb = TCP_SKB_CB(skb); | ||
296 | tcp_header_size = tp->tcp_header_len; | ||
278 | 297 | ||
279 | #define SYSCTL_FLAG_TSTAMPS 0x1 | 298 | #define SYSCTL_FLAG_TSTAMPS 0x1 |
280 | #define SYSCTL_FLAG_WSCALE 0x2 | 299 | #define SYSCTL_FLAG_WSCALE 0x2 |
281 | #define SYSCTL_FLAG_SACK 0x4 | 300 | #define SYSCTL_FLAG_SACK 0x4 |
282 | 301 | ||
283 | /* If congestion control is doing timestamping */ | 302 | sysctl_flags = 0; |
284 | if (icsk->icsk_ca_ops->rtt_sample) | 303 | if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) { |
285 | __net_timestamp(skb); | 304 | tcp_header_size = sizeof(struct tcphdr) + TCPOLEN_MSS; |
286 | 305 | if(sysctl_tcp_timestamps) { | |
287 | sysctl_flags = 0; | 306 | tcp_header_size += TCPOLEN_TSTAMP_ALIGNED; |
288 | if (tcb->flags & TCPCB_FLAG_SYN) { | 307 | sysctl_flags |= SYSCTL_FLAG_TSTAMPS; |
289 | tcp_header_size = sizeof(struct tcphdr) + TCPOLEN_MSS; | ||
290 | if(sysctl_tcp_timestamps) { | ||
291 | tcp_header_size += TCPOLEN_TSTAMP_ALIGNED; | ||
292 | sysctl_flags |= SYSCTL_FLAG_TSTAMPS; | ||
293 | } | ||
294 | if(sysctl_tcp_window_scaling) { | ||
295 | tcp_header_size += TCPOLEN_WSCALE_ALIGNED; | ||
296 | sysctl_flags |= SYSCTL_FLAG_WSCALE; | ||
297 | } | ||
298 | if(sysctl_tcp_sack) { | ||
299 | sysctl_flags |= SYSCTL_FLAG_SACK; | ||
300 | if(!(sysctl_flags & SYSCTL_FLAG_TSTAMPS)) | ||
301 | tcp_header_size += TCPOLEN_SACKPERM_ALIGNED; | ||
302 | } | ||
303 | } else if (tp->rx_opt.eff_sacks) { | ||
304 | /* A SACK is 2 pad bytes, a 2 byte header, plus | ||
305 | * 2 32-bit sequence numbers for each SACK block. | ||
306 | */ | ||
307 | tcp_header_size += (TCPOLEN_SACK_BASE_ALIGNED + | ||
308 | (tp->rx_opt.eff_sacks * TCPOLEN_SACK_PERBLOCK)); | ||
309 | } | 308 | } |
310 | 309 | if (sysctl_tcp_window_scaling) { | |
311 | if (tcp_packets_in_flight(tp) == 0) | 310 | tcp_header_size += TCPOLEN_WSCALE_ALIGNED; |
312 | tcp_ca_event(sk, CA_EVENT_TX_START); | 311 | sysctl_flags |= SYSCTL_FLAG_WSCALE; |
313 | |||
314 | th = (struct tcphdr *) skb_push(skb, tcp_header_size); | ||
315 | skb->h.th = th; | ||
316 | skb_set_owner_w(skb, sk); | ||
317 | |||
318 | /* Build TCP header and checksum it. */ | ||
319 | th->source = inet->sport; | ||
320 | th->dest = inet->dport; | ||
321 | th->seq = htonl(tcb->seq); | ||
322 | th->ack_seq = htonl(tp->rcv_nxt); | ||
323 | *(((__u16 *)th) + 6) = htons(((tcp_header_size >> 2) << 12) | tcb->flags); | ||
324 | if (tcb->flags & TCPCB_FLAG_SYN) { | ||
325 | /* RFC1323: The window in SYN & SYN/ACK segments | ||
326 | * is never scaled. | ||
327 | */ | ||
328 | th->window = htons(tp->rcv_wnd); | ||
329 | } else { | ||
330 | th->window = htons(tcp_select_window(sk)); | ||
331 | } | 312 | } |
332 | th->check = 0; | 313 | if (sysctl_tcp_sack) { |
333 | th->urg_ptr = 0; | 314 | sysctl_flags |= SYSCTL_FLAG_SACK; |
334 | 315 | if (!(sysctl_flags & SYSCTL_FLAG_TSTAMPS)) | |
335 | if (tp->urg_mode && | 316 | tcp_header_size += TCPOLEN_SACKPERM_ALIGNED; |
336 | between(tp->snd_up, tcb->seq+1, tcb->seq+0xFFFF)) { | ||
337 | th->urg_ptr = htons(tp->snd_up-tcb->seq); | ||
338 | th->urg = 1; | ||
339 | } | 317 | } |
318 | } else if (unlikely(tp->rx_opt.eff_sacks)) { | ||
319 | /* A SACK is 2 pad bytes, a 2 byte header, plus | ||
320 | * 2 32-bit sequence numbers for each SACK block. | ||
321 | */ | ||
322 | tcp_header_size += (TCPOLEN_SACK_BASE_ALIGNED + | ||
323 | (tp->rx_opt.eff_sacks * | ||
324 | TCPOLEN_SACK_PERBLOCK)); | ||
325 | } | ||
326 | |||
327 | if (tcp_packets_in_flight(tp) == 0) | ||
328 | tcp_ca_event(sk, CA_EVENT_TX_START); | ||
329 | |||
330 | th = (struct tcphdr *) skb_push(skb, tcp_header_size); | ||
331 | skb->h.th = th; | ||
332 | skb_set_owner_w(skb, sk); | ||
333 | |||
334 | /* Build TCP header and checksum it. */ | ||
335 | th->source = inet->sport; | ||
336 | th->dest = inet->dport; | ||
337 | th->seq = htonl(tcb->seq); | ||
338 | th->ack_seq = htonl(tp->rcv_nxt); | ||
339 | *(((__u16 *)th) + 6) = htons(((tcp_header_size >> 2) << 12) | | ||
340 | tcb->flags); | ||
341 | |||
342 | if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) { | ||
343 | /* RFC1323: The window in SYN & SYN/ACK segments | ||
344 | * is never scaled. | ||
345 | */ | ||
346 | th->window = htons(tp->rcv_wnd); | ||
347 | } else { | ||
348 | th->window = htons(tcp_select_window(sk)); | ||
349 | } | ||
350 | th->check = 0; | ||
351 | th->urg_ptr = 0; | ||
340 | 352 | ||
341 | if (tcb->flags & TCPCB_FLAG_SYN) { | 353 | if (unlikely(tp->urg_mode && |
342 | tcp_syn_build_options((__u32 *)(th + 1), | 354 | between(tp->snd_up, tcb->seq+1, tcb->seq+0xFFFF))) { |
343 | tcp_advertise_mss(sk), | 355 | th->urg_ptr = htons(tp->snd_up-tcb->seq); |
344 | (sysctl_flags & SYSCTL_FLAG_TSTAMPS), | 356 | th->urg = 1; |
345 | (sysctl_flags & SYSCTL_FLAG_SACK), | 357 | } |
346 | (sysctl_flags & SYSCTL_FLAG_WSCALE), | ||
347 | tp->rx_opt.rcv_wscale, | ||
348 | tcb->when, | ||
349 | tp->rx_opt.ts_recent); | ||
350 | } else { | ||
351 | tcp_build_and_update_options((__u32 *)(th + 1), | ||
352 | tp, tcb->when); | ||
353 | 358 | ||
354 | TCP_ECN_send(sk, tp, skb, tcp_header_size); | 359 | if (unlikely(tcb->flags & TCPCB_FLAG_SYN)) { |
355 | } | 360 | tcp_syn_build_options((__u32 *)(th + 1), |
356 | tp->af_specific->send_check(sk, th, skb->len, skb); | 361 | tcp_advertise_mss(sk), |
362 | (sysctl_flags & SYSCTL_FLAG_TSTAMPS), | ||
363 | (sysctl_flags & SYSCTL_FLAG_SACK), | ||
364 | (sysctl_flags & SYSCTL_FLAG_WSCALE), | ||
365 | tp->rx_opt.rcv_wscale, | ||
366 | tcb->when, | ||
367 | tp->rx_opt.ts_recent); | ||
368 | } else { | ||
369 | tcp_build_and_update_options((__u32 *)(th + 1), | ||
370 | tp, tcb->when); | ||
371 | TCP_ECN_send(sk, tp, skb, tcp_header_size); | ||
372 | } | ||
357 | 373 | ||
358 | if (tcb->flags & TCPCB_FLAG_ACK) | 374 | tp->af_specific->send_check(sk, th, skb->len, skb); |
359 | tcp_event_ack_sent(sk, tcp_skb_pcount(skb)); | ||
360 | 375 | ||
361 | if (skb->len != tcp_header_size) | 376 | if (likely(tcb->flags & TCPCB_FLAG_ACK)) |
362 | tcp_event_data_sent(tp, skb, sk); | 377 | tcp_event_ack_sent(sk, tcp_skb_pcount(skb)); |
363 | 378 | ||
364 | TCP_INC_STATS(TCP_MIB_OUTSEGS); | 379 | if (skb->len != tcp_header_size) |
380 | tcp_event_data_sent(tp, skb, sk); | ||
365 | 381 | ||
366 | err = tp->af_specific->queue_xmit(skb, 0); | 382 | TCP_INC_STATS(TCP_MIB_OUTSEGS); |
367 | if (err <= 0) | ||
368 | return err; | ||
369 | 383 | ||
370 | tcp_enter_cwr(sk); | 384 | err = tp->af_specific->queue_xmit(skb, 0); |
385 | if (unlikely(err <= 0)) | ||
386 | return err; | ||
387 | |||
388 | tcp_enter_cwr(sk); | ||
389 | |||
390 | /* NET_XMIT_CN is special. It does not guarantee, | ||
391 | * that this packet is lost. It tells that device | ||
392 | * is about to start to drop packets or already | ||
393 | * drops some packets of the same priority and | ||
394 | * invokes us to send less aggressively. | ||
395 | */ | ||
396 | return err == NET_XMIT_CN ? 0 : err; | ||
371 | 397 | ||
372 | /* NET_XMIT_CN is special. It does not guarantee, | ||
373 | * that this packet is lost. It tells that device | ||
374 | * is about to start to drop packets or already | ||
375 | * drops some packets of the same priority and | ||
376 | * invokes us to send less aggressively. | ||
377 | */ | ||
378 | return err == NET_XMIT_CN ? 0 : err; | ||
379 | } | ||
380 | return -ENOBUFS; | ||
381 | #undef SYSCTL_FLAG_TSTAMPS | 398 | #undef SYSCTL_FLAG_TSTAMPS |
382 | #undef SYSCTL_FLAG_WSCALE | 399 | #undef SYSCTL_FLAG_WSCALE |
383 | #undef SYSCTL_FLAG_SACK | 400 | #undef SYSCTL_FLAG_SACK |
@@ -1036,7 +1053,7 @@ static int tcp_write_xmit(struct sock *sk, unsigned int mss_now, int nonagle) | |||
1036 | 1053 | ||
1037 | TCP_SKB_CB(skb)->when = tcp_time_stamp; | 1054 | TCP_SKB_CB(skb)->when = tcp_time_stamp; |
1038 | 1055 | ||
1039 | if (unlikely(tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC)))) | 1056 | if (unlikely(tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC))) |
1040 | break; | 1057 | break; |
1041 | 1058 | ||
1042 | /* Advance the send_head. This one is sent out. | 1059 | /* Advance the send_head. This one is sent out. |
@@ -1109,7 +1126,7 @@ void tcp_push_one(struct sock *sk, unsigned int mss_now) | |||
1109 | /* Send it out now. */ | 1126 | /* Send it out now. */ |
1110 | TCP_SKB_CB(skb)->when = tcp_time_stamp; | 1127 | TCP_SKB_CB(skb)->when = tcp_time_stamp; |
1111 | 1128 | ||
1112 | if (likely(!tcp_transmit_skb(sk, skb_clone(skb, sk->sk_allocation)))) { | 1129 | if (likely(!tcp_transmit_skb(sk, skb, 1, sk->sk_allocation))) { |
1113 | update_send_head(sk, tp, skb); | 1130 | update_send_head(sk, tp, skb); |
1114 | tcp_cwnd_validate(sk, tp); | 1131 | tcp_cwnd_validate(sk, tp); |
1115 | return; | 1132 | return; |
@@ -1429,9 +1446,7 @@ int tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb) | |||
1429 | */ | 1446 | */ |
1430 | TCP_SKB_CB(skb)->when = tcp_time_stamp; | 1447 | TCP_SKB_CB(skb)->when = tcp_time_stamp; |
1431 | 1448 | ||
1432 | err = tcp_transmit_skb(sk, (skb_cloned(skb) ? | 1449 | err = tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC); |
1433 | pskb_copy(skb, GFP_ATOMIC): | ||
1434 | skb_clone(skb, GFP_ATOMIC))); | ||
1435 | 1450 | ||
1436 | if (err == 0) { | 1451 | if (err == 0) { |
1437 | /* Update global TCP statistics. */ | 1452 | /* Update global TCP statistics. */ |
@@ -1665,7 +1680,7 @@ void tcp_send_active_reset(struct sock *sk, gfp_t priority) | |||
1665 | TCP_SKB_CB(skb)->seq = tcp_acceptable_seq(sk, tp); | 1680 | TCP_SKB_CB(skb)->seq = tcp_acceptable_seq(sk, tp); |
1666 | TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq; | 1681 | TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq; |
1667 | TCP_SKB_CB(skb)->when = tcp_time_stamp; | 1682 | TCP_SKB_CB(skb)->when = tcp_time_stamp; |
1668 | if (tcp_transmit_skb(sk, skb)) | 1683 | if (tcp_transmit_skb(sk, skb, 0, priority)) |
1669 | NET_INC_STATS(LINUX_MIB_TCPABORTFAILED); | 1684 | NET_INC_STATS(LINUX_MIB_TCPABORTFAILED); |
1670 | } | 1685 | } |
1671 | 1686 | ||
@@ -1700,7 +1715,7 @@ int tcp_send_synack(struct sock *sk) | |||
1700 | TCP_ECN_send_synack(tcp_sk(sk), skb); | 1715 | TCP_ECN_send_synack(tcp_sk(sk), skb); |
1701 | } | 1716 | } |
1702 | TCP_SKB_CB(skb)->when = tcp_time_stamp; | 1717 | TCP_SKB_CB(skb)->when = tcp_time_stamp; |
1703 | return tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC)); | 1718 | return tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC); |
1704 | } | 1719 | } |
1705 | 1720 | ||
1706 | /* | 1721 | /* |
@@ -1861,7 +1876,7 @@ int tcp_connect(struct sock *sk) | |||
1861 | __skb_queue_tail(&sk->sk_write_queue, buff); | 1876 | __skb_queue_tail(&sk->sk_write_queue, buff); |
1862 | sk_charge_skb(sk, buff); | 1877 | sk_charge_skb(sk, buff); |
1863 | tp->packets_out += tcp_skb_pcount(buff); | 1878 | tp->packets_out += tcp_skb_pcount(buff); |
1864 | tcp_transmit_skb(sk, skb_clone(buff, GFP_KERNEL)); | 1879 | tcp_transmit_skb(sk, buff, 1, GFP_KERNEL); |
1865 | TCP_INC_STATS(TCP_MIB_ACTIVEOPENS); | 1880 | TCP_INC_STATS(TCP_MIB_ACTIVEOPENS); |
1866 | 1881 | ||
1867 | /* Timer for repeating the SYN until an answer. */ | 1882 | /* Timer for repeating the SYN until an answer. */ |
@@ -1957,7 +1972,7 @@ void tcp_send_ack(struct sock *sk) | |||
1957 | /* Send it off, this clears delayed acks for us. */ | 1972 | /* Send it off, this clears delayed acks for us. */ |
1958 | TCP_SKB_CB(buff)->seq = TCP_SKB_CB(buff)->end_seq = tcp_acceptable_seq(sk, tp); | 1973 | TCP_SKB_CB(buff)->seq = TCP_SKB_CB(buff)->end_seq = tcp_acceptable_seq(sk, tp); |
1959 | TCP_SKB_CB(buff)->when = tcp_time_stamp; | 1974 | TCP_SKB_CB(buff)->when = tcp_time_stamp; |
1960 | tcp_transmit_skb(sk, buff); | 1975 | tcp_transmit_skb(sk, buff, 0, GFP_ATOMIC); |
1961 | } | 1976 | } |
1962 | } | 1977 | } |
1963 | 1978 | ||
@@ -1997,7 +2012,7 @@ static int tcp_xmit_probe_skb(struct sock *sk, int urgent) | |||
1997 | TCP_SKB_CB(skb)->seq = urgent ? tp->snd_una : tp->snd_una - 1; | 2012 | TCP_SKB_CB(skb)->seq = urgent ? tp->snd_una : tp->snd_una - 1; |
1998 | TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq; | 2013 | TCP_SKB_CB(skb)->end_seq = TCP_SKB_CB(skb)->seq; |
1999 | TCP_SKB_CB(skb)->when = tcp_time_stamp; | 2014 | TCP_SKB_CB(skb)->when = tcp_time_stamp; |
2000 | return tcp_transmit_skb(sk, skb); | 2015 | return tcp_transmit_skb(sk, skb, 0, GFP_ATOMIC); |
2001 | } | 2016 | } |
2002 | 2017 | ||
2003 | int tcp_write_wakeup(struct sock *sk) | 2018 | int tcp_write_wakeup(struct sock *sk) |
@@ -2030,7 +2045,7 @@ int tcp_write_wakeup(struct sock *sk) | |||
2030 | 2045 | ||
2031 | TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_PSH; | 2046 | TCP_SKB_CB(skb)->flags |= TCPCB_FLAG_PSH; |
2032 | TCP_SKB_CB(skb)->when = tcp_time_stamp; | 2047 | TCP_SKB_CB(skb)->when = tcp_time_stamp; |
2033 | err = tcp_transmit_skb(sk, skb_clone(skb, GFP_ATOMIC)); | 2048 | err = tcp_transmit_skb(sk, skb, 1, GFP_ATOMIC); |
2034 | if (!err) { | 2049 | if (!err) { |
2035 | update_send_head(sk, tp, skb); | 2050 | update_send_head(sk, tp, skb); |
2036 | } | 2051 | } |
diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c index b7d296a8ac6d..13e7e6e8df16 100644 --- a/net/ipv4/tcp_vegas.c +++ b/net/ipv4/tcp_vegas.c | |||
@@ -215,14 +215,6 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, | |||
215 | vegas->beg_snd_nxt = tp->snd_nxt; | 215 | vegas->beg_snd_nxt = tp->snd_nxt; |
216 | vegas->beg_snd_cwnd = tp->snd_cwnd; | 216 | vegas->beg_snd_cwnd = tp->snd_cwnd; |
217 | 217 | ||
218 | /* Take into account the current RTT sample too, to | ||
219 | * decrease the impact of delayed acks. This double counts | ||
220 | * this sample since we count it for the next window as well, | ||
221 | * but that's not too awful, since we're taking the min, | ||
222 | * rather than averaging. | ||
223 | */ | ||
224 | tcp_vegas_rtt_calc(sk, seq_rtt * 1000); | ||
225 | |||
226 | /* We do the Vegas calculations only if we got enough RTT | 218 | /* We do the Vegas calculations only if we got enough RTT |
227 | * samples that we can be reasonably sure that we got | 219 | * samples that we can be reasonably sure that we got |
228 | * at least one RTT sample that wasn't from a delayed ACK. | 220 | * at least one RTT sample that wasn't from a delayed ACK. |
@@ -333,11 +325,11 @@ static void tcp_vegas_cong_avoid(struct sock *sk, u32 ack, | |||
333 | else if (tp->snd_cwnd > tp->snd_cwnd_clamp) | 325 | else if (tp->snd_cwnd > tp->snd_cwnd_clamp) |
334 | tp->snd_cwnd = tp->snd_cwnd_clamp; | 326 | tp->snd_cwnd = tp->snd_cwnd_clamp; |
335 | } | 327 | } |
336 | } | ||
337 | 328 | ||
338 | /* Wipe the slate clean for the next RTT. */ | 329 | /* Wipe the slate clean for the next RTT. */ |
339 | vegas->cntRTT = 0; | 330 | vegas->cntRTT = 0; |
340 | vegas->minRTT = 0x7fffffff; | 331 | vegas->minRTT = 0x7fffffff; |
332 | } | ||
341 | } | 333 | } |
342 | 334 | ||
343 | /* Extract info for Tcp socket info provided via netlink. */ | 335 | /* Extract info for Tcp socket info provided via netlink. */ |
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index b2b60f3e9cdd..42196ba3b0b9 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c | |||
@@ -182,6 +182,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl) | |||
182 | case IPPROTO_UDP: | 182 | case IPPROTO_UDP: |
183 | case IPPROTO_TCP: | 183 | case IPPROTO_TCP: |
184 | case IPPROTO_SCTP: | 184 | case IPPROTO_SCTP: |
185 | case IPPROTO_DCCP: | ||
185 | if (pskb_may_pull(skb, xprth + 4 - skb->data)) { | 186 | if (pskb_may_pull(skb, xprth + 4 - skb->data)) { |
186 | u16 *ports = (u16 *)xprth; | 187 | u16 *ports = (u16 *)xprth; |
187 | 188 | ||
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 76ff9f4fe89d..4ea8cf7c0cc4 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
@@ -379,8 +379,8 @@ static struct inet6_dev * ipv6_add_dev(struct net_device *dev) | |||
379 | dev->type == ARPHRD_NONE || | 379 | dev->type == ARPHRD_NONE || |
380 | dev->type == ARPHRD_SIT) { | 380 | dev->type == ARPHRD_SIT) { |
381 | printk(KERN_INFO | 381 | printk(KERN_INFO |
382 | "Disabled Privacy Extensions on device %p(%s)\n", | 382 | "%s: Disabled Privacy Extensions\n", |
383 | dev, dev->name); | 383 | dev->name); |
384 | ndev->cnf.use_tempaddr = -1; | 384 | ndev->cnf.use_tempaddr = -1; |
385 | } else { | 385 | } else { |
386 | in6_dev_hold(ndev); | 386 | in6_dev_hold(ndev); |
@@ -1596,9 +1596,17 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len) | |||
1596 | not good. | 1596 | not good. |
1597 | */ | 1597 | */ |
1598 | if (valid_lft >= 0x7FFFFFFF/HZ) | 1598 | if (valid_lft >= 0x7FFFFFFF/HZ) |
1599 | rt_expires = 0; | 1599 | rt_expires = 0x7FFFFFFF - (0x7FFFFFFF % HZ); |
1600 | else | 1600 | else |
1601 | rt_expires = jiffies + valid_lft * HZ; | 1601 | rt_expires = valid_lft * HZ; |
1602 | |||
1603 | /* | ||
1604 | * We convert this (in jiffies) to clock_t later. | ||
1605 | * Avoid arithmetic overflow there as well. | ||
1606 | * Overflow can happen only if HZ < USER_HZ. | ||
1607 | */ | ||
1608 | if (HZ < USER_HZ && rt_expires > 0x7FFFFFFF / USER_HZ) | ||
1609 | rt_expires = 0x7FFFFFFF / USER_HZ; | ||
1602 | 1610 | ||
1603 | if (pinfo->onlink) { | 1611 | if (pinfo->onlink) { |
1604 | struct rt6_info *rt; | 1612 | struct rt6_info *rt; |
@@ -1610,12 +1618,12 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len) | |||
1610 | ip6_del_rt(rt, NULL, NULL, NULL); | 1618 | ip6_del_rt(rt, NULL, NULL, NULL); |
1611 | rt = NULL; | 1619 | rt = NULL; |
1612 | } else { | 1620 | } else { |
1613 | rt->rt6i_expires = rt_expires; | 1621 | rt->rt6i_expires = jiffies + rt_expires; |
1614 | } | 1622 | } |
1615 | } | 1623 | } |
1616 | } else if (valid_lft) { | 1624 | } else if (valid_lft) { |
1617 | addrconf_prefix_route(&pinfo->prefix, pinfo->prefix_len, | 1625 | addrconf_prefix_route(&pinfo->prefix, pinfo->prefix_len, |
1618 | dev, rt_expires, RTF_ADDRCONF|RTF_EXPIRES|RTF_PREFIX_RT); | 1626 | dev, jiffies_to_clock_t(rt_expires), RTF_ADDRCONF|RTF_EXPIRES|RTF_PREFIX_RT); |
1619 | } | 1627 | } |
1620 | if (rt) | 1628 | if (rt) |
1621 | dst_release(&rt->u.dst); | 1629 | dst_release(&rt->u.dst); |
diff --git a/net/ipv6/esp6.c b/net/ipv6/esp6.c index 40d9a1935ab5..8bfbe9970793 100644 --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c | |||
@@ -248,7 +248,7 @@ static u32 esp6_get_max_size(struct xfrm_state *x, int mtu) | |||
248 | if (esp->conf.padlen) | 248 | if (esp->conf.padlen) |
249 | mtu = ALIGN(mtu, esp->conf.padlen); | 249 | mtu = ALIGN(mtu, esp->conf.padlen); |
250 | 250 | ||
251 | return mtu + x->props.header_len + esp->auth.icv_full_len; | 251 | return mtu + x->props.header_len + esp->auth.icv_trunc_len; |
252 | } | 252 | } |
253 | 253 | ||
254 | static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, | 254 | static void esp6_err(struct sk_buff *skb, struct inet6_skb_parm *opt, |
diff --git a/net/ipv6/netfilter/Kconfig b/net/ipv6/netfilter/Kconfig index 060d61202412..04912f9b35c3 100644 --- a/net/ipv6/netfilter/Kconfig +++ b/net/ipv6/netfilter/Kconfig | |||
@@ -211,7 +211,7 @@ config IP6_NF_TARGET_REJECT | |||
211 | 211 | ||
212 | config IP6_NF_TARGET_NFQUEUE | 212 | config IP6_NF_TARGET_NFQUEUE |
213 | tristate "NFQUEUE Target Support" | 213 | tristate "NFQUEUE Target Support" |
214 | depends on IP_NF_IPTABLES | 214 | depends on IP6_NF_IPTABLES |
215 | help | 215 | help |
216 | This Target replaced the old obsolete QUEUE target. | 216 | This Target replaced the old obsolete QUEUE target. |
217 | 217 | ||
diff --git a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c index c0f1da5497a9..a7e03cfacd06 100644 --- a/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c +++ b/net/ipv6/netfilter/nf_conntrack_proto_icmpv6.c | |||
@@ -68,8 +68,8 @@ static int icmpv6_invert_tuple(struct nf_conntrack_tuple *tuple, | |||
68 | [ICMPV6_NI_REPLY - 128] = ICMPV6_NI_REPLY +1 | 68 | [ICMPV6_NI_REPLY - 128] = ICMPV6_NI_REPLY +1 |
69 | }; | 69 | }; |
70 | 70 | ||
71 | __u8 type = orig->dst.u.icmp.type - 128; | 71 | int type = orig->dst.u.icmp.type - 128; |
72 | if (type >= sizeof(invmap) || !invmap[type]) | 72 | if (type < 0 || type >= sizeof(invmap) || !invmap[type]) |
73 | return 0; | 73 | return 0; |
74 | 74 | ||
75 | tuple->src.u.icmp.id = orig->src.u.icmp.id; | 75 | tuple->src.u.icmp.id = orig->src.u.icmp.id; |
@@ -129,12 +129,12 @@ static int icmpv6_new(struct nf_conn *conntrack, | |||
129 | [ICMPV6_ECHO_REQUEST - 128] = 1, | 129 | [ICMPV6_ECHO_REQUEST - 128] = 1, |
130 | [ICMPV6_NI_QUERY - 128] = 1 | 130 | [ICMPV6_NI_QUERY - 128] = 1 |
131 | }; | 131 | }; |
132 | int type = conntrack->tuplehash[0].tuple.dst.u.icmp.type - 128; | ||
132 | 133 | ||
133 | if (conntrack->tuplehash[0].tuple.dst.u.icmp.type - 128 >= sizeof(valid_new) | 134 | if (type < 0 || type >= sizeof(valid_new) || !valid_new[type]) { |
134 | || !valid_new[conntrack->tuplehash[0].tuple.dst.u.icmp.type - 128]) { | ||
135 | /* Can't create a new ICMPv6 `conn' with this. */ | 135 | /* Can't create a new ICMPv6 `conn' with this. */ |
136 | DEBUGP("icmp: can't create new conn with type %u\n", | 136 | DEBUGP("icmpv6: can't create new conn with type %u\n", |
137 | conntrack->tuplehash[0].tuple.dst.u.icmp.type); | 137 | type + 128); |
138 | NF_CT_DUMP_TUPLE(&conntrack->tuplehash[0].tuple); | 138 | NF_CT_DUMP_TUPLE(&conntrack->tuplehash[0].tuple); |
139 | return 0; | 139 | return 0; |
140 | } | 140 | } |
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index a7a537b50595..7c68bfbee361 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c | |||
@@ -829,7 +829,7 @@ int ip6_route_add(struct in6_rtmsg *rtmsg, struct nlmsghdr *nlh, | |||
829 | } | 829 | } |
830 | 830 | ||
831 | rt->u.dst.obsolete = -1; | 831 | rt->u.dst.obsolete = -1; |
832 | rt->rt6i_expires = clock_t_to_jiffies(rtmsg->rtmsg_info); | 832 | rt->rt6i_expires = jiffies + clock_t_to_jiffies(rtmsg->rtmsg_info); |
833 | if (nlh && (r = NLMSG_DATA(nlh))) { | 833 | if (nlh && (r = NLMSG_DATA(nlh))) { |
834 | rt->rt6i_protocol = r->rtm_protocol; | 834 | rt->rt6i_protocol = r->rtm_protocol; |
835 | } else { | 835 | } else { |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 62c0e5bd931c..8827389abaf7 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -992,13 +992,12 @@ static void tcp_v6_send_reset(struct sk_buff *skb) | |||
992 | /* sk = NULL, but it is safe for now. RST socket required. */ | 992 | /* sk = NULL, but it is safe for now. RST socket required. */ |
993 | if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) { | 993 | if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) { |
994 | 994 | ||
995 | if ((xfrm_lookup(&buff->dst, &fl, NULL, 0)) < 0) | 995 | if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) { |
996 | ip6_xmit(NULL, buff, &fl, NULL, 0); | ||
997 | TCP_INC_STATS_BH(TCP_MIB_OUTSEGS); | ||
998 | TCP_INC_STATS_BH(TCP_MIB_OUTRSTS); | ||
996 | return; | 999 | return; |
997 | 1000 | } | |
998 | ip6_xmit(NULL, buff, &fl, NULL, 0); | ||
999 | TCP_INC_STATS_BH(TCP_MIB_OUTSEGS); | ||
1000 | TCP_INC_STATS_BH(TCP_MIB_OUTRSTS); | ||
1001 | return; | ||
1002 | } | 1001 | } |
1003 | 1002 | ||
1004 | kfree_skb(buff); | 1003 | kfree_skb(buff); |
@@ -1057,11 +1056,11 @@ static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32 | |||
1057 | fl.fl_ip_sport = t1->source; | 1056 | fl.fl_ip_sport = t1->source; |
1058 | 1057 | ||
1059 | if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) { | 1058 | if (!ip6_dst_lookup(NULL, &buff->dst, &fl)) { |
1060 | if ((xfrm_lookup(&buff->dst, &fl, NULL, 0)) < 0) | 1059 | if (xfrm_lookup(&buff->dst, &fl, NULL, 0) >= 0) { |
1060 | ip6_xmit(NULL, buff, &fl, NULL, 0); | ||
1061 | TCP_INC_STATS_BH(TCP_MIB_OUTSEGS); | ||
1061 | return; | 1062 | return; |
1062 | ip6_xmit(NULL, buff, &fl, NULL, 0); | 1063 | } |
1063 | TCP_INC_STATS_BH(TCP_MIB_OUTSEGS); | ||
1064 | return; | ||
1065 | } | 1064 | } |
1066 | 1065 | ||
1067 | kfree_skb(buff); | 1066 | kfree_skb(buff); |
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index cf1d91e74c82..69bd957380e7 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c | |||
@@ -214,6 +214,7 @@ _decode_session6(struct sk_buff *skb, struct flowi *fl) | |||
214 | case IPPROTO_UDP: | 214 | case IPPROTO_UDP: |
215 | case IPPROTO_TCP: | 215 | case IPPROTO_TCP: |
216 | case IPPROTO_SCTP: | 216 | case IPPROTO_SCTP: |
217 | case IPPROTO_DCCP: | ||
217 | if (pskb_may_pull(skb, skb->nh.raw + offset + 4 - skb->data)) { | 218 | if (pskb_may_pull(skb, skb->nh.raw + offset + 4 - skb->data)) { |
218 | u16 *ports = (u16 *)exthdr; | 219 | u16 *ports = (u16 *)exthdr; |
219 | 220 | ||
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index a84f9221e5f0..794c41d19b28 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig | |||
@@ -61,8 +61,8 @@ config NF_CONNTRACK_MARK | |||
61 | instead of the individual packets. | 61 | instead of the individual packets. |
62 | 62 | ||
63 | config NF_CONNTRACK_EVENTS | 63 | config NF_CONNTRACK_EVENTS |
64 | bool "Connection tracking events" | 64 | bool "Connection tracking events (EXPERIMENTAL)" |
65 | depends on NF_CONNTRACK | 65 | depends on EXPERIMENTAL && NF_CONNTRACK |
66 | help | 66 | help |
67 | If this option is enabled, the connection tracking code will | 67 | If this option is enabled, the connection tracking code will |
68 | provide a notifier chain that can be used by other kernel code | 68 | provide a notifier chain that can be used by other kernel code |
diff --git a/net/netfilter/nf_conntrack_core.c b/net/netfilter/nf_conntrack_core.c index 1da678303d78..a7c7b490cf22 100644 --- a/net/netfilter/nf_conntrack_core.c +++ b/net/netfilter/nf_conntrack_core.c | |||
@@ -1383,6 +1383,9 @@ void nf_conntrack_cleanup(void) | |||
1383 | schedule(); | 1383 | schedule(); |
1384 | goto i_see_dead_people; | 1384 | goto i_see_dead_people; |
1385 | } | 1385 | } |
1386 | /* wait until all references to nf_conntrack_untracked are dropped */ | ||
1387 | while (atomic_read(&nf_conntrack_untracked.ct_general.use) > 1) | ||
1388 | schedule(); | ||
1386 | 1389 | ||
1387 | for (i = 0; i < NF_CT_F_NUM; i++) { | 1390 | for (i = 0; i < NF_CT_F_NUM; i++) { |
1388 | if (nf_ct_cache[i].use == 0) | 1391 | if (nf_ct_cache[i].use == 0) |
diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index a60c59b97631..95fdf04f1d88 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c | |||
@@ -162,7 +162,7 @@ nfnetlink_check_attributes(struct nfnetlink_subsystem *subsys, | |||
162 | return -EINVAL; | 162 | return -EINVAL; |
163 | } | 163 | } |
164 | 164 | ||
165 | min_len = NLMSG_ALIGN(sizeof(struct nfgenmsg)); | 165 | min_len = NLMSG_SPACE(sizeof(struct nfgenmsg)); |
166 | if (unlikely(nlh->nlmsg_len < min_len)) | 166 | if (unlikely(nlh->nlmsg_len < min_len)) |
167 | return -EINVAL; | 167 | return -EINVAL; |
168 | 168 | ||
@@ -236,8 +236,7 @@ static inline int nfnetlink_rcv_msg(struct sk_buff *skb, | |||
236 | } | 236 | } |
237 | 237 | ||
238 | /* All the messages must at least contain nfgenmsg */ | 238 | /* All the messages must at least contain nfgenmsg */ |
239 | if (nlh->nlmsg_len < | 239 | if (nlh->nlmsg_len < NLMSG_SPACE(sizeof(struct nfgenmsg))) { |
240 | NLMSG_LENGTH(NLMSG_ALIGN(sizeof(struct nfgenmsg)))) { | ||
241 | DEBUGP("received message was too short\n"); | 240 | DEBUGP("received message was too short\n"); |
242 | return 0; | 241 | return 0; |
243 | } | 242 | } |
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 499ae3df4a44..3e2462760413 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
@@ -1587,23 +1587,47 @@ static inline struct page *pg_vec_endpage(char *one_pg_vec, unsigned int order) | |||
1587 | return virt_to_page(one_pg_vec + (PAGE_SIZE << order) - 1); | 1587 | return virt_to_page(one_pg_vec + (PAGE_SIZE << order) - 1); |
1588 | } | 1588 | } |
1589 | 1589 | ||
1590 | static void free_pg_vec(char **pg_vec, unsigned order, unsigned len) | 1590 | static void free_pg_vec(char **pg_vec, unsigned int order, unsigned int len) |
1591 | { | 1591 | { |
1592 | int i; | 1592 | int i; |
1593 | 1593 | ||
1594 | for (i=0; i<len; i++) { | 1594 | for (i = 0; i < len; i++) { |
1595 | if (pg_vec[i]) { | 1595 | if (likely(pg_vec[i])) |
1596 | struct page *page, *pend; | 1596 | free_pages((unsigned long) pg_vec[i], order); |
1597 | |||
1598 | pend = pg_vec_endpage(pg_vec[i], order); | ||
1599 | for (page = virt_to_page(pg_vec[i]); page <= pend; page++) | ||
1600 | ClearPageReserved(page); | ||
1601 | free_pages((unsigned long)pg_vec[i], order); | ||
1602 | } | ||
1603 | } | 1597 | } |
1604 | kfree(pg_vec); | 1598 | kfree(pg_vec); |
1605 | } | 1599 | } |
1606 | 1600 | ||
1601 | static inline char *alloc_one_pg_vec_page(unsigned long order) | ||
1602 | { | ||
1603 | return (char *) __get_free_pages(GFP_KERNEL | __GFP_COMP | __GFP_ZERO, | ||
1604 | order); | ||
1605 | } | ||
1606 | |||
1607 | static char **alloc_pg_vec(struct tpacket_req *req, int order) | ||
1608 | { | ||
1609 | unsigned int block_nr = req->tp_block_nr; | ||
1610 | char **pg_vec; | ||
1611 | int i; | ||
1612 | |||
1613 | pg_vec = kzalloc(block_nr * sizeof(char *), GFP_KERNEL); | ||
1614 | if (unlikely(!pg_vec)) | ||
1615 | goto out; | ||
1616 | |||
1617 | for (i = 0; i < block_nr; i++) { | ||
1618 | pg_vec[i] = alloc_one_pg_vec_page(order); | ||
1619 | if (unlikely(!pg_vec[i])) | ||
1620 | goto out_free_pgvec; | ||
1621 | } | ||
1622 | |||
1623 | out: | ||
1624 | return pg_vec; | ||
1625 | |||
1626 | out_free_pgvec: | ||
1627 | free_pg_vec(pg_vec, order, block_nr); | ||
1628 | pg_vec = NULL; | ||
1629 | goto out; | ||
1630 | } | ||
1607 | 1631 | ||
1608 | static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing) | 1632 | static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing) |
1609 | { | 1633 | { |
@@ -1617,64 +1641,46 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing | |||
1617 | 1641 | ||
1618 | /* Sanity tests and some calculations */ | 1642 | /* Sanity tests and some calculations */ |
1619 | 1643 | ||
1620 | if (po->pg_vec) | 1644 | if (unlikely(po->pg_vec)) |
1621 | return -EBUSY; | 1645 | return -EBUSY; |
1622 | 1646 | ||
1623 | if ((int)req->tp_block_size <= 0) | 1647 | if (unlikely((int)req->tp_block_size <= 0)) |
1624 | return -EINVAL; | 1648 | return -EINVAL; |
1625 | if (req->tp_block_size&(PAGE_SIZE-1)) | 1649 | if (unlikely(req->tp_block_size & (PAGE_SIZE - 1))) |
1626 | return -EINVAL; | 1650 | return -EINVAL; |
1627 | if (req->tp_frame_size < TPACKET_HDRLEN) | 1651 | if (unlikely(req->tp_frame_size < TPACKET_HDRLEN)) |
1628 | return -EINVAL; | 1652 | return -EINVAL; |
1629 | if (req->tp_frame_size&(TPACKET_ALIGNMENT-1)) | 1653 | if (unlikely(req->tp_frame_size & (TPACKET_ALIGNMENT - 1))) |
1630 | return -EINVAL; | 1654 | return -EINVAL; |
1631 | 1655 | ||
1632 | po->frames_per_block = req->tp_block_size/req->tp_frame_size; | 1656 | po->frames_per_block = req->tp_block_size/req->tp_frame_size; |
1633 | if (po->frames_per_block <= 0) | 1657 | if (unlikely(po->frames_per_block <= 0)) |
1634 | return -EINVAL; | 1658 | return -EINVAL; |
1635 | if (po->frames_per_block*req->tp_block_nr != req->tp_frame_nr) | 1659 | if (unlikely((po->frames_per_block * req->tp_block_nr) != |
1660 | req->tp_frame_nr)) | ||
1636 | return -EINVAL; | 1661 | return -EINVAL; |
1637 | /* OK! */ | ||
1638 | |||
1639 | /* Allocate page vector */ | ||
1640 | while ((PAGE_SIZE<<order) < req->tp_block_size) | ||
1641 | order++; | ||
1642 | 1662 | ||
1643 | err = -ENOMEM; | 1663 | err = -ENOMEM; |
1644 | 1664 | order = get_order(req->tp_block_size); | |
1645 | pg_vec = kmalloc(req->tp_block_nr*sizeof(char *), GFP_KERNEL); | 1665 | pg_vec = alloc_pg_vec(req, order); |
1646 | if (pg_vec == NULL) | 1666 | if (unlikely(!pg_vec)) |
1647 | goto out; | 1667 | goto out; |
1648 | memset(pg_vec, 0, req->tp_block_nr*sizeof(char **)); | ||
1649 | |||
1650 | for (i=0; i<req->tp_block_nr; i++) { | ||
1651 | struct page *page, *pend; | ||
1652 | pg_vec[i] = (char *)__get_free_pages(GFP_KERNEL, order); | ||
1653 | if (!pg_vec[i]) | ||
1654 | goto out_free_pgvec; | ||
1655 | |||
1656 | pend = pg_vec_endpage(pg_vec[i], order); | ||
1657 | for (page = virt_to_page(pg_vec[i]); page <= pend; page++) | ||
1658 | SetPageReserved(page); | ||
1659 | } | ||
1660 | /* Page vector is allocated */ | ||
1661 | 1668 | ||
1662 | l = 0; | 1669 | l = 0; |
1663 | for (i=0; i<req->tp_block_nr; i++) { | 1670 | for (i = 0; i < req->tp_block_nr; i++) { |
1664 | char *ptr = pg_vec[i]; | 1671 | char *ptr = pg_vec[i]; |
1665 | struct tpacket_hdr *header; | 1672 | struct tpacket_hdr *header; |
1666 | int k; | 1673 | int k; |
1667 | 1674 | ||
1668 | for (k=0; k<po->frames_per_block; k++) { | 1675 | for (k = 0; k < po->frames_per_block; k++) { |
1669 | 1676 | header = (struct tpacket_hdr *) ptr; | |
1670 | header = (struct tpacket_hdr*)ptr; | ||
1671 | header->tp_status = TP_STATUS_KERNEL; | 1677 | header->tp_status = TP_STATUS_KERNEL; |
1672 | ptr += req->tp_frame_size; | 1678 | ptr += req->tp_frame_size; |
1673 | } | 1679 | } |
1674 | } | 1680 | } |
1675 | /* Done */ | 1681 | /* Done */ |
1676 | } else { | 1682 | } else { |
1677 | if (req->tp_frame_nr) | 1683 | if (unlikely(req->tp_frame_nr)) |
1678 | return -EINVAL; | 1684 | return -EINVAL; |
1679 | } | 1685 | } |
1680 | 1686 | ||
@@ -1701,7 +1707,7 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing | |||
1701 | 1707 | ||
1702 | spin_lock_bh(&sk->sk_receive_queue.lock); | 1708 | spin_lock_bh(&sk->sk_receive_queue.lock); |
1703 | pg_vec = XC(po->pg_vec, pg_vec); | 1709 | pg_vec = XC(po->pg_vec, pg_vec); |
1704 | po->frame_max = req->tp_frame_nr-1; | 1710 | po->frame_max = (req->tp_frame_nr - 1); |
1705 | po->head = 0; | 1711 | po->head = 0; |
1706 | po->frame_size = req->tp_frame_size; | 1712 | po->frame_size = req->tp_frame_size; |
1707 | spin_unlock_bh(&sk->sk_receive_queue.lock); | 1713 | spin_unlock_bh(&sk->sk_receive_queue.lock); |
@@ -1728,7 +1734,6 @@ static int packet_set_ring(struct sock *sk, struct tpacket_req *req, int closing | |||
1728 | 1734 | ||
1729 | release_sock(sk); | 1735 | release_sock(sk); |
1730 | 1736 | ||
1731 | out_free_pgvec: | ||
1732 | if (pg_vec) | 1737 | if (pg_vec) |
1733 | free_pg_vec(pg_vec, order, req->tp_block_nr); | 1738 | free_pg_vec(pg_vec, order, req->tp_block_nr); |
1734 | out: | 1739 | out: |
@@ -1755,17 +1760,19 @@ static int packet_mmap(struct file *file, struct socket *sock, struct vm_area_st | |||
1755 | if (size != po->pg_vec_len*po->pg_vec_pages*PAGE_SIZE) | 1760 | if (size != po->pg_vec_len*po->pg_vec_pages*PAGE_SIZE) |
1756 | goto out; | 1761 | goto out; |
1757 | 1762 | ||
1758 | atomic_inc(&po->mapped); | ||
1759 | start = vma->vm_start; | 1763 | start = vma->vm_start; |
1760 | err = -EAGAIN; | 1764 | for (i = 0; i < po->pg_vec_len; i++) { |
1761 | for (i=0; i<po->pg_vec_len; i++) { | 1765 | struct page *page = virt_to_page(po->pg_vec[i]); |
1762 | if (remap_pfn_range(vma, start, | 1766 | int pg_num; |
1763 | __pa(po->pg_vec[i]) >> PAGE_SHIFT, | 1767 | |
1764 | po->pg_vec_pages*PAGE_SIZE, | 1768 | for (pg_num = 0; pg_num < po->pg_vec_pages; pg_num++, page++) { |
1765 | vma->vm_page_prot)) | 1769 | err = vm_insert_page(vma, start, page); |
1766 | goto out; | 1770 | if (unlikely(err)) |
1767 | start += po->pg_vec_pages*PAGE_SIZE; | 1771 | goto out; |
1772 | start += PAGE_SIZE; | ||
1773 | } | ||
1768 | } | 1774 | } |
1775 | atomic_inc(&po->mapped); | ||
1769 | vma->vm_ops = &packet_mmap_ops; | 1776 | vma->vm_ops = &packet_mmap_ops; |
1770 | err = 0; | 1777 | err = 0; |
1771 | 1778 | ||
diff --git a/net/sched/act_api.c b/net/sched/act_api.c index 8aebe8f6d271..2ce1cb2aa2ed 100644 --- a/net/sched/act_api.c +++ b/net/sched/act_api.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #include <net/sch_generic.h> | 34 | #include <net/sch_generic.h> |
35 | #include <net/act_api.h> | 35 | #include <net/act_api.h> |
36 | 36 | ||
37 | #if 1 /* control */ | 37 | #if 0 /* control */ |
38 | #define DPRINTK(format, args...) printk(KERN_DEBUG format, ##args) | 38 | #define DPRINTK(format, args...) printk(KERN_DEBUG format, ##args) |
39 | #else | 39 | #else |
40 | #define DPRINTK(format, args...) | 40 | #define DPRINTK(format, args...) |
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index d890dfa8818f..9df888e932c5 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c | |||
@@ -156,10 +156,6 @@ static inline void sctp_set_owner_w(struct sctp_chunk *chunk) | |||
156 | sizeof(struct sk_buff) + | 156 | sizeof(struct sk_buff) + |
157 | sizeof(struct sctp_chunk); | 157 | sizeof(struct sctp_chunk); |
158 | 158 | ||
159 | sk->sk_wmem_queued += SCTP_DATA_SNDSIZE(chunk) + | ||
160 | sizeof(struct sk_buff) + | ||
161 | sizeof(struct sctp_chunk); | ||
162 | |||
163 | atomic_add(sizeof(struct sctp_chunk), &sk->sk_wmem_alloc); | 159 | atomic_add(sizeof(struct sctp_chunk), &sk->sk_wmem_alloc); |
164 | } | 160 | } |
165 | 161 | ||
@@ -3425,7 +3421,7 @@ static int sctp_copy_laddrs_to_user_old(struct sock *sk, __u16 port, int max_add | |||
3425 | } | 3421 | } |
3426 | 3422 | ||
3427 | static int sctp_copy_laddrs_to_user(struct sock *sk, __u16 port, | 3423 | static int sctp_copy_laddrs_to_user(struct sock *sk, __u16 port, |
3428 | void * __user *to, size_t space_left) | 3424 | void __user **to, size_t space_left) |
3429 | { | 3425 | { |
3430 | struct list_head *pos; | 3426 | struct list_head *pos; |
3431 | struct sctp_sockaddr_entry *addr; | 3427 | struct sctp_sockaddr_entry *addr; |
@@ -4426,7 +4422,7 @@ cleanup: | |||
4426 | * tcp_poll(). Note that, based on these implementations, we don't | 4422 | * tcp_poll(). Note that, based on these implementations, we don't |
4427 | * lock the socket in this function, even though it seems that, | 4423 | * lock the socket in this function, even though it seems that, |
4428 | * ideally, locking or some other mechanisms can be used to ensure | 4424 | * ideally, locking or some other mechanisms can be used to ensure |
4429 | * the integrity of the counters (sndbuf and wmem_queued) used | 4425 | * the integrity of the counters (sndbuf and wmem_alloc) used |
4430 | * in this place. We assume that we don't need locks either until proven | 4426 | * in this place. We assume that we don't need locks either until proven |
4431 | * otherwise. | 4427 | * otherwise. |
4432 | * | 4428 | * |
@@ -4833,10 +4829,6 @@ static void sctp_wfree(struct sk_buff *skb) | |||
4833 | sizeof(struct sk_buff) + | 4829 | sizeof(struct sk_buff) + |
4834 | sizeof(struct sctp_chunk); | 4830 | sizeof(struct sctp_chunk); |
4835 | 4831 | ||
4836 | sk->sk_wmem_queued -= SCTP_DATA_SNDSIZE(chunk) + | ||
4837 | sizeof(struct sk_buff) + | ||
4838 | sizeof(struct sctp_chunk); | ||
4839 | |||
4840 | atomic_sub(sizeof(struct sctp_chunk), &sk->sk_wmem_alloc); | 4832 | atomic_sub(sizeof(struct sctp_chunk), &sk->sk_wmem_alloc); |
4841 | 4833 | ||
4842 | sock_wfree(skb); | 4834 | sock_wfree(skb); |
@@ -4920,7 +4912,7 @@ void sctp_write_space(struct sock *sk) | |||
4920 | 4912 | ||
4921 | /* Is there any sndbuf space available on the socket? | 4913 | /* Is there any sndbuf space available on the socket? |
4922 | * | 4914 | * |
4923 | * Note that wmem_queued is the sum of the send buffers on all of the | 4915 | * Note that sk_wmem_alloc is the sum of the send buffers on all of the |
4924 | * associations on the same socket. For a UDP-style socket with | 4916 | * associations on the same socket. For a UDP-style socket with |
4925 | * multiple associations, it is possible for it to be "unwriteable" | 4917 | * multiple associations, it is possible for it to be "unwriteable" |
4926 | * prematurely. I assume that this is acceptable because | 4918 | * prematurely. I assume that this is acceptable because |
@@ -4933,7 +4925,7 @@ static int sctp_writeable(struct sock *sk) | |||
4933 | { | 4925 | { |
4934 | int amt = 0; | 4926 | int amt = 0; |
4935 | 4927 | ||
4936 | amt = sk->sk_sndbuf - sk->sk_wmem_queued; | 4928 | amt = sk->sk_sndbuf - atomic_read(&sk->sk_wmem_alloc); |
4937 | if (amt < 0) | 4929 | if (amt < 0) |
4938 | amt = 0; | 4930 | amt = 0; |
4939 | return amt; | 4931 | return amt; |
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index f44f46f1d8e0..8d782282ec19 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c | |||
@@ -638,7 +638,7 @@ gss_pipe_destroy_msg(struct rpc_pipe_msg *msg) | |||
638 | gss_msg); | 638 | gss_msg); |
639 | atomic_inc(&gss_msg->count); | 639 | atomic_inc(&gss_msg->count); |
640 | gss_unhash_msg(gss_msg); | 640 | gss_unhash_msg(gss_msg); |
641 | if (msg->errno == -ETIMEDOUT || msg->errno == -EPIPE) { | 641 | if (msg->errno == -ETIMEDOUT) { |
642 | unsigned long now = jiffies; | 642 | unsigned long now = jiffies; |
643 | if (time_after(now, ratelimit)) { | 643 | if (time_after(now, ratelimit)) { |
644 | printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n" | 644 | printk(KERN_WARNING "RPC: AUTH_GSS upcall timed out.\n" |
@@ -786,7 +786,9 @@ gss_create_cred(struct rpc_auth *auth, struct auth_cred *acred, int taskflags) | |||
786 | cred->gc_flags = 0; | 786 | cred->gc_flags = 0; |
787 | cred->gc_base.cr_ops = &gss_credops; | 787 | cred->gc_base.cr_ops = &gss_credops; |
788 | cred->gc_service = gss_auth->service; | 788 | cred->gc_service = gss_auth->service; |
789 | err = gss_create_upcall(gss_auth, cred); | 789 | do { |
790 | err = gss_create_upcall(gss_auth, cred); | ||
791 | } while (err == -EAGAIN); | ||
790 | if (err < 0) | 792 | if (err < 0) |
791 | goto out_err; | 793 | goto out_err; |
792 | 794 | ||
diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c index c76ea221798c..16a2458f38f7 100644 --- a/net/sunrpc/rpc_pipe.c +++ b/net/sunrpc/rpc_pipe.c | |||
@@ -174,7 +174,7 @@ rpc_pipe_release(struct inode *inode, struct file *filp) | |||
174 | goto out; | 174 | goto out; |
175 | msg = (struct rpc_pipe_msg *)filp->private_data; | 175 | msg = (struct rpc_pipe_msg *)filp->private_data; |
176 | if (msg != NULL) { | 176 | if (msg != NULL) { |
177 | msg->errno = -EPIPE; | 177 | msg->errno = -EAGAIN; |
178 | list_del_init(&msg->list); | 178 | list_del_init(&msg->list); |
179 | rpci->ops->destroy_msg(msg); | 179 | rpci->ops->destroy_msg(msg); |
180 | } | 180 | } |
@@ -183,7 +183,7 @@ rpc_pipe_release(struct inode *inode, struct file *filp) | |||
183 | if (filp->f_mode & FMODE_READ) | 183 | if (filp->f_mode & FMODE_READ) |
184 | rpci->nreaders --; | 184 | rpci->nreaders --; |
185 | if (!rpci->nreaders) | 185 | if (!rpci->nreaders) |
186 | __rpc_purge_upcall(inode, -EPIPE); | 186 | __rpc_purge_upcall(inode, -EAGAIN); |
187 | if (rpci->ops->release_pipe) | 187 | if (rpci->ops->release_pipe) |
188 | rpci->ops->release_pipe(inode); | 188 | rpci->ops->release_pipe(inode); |
189 | out: | 189 | out: |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index 0a51fd46a848..77e8800d4127 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -990,6 +990,7 @@ static void xs_udp_connect_worker(void *args) | |||
990 | sk->sk_data_ready = xs_udp_data_ready; | 990 | sk->sk_data_ready = xs_udp_data_ready; |
991 | sk->sk_write_space = xs_udp_write_space; | 991 | sk->sk_write_space = xs_udp_write_space; |
992 | sk->sk_no_check = UDP_CSUM_NORCV; | 992 | sk->sk_no_check = UDP_CSUM_NORCV; |
993 | sk->sk_allocation = GFP_ATOMIC; | ||
993 | 994 | ||
994 | xprt_set_connected(xprt); | 995 | xprt_set_connected(xprt); |
995 | 996 | ||
@@ -1074,6 +1075,7 @@ static void xs_tcp_connect_worker(void *args) | |||
1074 | sk->sk_data_ready = xs_tcp_data_ready; | 1075 | sk->sk_data_ready = xs_tcp_data_ready; |
1075 | sk->sk_state_change = xs_tcp_state_change; | 1076 | sk->sk_state_change = xs_tcp_state_change; |
1076 | sk->sk_write_space = xs_tcp_write_space; | 1077 | sk->sk_write_space = xs_tcp_write_space; |
1078 | sk->sk_allocation = GFP_ATOMIC; | ||
1077 | 1079 | ||
1078 | /* socket options */ | 1080 | /* socket options */ |
1079 | sk->sk_userlocks |= SOCK_BINDPORT_LOCK; | 1081 | sk->sk_userlocks |= SOCK_BINDPORT_LOCK; |
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 0db9e57013fd..54a4be6a7d26 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c | |||
@@ -1014,13 +1014,12 @@ int __xfrm_route_forward(struct sk_buff *skb, unsigned short family) | |||
1014 | } | 1014 | } |
1015 | EXPORT_SYMBOL(__xfrm_route_forward); | 1015 | EXPORT_SYMBOL(__xfrm_route_forward); |
1016 | 1016 | ||
1017 | /* Optimize later using cookies and generation ids. */ | ||
1018 | |||
1019 | static struct dst_entry *xfrm_dst_check(struct dst_entry *dst, u32 cookie) | 1017 | static struct dst_entry *xfrm_dst_check(struct dst_entry *dst, u32 cookie) |
1020 | { | 1018 | { |
1021 | if (!stale_bundle(dst)) | 1019 | /* If it is marked obsolete, which is how we even get here, |
1022 | return dst; | 1020 | * then we have purged it from the policy bundle list and we |
1023 | 1021 | * did that for a good reason. | |
1022 | */ | ||
1024 | return NULL; | 1023 | return NULL; |
1025 | } | 1024 | } |
1026 | 1025 | ||
@@ -1104,6 +1103,16 @@ int xfrm_flush_bundles(void) | |||
1104 | return 0; | 1103 | return 0; |
1105 | } | 1104 | } |
1106 | 1105 | ||
1106 | static int always_true(struct dst_entry *dst) | ||
1107 | { | ||
1108 | return 1; | ||
1109 | } | ||
1110 | |||
1111 | void xfrm_flush_all_bundles(void) | ||
1112 | { | ||
1113 | xfrm_prune_bundles(always_true); | ||
1114 | } | ||
1115 | |||
1107 | void xfrm_init_pmtu(struct dst_entry *dst) | 1116 | void xfrm_init_pmtu(struct dst_entry *dst) |
1108 | { | 1117 | { |
1109 | do { | 1118 | do { |
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index 7cf48aa6c95b..479effc97666 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c | |||
@@ -431,6 +431,8 @@ void xfrm_state_insert(struct xfrm_state *x) | |||
431 | spin_lock_bh(&xfrm_state_lock); | 431 | spin_lock_bh(&xfrm_state_lock); |
432 | __xfrm_state_insert(x); | 432 | __xfrm_state_insert(x); |
433 | spin_unlock_bh(&xfrm_state_lock); | 433 | spin_unlock_bh(&xfrm_state_lock); |
434 | |||
435 | xfrm_flush_all_bundles(); | ||
434 | } | 436 | } |
435 | EXPORT_SYMBOL(xfrm_state_insert); | 437 | EXPORT_SYMBOL(xfrm_state_insert); |
436 | 438 | ||
@@ -478,6 +480,9 @@ out: | |||
478 | spin_unlock_bh(&xfrm_state_lock); | 480 | spin_unlock_bh(&xfrm_state_lock); |
479 | xfrm_state_put_afinfo(afinfo); | 481 | xfrm_state_put_afinfo(afinfo); |
480 | 482 | ||
483 | if (!err) | ||
484 | xfrm_flush_all_bundles(); | ||
485 | |||
481 | if (x1) { | 486 | if (x1) { |
482 | xfrm_state_delete(x1); | 487 | xfrm_state_delete(x1); |
483 | xfrm_state_put(x1); | 488 | xfrm_state_put(x1); |
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index 6b46a8a4b1cc..b963c550dae6 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c | |||
@@ -578,17 +578,15 @@ set_recv_slots(int num_channels) | |||
578 | } while ((stat & PSC_AC97STAT_DR) == 0); | 578 | } while ((stat & PSC_AC97STAT_DR) == 0); |
579 | } | 579 | } |
580 | 580 | ||
581 | /* Hold spinlock for both start_dac() and start_adc() calls */ | ||
581 | static void | 582 | static void |
582 | start_dac(struct au1550_state *s) | 583 | start_dac(struct au1550_state *s) |
583 | { | 584 | { |
584 | struct dmabuf *db = &s->dma_dac; | 585 | struct dmabuf *db = &s->dma_dac; |
585 | unsigned long flags; | ||
586 | 586 | ||
587 | if (!db->stopped) | 587 | if (!db->stopped) |
588 | return; | 588 | return; |
589 | 589 | ||
590 | spin_lock_irqsave(&s->lock, flags); | ||
591 | |||
592 | set_xmit_slots(db->num_channels); | 590 | set_xmit_slots(db->num_channels); |
593 | au_writel(PSC_AC97PCR_TC, PSC_AC97PCR); | 591 | au_writel(PSC_AC97PCR_TC, PSC_AC97PCR); |
594 | au_sync(); | 592 | au_sync(); |
@@ -598,8 +596,6 @@ start_dac(struct au1550_state *s) | |||
598 | au1xxx_dbdma_start(db->dmanr); | 596 | au1xxx_dbdma_start(db->dmanr); |
599 | 597 | ||
600 | db->stopped = 0; | 598 | db->stopped = 0; |
601 | |||
602 | spin_unlock_irqrestore(&s->lock, flags); | ||
603 | } | 599 | } |
604 | 600 | ||
605 | static void | 601 | static void |
@@ -718,7 +714,6 @@ prog_dmabuf_dac(struct au1550_state *s) | |||
718 | } | 714 | } |
719 | 715 | ||
720 | 716 | ||
721 | /* hold spinlock for the following */ | ||
722 | static void | 717 | static void |
723 | dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 718 | dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) |
724 | { | 719 | { |
@@ -726,6 +721,8 @@ dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
726 | struct dmabuf *db = &s->dma_dac; | 721 | struct dmabuf *db = &s->dma_dac; |
727 | u32 ac97c_stat; | 722 | u32 ac97c_stat; |
728 | 723 | ||
724 | spin_lock(&s->lock); | ||
725 | |||
729 | ac97c_stat = au_readl(PSC_AC97STAT); | 726 | ac97c_stat = au_readl(PSC_AC97STAT); |
730 | if (ac97c_stat & (AC97C_XU | AC97C_XO | AC97C_TE)) | 727 | if (ac97c_stat & (AC97C_XU | AC97C_XO | AC97C_TE)) |
731 | pr_debug("AC97C status = 0x%08x\n", ac97c_stat); | 728 | pr_debug("AC97C status = 0x%08x\n", ac97c_stat); |
@@ -747,6 +744,8 @@ dac_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
747 | /* wake up anybody listening */ | 744 | /* wake up anybody listening */ |
748 | if (waitqueue_active(&db->wait)) | 745 | if (waitqueue_active(&db->wait)) |
749 | wake_up(&db->wait); | 746 | wake_up(&db->wait); |
747 | |||
748 | spin_unlock(&s->lock); | ||
750 | } | 749 | } |
751 | 750 | ||
752 | 751 | ||
@@ -758,6 +757,8 @@ adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
758 | u32 obytes; | 757 | u32 obytes; |
759 | char *obuf; | 758 | char *obuf; |
760 | 759 | ||
760 | spin_lock(&s->lock); | ||
761 | |||
761 | /* Pull the buffer from the dma queue. | 762 | /* Pull the buffer from the dma queue. |
762 | */ | 763 | */ |
763 | au1xxx_dbdma_get_dest(dp->dmanr, (void *)(&obuf), &obytes); | 764 | au1xxx_dbdma_get_dest(dp->dmanr, (void *)(&obuf), &obytes); |
@@ -765,6 +766,7 @@ adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
765 | if ((dp->count + obytes) > dp->dmasize) { | 766 | if ((dp->count + obytes) > dp->dmasize) { |
766 | /* Overrun. Stop ADC and log the error | 767 | /* Overrun. Stop ADC and log the error |
767 | */ | 768 | */ |
769 | spin_unlock(&s->lock); | ||
768 | stop_adc(s); | 770 | stop_adc(s); |
769 | dp->error++; | 771 | dp->error++; |
770 | err("adc overrun"); | 772 | err("adc overrun"); |
@@ -787,6 +789,7 @@ adc_dma_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
787 | if (waitqueue_active(&dp->wait)) | 789 | if (waitqueue_active(&dp->wait)) |
788 | wake_up(&dp->wait); | 790 | wake_up(&dp->wait); |
789 | 791 | ||
792 | spin_unlock(&s->lock); | ||
790 | } | 793 | } |
791 | 794 | ||
792 | static loff_t | 795 | static loff_t |
@@ -1048,9 +1051,9 @@ au1550_read(struct file *file, char *buffer, size_t count, loff_t *ppos) | |||
1048 | /* wait for samples in ADC dma buffer | 1051 | /* wait for samples in ADC dma buffer |
1049 | */ | 1052 | */ |
1050 | do { | 1053 | do { |
1054 | spin_lock_irqsave(&s->lock, flags); | ||
1051 | if (db->stopped) | 1055 | if (db->stopped) |
1052 | start_adc(s); | 1056 | start_adc(s); |
1053 | spin_lock_irqsave(&s->lock, flags); | ||
1054 | avail = db->count; | 1057 | avail = db->count; |
1055 | if (avail <= 0) | 1058 | if (avail <= 0) |
1056 | __set_current_state(TASK_INTERRUPTIBLE); | 1059 | __set_current_state(TASK_INTERRUPTIBLE); |
@@ -1570,15 +1573,19 @@ au1550_ioctl(struct inode *inode, struct file *file, unsigned int cmd, | |||
1570 | if (get_user(val, (int *) arg)) | 1573 | if (get_user(val, (int *) arg)) |
1571 | return -EFAULT; | 1574 | return -EFAULT; |
1572 | if (file->f_mode & FMODE_READ) { | 1575 | if (file->f_mode & FMODE_READ) { |
1573 | if (val & PCM_ENABLE_INPUT) | 1576 | if (val & PCM_ENABLE_INPUT) { |
1577 | spin_lock_irqsave(&s->lock, flags); | ||
1574 | start_adc(s); | 1578 | start_adc(s); |
1575 | else | 1579 | spin_unlock_irqrestore(&s->lock, flags); |
1580 | } else | ||
1576 | stop_adc(s); | 1581 | stop_adc(s); |
1577 | } | 1582 | } |
1578 | if (file->f_mode & FMODE_WRITE) { | 1583 | if (file->f_mode & FMODE_WRITE) { |
1579 | if (val & PCM_ENABLE_OUTPUT) | 1584 | if (val & PCM_ENABLE_OUTPUT) { |
1585 | spin_lock_irqsave(&s->lock, flags); | ||
1580 | start_dac(s); | 1586 | start_dac(s); |
1581 | else | 1587 | spin_unlock_irqrestore(&s->lock, flags); |
1588 | } else | ||
1582 | stop_dac(s); | 1589 | stop_dac(s); |
1583 | } | 1590 | } |
1584 | return 0; | 1591 | return 0; |