[arch-commits] Commit in fcpcmcia/trunk (3 files)
Date: Monday, November 1, 2010 @ 06:06:52 Author: tpowa Revision: 97692 upgpkg: fcpcmcia 31107-54 bump to .36 kernel series Added: fcpcmcia/trunk/kernel-2.6.36.patch Modified: fcpcmcia/trunk/PKGBUILD fcpcmcia/trunk/fcpcmcia.install -+ PKGBUILD| 44 ++--- fcpcmcia.install|4 +- kernel-2.6.36.patch | 74 ++ 3 files changed, 110 insertions(+), 12 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-11-01 09:39:17 UTC (rev 97691) +++ PKGBUILD2010-11-01 10:06:52 UTC (rev 97692) @@ -3,17 +3,27 @@ pkgname=fcpcmcia pkgver=31107 -pkgrel=53 -_kernver=2.6.35-ARCH +pkgrel=54 +_kernver=2.6.36-ARCH pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For stock arch 2.6 kernel" arch=(i686 x86_64) license=('custom:"AVM"' 'LPGL') url="http://www.avm.de"; -depends=('capi4k-utils' 'kernel26>=2.6.35' 'kernel26<2.6.36') -makedepends=('kernel26-headers>=2.6.35' 'kernel26-headers<2.6.36') +depends=('capi4k-utils' 'kernel26>=2.6.36' 'kernel26<2.6.37') +makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37') if [ "$CARCH" = "i686" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux/suse.93/fcpcmcia-suse93-3.11-07.tar.gz -pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch\ -kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch kernel-2.6.33.patch kernel-2.6.34.patch kernel-2.6.35.patch) +pcmcia-2.6.17.patch +atomic.patch kernel-2.6.19.patch +kernel-2.6.20.patch +kernel-2.6.22.patch +kernel-2.6.24.patch +kernel-2.6.27.patch +kernel-2.6.28.patch +kernel-2.6.31.patch +kernel-2.6.33.patch +kernel-2.6.34.patch +kernel-2.6.35.patch +kernel-2.6.36.patch) md5sums=('96fc3e72afdc2087b4dafe41c069ec18' 'ec21dee3a5a09203dc55b399c29bc58c' '258b13bb2ac46960b9c91635f02cd080' @@ -26,11 +36,23 @@ '34f5b78b219de8ce12793b16e0171e87' '410f077bbe271e924be6d8b6b5f9540d' '224a7679645a51929f8d5e1f210d7a9e' - '3a8dcddd077fc301a23a038d5f0aa11f') + '3a8dcddd077fc301a23a038d5f0aa11f' + '21ccb623540d866091eb918a3d5b2358') fi if [ "$CARCH" = "x86_64" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux_64bit/suse.10.0/fcpcmcia-suse10.0-64bit-3.11-07.tar.gz -pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch\ -kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch kernel-2.6.33.patch kernel-2.6.34.patch kernel-2.6.35.patch) +pcmcia-2.6.17.patch +atomic.patch +kernel-2.6.19.patch +kernel-2.6.20.patch +kernel-2.6.22.patch +kernel-2.6.24.patch +kernel-2.6.27.patch +kernel-2.6.28.patch +kernel-2.6.31.patch +kernel-2.6.33.patch +kernel-2.6.34.patch +kernel-2.6.35.patch +kernel-2.6.36.patch) md5sums=('4f461710cf57ebf50b3c4f2842288752' 'ec21dee3a5a09203dc55b399c29bc58c' '258b13bb2ac46960b9c91635f02cd080' @@ -43,7 +65,8 @@ '34f5b78b219de8ce12793b16e0171e87' '410f077bbe271e924be6d8b6b5f9540d' '224a7679645a51929f8d5e1f210d7a9e' - '3a8dcddd077fc301a23a038d5f0aa11f') + '3a8dcddd077fc301a23a038d5f0aa11f' + '21ccb623540d866091eb918a3d5b2358') fi install=(fcpcmcia.install) options=(!makeflags) @@ -61,6 +84,7 @@ patch -Np0 -i ../../kernel-2.6.33.patch patch -Np0 -i ../../kernel-2.6.34.patch patch -Np0 -i ../../kernel-2.6.35.patch + patch -Np0 -i ../../kernel-2.6.36.patch cd .. # fix from Karsten Keil Modified: fcpcmcia.install === --- fcpcmcia.install2010-11-01 09:39:17 UTC (rev 97691) +++ fcpcmcia.install2010-11-01 10:06:52 UTC (rev 97692) @@ -9,7 +9,7 @@ sed -i -e 's/#fcpcmcia - - - - - -/fcpcmcia - - - - - -/g' /etc/capi.conf # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.35-ARCH + KERNEL_VERSION=2.6.36-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 } @@ -24,7 +24,7 @@ sed -i -e 's/fcpcmcia- - - - - -/#fcpcmcia - - - - - -/g' /etc/capi.conf # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.35-ARCH + KERNEL_VERSION=2.6.36-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 } Added: kernel-2.6.36.patch === --- kernel-2.6.36.patch
[arch-commits] Commit in fcpcmcia/trunk (3 files)
Date: Wednesday, August 4, 2010 @ 16:21:44 Author: tpowa Revision: 86809 upgpkg: fcpcmcia 31107-52 bump to new major kernel Modified: fcpcmcia/trunk/PKGBUILD fcpcmcia/trunk/fcpcmcia.install fcpcmcia/trunk/kernel-2.6.35.patch -+ PKGBUILD|4 +- fcpcmcia.install|4 +- kernel-2.6.35.patch | 79 ++ 3 files changed, 83 insertions(+), 4 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-08-04 19:40:34 UTC (rev 86808) +++ PKGBUILD2010-08-04 20:21:44 UTC (rev 86809) @@ -26,7 +26,7 @@ '34f5b78b219de8ce12793b16e0171e87' '410f077bbe271e924be6d8b6b5f9540d' '224a7679645a51929f8d5e1f210d7a9e' - 'd2ee9899095c23535f31ba4f2e4759e7') + '3a8dcddd077fc301a23a038d5f0aa11f') fi if [ "$CARCH" = "x86_64" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux_64bit/suse.10.0/fcpcmcia-suse10.0-64bit-3.11-07.tar.gz pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch\ @@ -43,7 +43,7 @@ '34f5b78b219de8ce12793b16e0171e87' '410f077bbe271e924be6d8b6b5f9540d' '224a7679645a51929f8d5e1f210d7a9e' - 'd2ee9899095c23535f31ba4f2e4759e7') + '3a8dcddd077fc301a23a038d5f0aa11f') fi install=(fcpcmcia.install) options=(!makeflags) Modified: fcpcmcia.install === --- fcpcmcia.install2010-08-04 19:40:34 UTC (rev 86808) +++ fcpcmcia.install2010-08-04 20:21:44 UTC (rev 86809) @@ -9,7 +9,7 @@ sed -i -e 's/#fcpcmcia - - - - - -/fcpcmcia - - - - - -/g' /etc/capi.conf # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.34-ARCH + KERNEL_VERSION=2.6.35-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 } @@ -24,7 +24,7 @@ sed -i -e 's/fcpcmcia- - - - - -/#fcpcmcia - - - - - -/g' /etc/capi.conf # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.34-ARCH + KERNEL_VERSION=2.6.35-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 } Modified: kernel-2.6.35.patch === --- kernel-2.6.35.patch 2010-08-04 19:40:34 UTC (rev 86808) +++ kernel-2.6.35.patch 2010-08-04 20:21:44 UTC (rev 86809) @@ -100,3 +100,82 @@ } /* cs_attach */ /*== +--- fcpcmcia_cs.c~ 2010-08-04 22:01:27.123336123 +0200 fcpcmcia_cs.c 2010-08-04 22:01:27.150002183 +0200 +@@ -146,9 +146,6 @@ + p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8; + p_dev->io.NumPorts2 = 0; + +-/* Interrupt setup */ +-p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING; +- + #if defined (PCMCIA_IRQ_INFO2) + p_dev->irq.IRQInfo1 = IRQ_INFO2_VALID|IRQ_LEVEL_ID; + if (irq_list_count > 0) { +@@ -214,7 +211,7 @@ + + static int cs_config(struct pcmcia_device *link) + { +-int i; ++int i = -1; + char devname[128]; + + devname[0] = 0; +@@ -228,8 +225,7 @@ + /* +* allocate an interrupt line +*/ +- i = pcmcia_request_irq(link, &link->irq); +- if (i != 0) { ++ if (!link->irq) { + /* undo */ + pcmcia_disable_device(link); + break; +@@ -259,7 +255,7 @@ + "Failed to add AVM-%s-Controller at i/o %x, irq %d\n", + dev->node.dev_name, + link->io.BasePort1, +- link->irq.AssignedIRQ ++ link->irq + ); + cs_release(link); + return -ENODEV; +@@ -270,7 +266,7 @@ + "Card driver for '%s' has been set up: i/o %x, irq %d\n", + devname, + link->io.BasePort1, +- link->irq.AssignedIRQ ++ link->irq + ); + return 0; + } /* cs_config */ +--- fcpcmcia_cs.c~ 2010-08-04 22:04:40.550002169 +0200 fcpcmcia_cs.c 2010-08-04 22:04:40.573335565 +0200 +@@ -250,7 +250,7 @@ + } + NOTE("Ready to call card driver for '%s'...\n", devname); + +-if ((i = fcpcmcia_addcard(link->io.BasePort1, link->irq.AssignedIRQ)) < 0) { ++if ((i = fcpcmcia_addcard(link->io.BasePort1, link->irq)) < 0) { + ERROR( + "Failed to add AVM-%s-Controller at i/o %x, irq %d\n", + dev->node.dev_name, +@@ -281,7 +281,7 @@ + + static void cs_release(struct pcmcia_device *link) + { +-fcpcmcia_delcard(link->io.BasePort1, link->irq.AssignedIRQ); ++fcpcmcia_delcard(link->io.BasePort1, link->irq); + + pcmcia_disable_device(link); + } /* cs_release */ +--- fcpcmcia_cs.c~ 2010-08-04 22:22:29.090002845 +0200 fcpcmcia_cs.c 2010-08-04 2
[arch-commits] Commit in fcpcmcia/trunk (3 files)
Date: Wednesday, August 4, 2010 @ 15:40:34 Author: tpowa Revision: 86808 add patches Added: fcpcmcia/trunk/kernel-2.6.31.patch fcpcmcia/trunk/kernel-2.6.35.patch Modified: fcpcmcia/trunk/PKGBUILD -+ PKGBUILD| 41 ++-- kernel-2.6.31.patch | 11 + kernel-2.6.35.patch | 102 ++ 3 files changed, 135 insertions(+), 19 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-08-04 19:33:22 UTC (rev 86807) +++ PKGBUILD2010-08-04 19:40:34 UTC (rev 86808) @@ -3,17 +3,17 @@ pkgname=fcpcmcia pkgver=31107 -pkgrel=51 -_kernver=2.6.34-ARCH +pkgrel=52 +_kernver=2.6.35-ARCH pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For stock arch 2.6 kernel" arch=(i686 x86_64) license=('custom:"AVM"' 'LPGL') url="http://www.avm.de"; -depends=('capi4k-utils' 'kernel26>=2.6.34' 'kernel26<2.6.35') -makedepends=('kernel26-headers>=2.6.34' 'kernel26-headers<2.6.35') +depends=('capi4k-utils' 'kernel26>=2.6.35' 'kernel26<2.6.36') +makedepends=('kernel26-headers>=2.6.35' 'kernel26-headers<2.6.36') if [ "$CARCH" = "i686" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux/suse.93/fcpcmcia-suse93-3.11-07.tar.gz pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch\ -kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch kernel-2.6.33.patch kernel-2.6.34.patch) +kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch kernel-2.6.33.patch kernel-2.6.34.patch kernel-2.6.35.patch) md5sums=('96fc3e72afdc2087b4dafe41c069ec18' 'ec21dee3a5a09203dc55b399c29bc58c' '258b13bb2ac46960b9c91635f02cd080' @@ -25,11 +25,12 @@ 'e953a90fe3d08ebbd8736f66902414dc' '34f5b78b219de8ce12793b16e0171e87' '410f077bbe271e924be6d8b6b5f9540d' - '224a7679645a51929f8d5e1f210d7a9e') + '224a7679645a51929f8d5e1f210d7a9e' + 'd2ee9899095c23535f31ba4f2e4759e7') fi if [ "$CARCH" = "x86_64" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux_64bit/suse.10.0/fcpcmcia-suse10.0-64bit-3.11-07.tar.gz pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch\ -kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch kernel-2.6.33.patch kernel-2.6.34.patch) +kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch kernel-2.6.33.patch kernel-2.6.34.patch kernel-2.6.35.patch) md5sums=('4f461710cf57ebf50b3c4f2842288752' 'ec21dee3a5a09203dc55b399c29bc58c' '258b13bb2ac46960b9c91635f02cd080' @@ -41,23 +42,25 @@ 'e953a90fe3d08ebbd8736f66902414dc' '34f5b78b219de8ce12793b16e0171e87' '410f077bbe271e924be6d8b6b5f9540d' - '224a7679645a51929f8d5e1f210d7a9e') + '224a7679645a51929f8d5e1f210d7a9e' + 'd2ee9899095c23535f31ba4f2e4759e7') fi install=(fcpcmcia.install) options=(!makeflags) build() { cd $srcdir/fritz/src - [ "$CARCH" = "i686" ] && (patch -Np0 -i ../../atomic.patch || return 1) - patch -Np0 -i ../../pcmcia-2.6.17.patch || return 1 - patch -Np0 -i ../../kernel-2.6.19.patch || return 1 - patch -Np0 -i ../../kernel-2.6.20.patch || return 1 - patch -Np0 -i ../../kernel-2.6.22.patch || return 1 - patch -Np0 -i ../../kernel-2.6.24.patch || return 1 - patch -Np2 -i ../../kernel-2.6.27.patch || return 1 - patch -Np1 -i ../../kernel-2.6.28.patch || return 1 - patch -Np0 -i ../../kernel-2.6.31.patch || return 1 - patch -Np0 -i ../../kernel-2.6.33.patch || return 1 - patch -Np0 -i ../../kernel-2.6.34.patch || return 1 + [ "$CARCH" = "i686" ] && (patch -Np0 -i ../../atomic.patch) + patch -Np0 -i ../../pcmcia-2.6.17.patch + patch -Np0 -i ../../kernel-2.6.19.patch + patch -Np0 -i ../../kernel-2.6.20.patch + patch -Np0 -i ../../kernel-2.6.22.patch + patch -Np0 -i ../../kernel-2.6.24.patch + patch -Np2 -i ../../kernel-2.6.27.patch + patch -Np1 -i ../../kernel-2.6.28.patch + patch -Np0 -i ../../kernel-2.6.31.patch + patch -Np0 -i ../../kernel-2.6.33.patch + patch -Np0 -i ../../kernel-2.6.34.patch + patch -Np0 -i ../../kernel-2.6.35.patch cd .. # fix from Karsten Keil Added: kernel-2.6.31.patch === --- kernel-2.6.31.patch (rev 0) +++ kernel-2.6.31.patch 2010-08-04 19:40:34 UTC (rev 86808) @@ -0,0 +1,11 @@ +--- driver.c~ 2009-09-10 16:21:39.0 +0200 driver.c 2009-09-10 16:21:39.0 +0200 +@@ -569,7 +569,7 @@ + } + } + stop (card); +- capi_ctr_reseted (ctrl); ++ capi_ctr_down (ctrl); + #if defined (__fcpnp__) + pnp_disable_dev (card->dev); + #endif Added: kernel-2.6.35.patch === --- kernel-2.6.35.patch
[arch-commits] Commit in fcpcmcia/trunk (3 files)
Date: Saturday, February 27, 2010 @ 12:38:42 Author: tpowa Revision: 70635 upgpkg: fcpcmcia 31107-50 rebuild against .33 kernel Added: fcpcmcia/trunk/kernel-2.6.33.patch Modified: fcpcmcia/trunk/PKGBUILD fcpcmcia/trunk/fcpcmcia.install -+ PKGBUILD| 19 ++--- fcpcmcia.install|4 - kernel-2.6.33.patch | 188 ++ 3 files changed, 201 insertions(+), 10 deletions(-) Modified: PKGBUILD === --- PKGBUILD2010-02-27 17:34:45 UTC (rev 70634) +++ PKGBUILD2010-02-27 17:38:42 UTC (rev 70635) @@ -3,17 +3,17 @@ pkgname=fcpcmcia pkgver=31107 -pkgrel=49 -_kernver=2.6.32-ARCH +pkgrel=50 +_kernver=2.6.33-ARCH pkgdesc="AVM ISDN driver for FRITZ PCMCIA isdn cards. For stock arch 2.6 kernel" arch=(i686 x86_64) license=('custom:"AVM"' 'LPGL') url="http://www.avm.de"; -depends=('capi4k-utils' 'kernel26>=2.6.32.3' 'kernel26<2.6.33') -makedepends=('kernel26-headers>=2.6.32' 'kernel26-headers<2.6.33') +depends=('capi4k-utils' 'kernel26>=2.6.33' 'kernel26<2.6.34') +makedepends=('kernel26-headers>=2.6.33' 'kernel26-headers<2.6.34') if [ "$CARCH" = "i686" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux/suse.93/fcpcmcia-suse93-3.11-07.tar.gz pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch\ -kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch) +kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch kernel-2.6.33.patch) md5sums=('96fc3e72afdc2087b4dafe41c069ec18' 'ec21dee3a5a09203dc55b399c29bc58c' '258b13bb2ac46960b9c91635f02cd080' @@ -23,11 +23,12 @@ '21bfa466b1fb94663ed1f265948dba5e' 'e32439084b62ee7975ae45a443b6eba9' 'e953a90fe3d08ebbd8736f66902414dc' - '34f5b78b219de8ce12793b16e0171e87') + '34f5b78b219de8ce12793b16e0171e87' + '410f077bbe271e924be6d8b6b5f9540d') fi if [ "$CARCH" = "x86_64" ]; then source=(ftp://ftp.avm.de/cardware/fritzcrd.pcm/linux_64bit/suse.10.0/fcpcmcia-suse10.0-64bit-3.11-07.tar.gz pcmcia-2.6.17.patch atomic.patch kernel-2.6.19.patch kernel-2.6.20.patch kernel-2.6.22.patch kernel-2.6.24.patch\ -kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch) +kernel-2.6.27.patch kernel-2.6.28.patch kernel-2.6.31.patch kernel-2.6.33.patch) md5sums=('4f461710cf57ebf50b3c4f2842288752' 'ec21dee3a5a09203dc55b399c29bc58c' '258b13bb2ac46960b9c91635f02cd080' @@ -37,7 +38,8 @@ '21bfa466b1fb94663ed1f265948dba5e' 'e32439084b62ee7975ae45a443b6eba9' 'e953a90fe3d08ebbd8736f66902414dc' - '34f5b78b219de8ce12793b16e0171e87') + '34f5b78b219de8ce12793b16e0171e87' + '410f077bbe271e924be6d8b6b5f9540d') fi install=(fcpcmcia.install) options=(!makeflags) @@ -52,6 +54,7 @@ patch -Np2 -i ../../kernel-2.6.27.patch || return 1 patch -Np1 -i ../../kernel-2.6.28.patch || return 1 patch -Np0 -i ../../kernel-2.6.31.patch || return 1 + patch -Np0 -i ../../kernel-2.6.33.patch || return 1 cd .. # fix from Karsten Keil Modified: fcpcmcia.install === --- fcpcmcia.install2010-02-27 17:34:45 UTC (rev 70634) +++ fcpcmcia.install2010-02-27 17:38:42 UTC (rev 70635) @@ -9,7 +9,7 @@ sed -i -e 's/#fcpcmcia - - - - - -/fcpcmcia - - - - - -/g' /etc/capi.conf # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.32-ARCH + KERNEL_VERSION=2.6.33-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 } @@ -24,7 +24,7 @@ sed -i -e 's/fcpcmcia- - - - - -/#fcpcmcia - - - - - -/g' /etc/capi.conf # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - KERNEL_VERSION=2.6.32-ARCH + KERNEL_VERSION=2.6.33-ARCH depmod -v $KERNEL_VERSION > /dev/null 2>&1 } Added: kernel-2.6.33.patch === --- kernel-2.6.33.patch (rev 0) +++ kernel-2.6.33.patch 2010-02-27 17:38:42 UTC (rev 70635) @@ -0,0 +1,188 @@ +--- fcpcmcia_cs.c~ 2010-02-27 14:28:58.0 +0100 fcpcmcia_cs.c 2010-02-27 14:28:58.0 +0100 +@@ -186,8 +186,6 @@ + for (i = 0; (i < irq_list_count) && (default_irq_list[i] > 0); i++) + p_dev->irq.IRQInfo2 |= 1 << default_irq_list[i]; + } +-#else +-p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID; + #endif + + /* General socket configuration */ +--- fcpcmcia_cs.c~ 2010-02-27 14:42:09.0 +0100 fcpcmcia_cs.c 2010-02-27 14:40:10.0 +0100 +@@ -175,7 +175,7 @@ + p_dev->io.NumPorts2 = 0; + + /