* [ALSA - driver 0000665]: Build failure in /usr/src/alsa/alsa-driver/acore/init.c
@ 2004-11-24 11:19 bugtrack
0 siblings, 0 replies; 9+ messages in thread
From: bugtrack @ 2004-11-24 11:19 UTC (permalink / raw)
To: alsa-devel
The following issue has been RESOLVED.
======================================================================
<https://bugtrack.alsa-project.org/alsa-bug/view.php?id=665>
======================================================================
Reported By: ronis
Assigned To: perex
======================================================================
Project: ALSA - driver
Issue ID: 665
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: normal
Status: resolved
Distribution:
Kernel Version:
Resolution: not an issue
Fixed in Version:
======================================================================
Date Submitted: 11-22-2004 19:31 CET
Last Modified: 11-24-2004 12:19 CET
======================================================================
Summary: Build failure in
/usr/src/alsa/alsa-driver/acore/init.c
Description:
There's an unterminated #ifdef in init.c. (PM_CONFIG or more likely
CONFIG_PCI). Here's the log:
CC [M] /usr/src/alsa/alsa-driver/acore/init.o
/usr/src/alsa/alsa-driver/acore/init.c:680:1: unterminated #ifdef
make[4]: *** [/usr/src/alsa/alsa-driver/acore/init.o] Error 1
make[3]: *** [/usr/src/alsa/alsa-driver/acore] Error 2
make[2]: *** [_module_/usr/src/alsa/alsa-driver] Error 2
make[1]: *** [modules] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.9'
make: *** [compile] Error 2
Adding an extra #endif at the end of the file fixes things, although, I'm
not 100% sure that this is the right place top put things.
(BTW, I'm now running 2.6.9 but didn't have a chance to midify my
profile)
======================================================================
----------------------------------------------------------------------
ronis - 11-23-04 22:15
----------------------------------------------------------------------
OK I moved all the alsa-* directories out of the way, did cvs -z3 update
-dP, followed by my usual build script. The build now completes fully
and there are no
rejected patch files. Better yet, the driver works.
As you thought, my CVS tree must have been corrupted somehow.
I guess this can be closed.
Thanks for your help.
----------------------------------------------------------------------
tiwai - 11-24-04 12:19
----------------------------------------------------------------------
Ok, closed now.
Issue History
Date Modified Username Field Change
======================================================================
11-22-04 19:31 ronis New Issue
11-23-04 15:59 tiwai Note Added: 0002517
11-23-04 16:52 ronis Note Added: 0002523
11-23-04 17:44 tiwai Note Added: 0002524
11-23-04 18:20 ronis Note Added: 0002525
11-23-04 18:27 tiwai Note Added: 0002526
11-23-04 22:15 ronis Note Added: 0002535
11-24-04 12:19 tiwai Status assigned => resolved
11-24-04 12:19 tiwai Resolution open => not an issue
11-24-04 12:19 tiwai Note Added: 0002548
======================================================================
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ALSA - driver 0000665]: Build failure in /usr/src/alsa/alsa-driver/acore/init.c
@ 2004-12-27 14:48 bugtrack
0 siblings, 0 replies; 9+ messages in thread
From: bugtrack @ 2004-12-27 14:48 UTC (permalink / raw)
To: alsa-devel
The following issue has been CLOSED
======================================================================
<https://bugtrack.alsa-project.org/alsa-bug/view.php?id=665>
======================================================================
Reported By: ronis
Assigned To: perex
======================================================================
Project: ALSA - driver
Issue ID: 665
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: normal
Status: closed
Distribution:
Kernel Version:
Resolution: not an issue
Fixed in Version:
======================================================================
Date Submitted: 11-22-2004 19:31 CET
Last Modified: 12-27-2004 15:48 CET
======================================================================
Summary: Build failure in
/usr/src/alsa/alsa-driver/acore/init.c
Description:
There's an unterminated #ifdef in init.c. (PM_CONFIG or more likely
CONFIG_PCI). Here's the log:
CC [M] /usr/src/alsa/alsa-driver/acore/init.o
/usr/src/alsa/alsa-driver/acore/init.c:680:1: unterminated #ifdef
make[4]: *** [/usr/src/alsa/alsa-driver/acore/init.o] Error 1
make[3]: *** [/usr/src/alsa/alsa-driver/acore] Error 2
make[2]: *** [_module_/usr/src/alsa/alsa-driver] Error 2
make[1]: *** [modules] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.9'
make: *** [compile] Error 2
Adding an extra #endif at the end of the file fixes things, although, I'm
not 100% sure that this is the right place top put things.
(BTW, I'm now running 2.6.9 but didn't have a chance to midify my
profile)
======================================================================
----------------------------------------------------------------------
ronis - 11-23-04 22:15
----------------------------------------------------------------------
OK I moved all the alsa-* directories out of the way, did cvs -z3 update
-dP, followed by my usual build script. The build now completes fully
and there are no
rejected patch files. Better yet, the driver works.
As you thought, my CVS tree must have been corrupted somehow.
I guess this can be closed.
Thanks for your help.
----------------------------------------------------------------------
tiwai - 11-24-04 12:19
----------------------------------------------------------------------
Ok, closed now.
Issue History
Date Modified Username Field Change
======================================================================
11-22-04 19:31 ronis New Issue
11-23-04 15:59 tiwai Note Added: 0002517
11-23-04 16:52 ronis Note Added: 0002523
11-23-04 17:44 tiwai Note Added: 0002524
11-23-04 18:20 ronis Note Added: 0002525
11-23-04 18:27 tiwai Note Added: 0002526
11-23-04 22:15 ronis Note Added: 0002535
11-24-04 12:19 tiwai Status assigned => resolved
11-24-04 12:19 tiwai Resolution open => not an issue
11-24-04 12:19 tiwai Note Added: 0002548
12-27-04 15:48 tiwai Status resolved => closed
======================================================================
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ALSA - driver 0000665]: Build failure in /usr/src/alsa/alsa-driver/acore/init.c
@ 2004-11-23 21:15 bugtrack
0 siblings, 0 replies; 9+ messages in thread
From: bugtrack @ 2004-11-23 21:15 UTC (permalink / raw)
To: alsa-devel
A NOTE has been added to this issue.
======================================================================
<https://bugtrack.alsa-project.org/alsa-bug/view.php?id=665>
======================================================================
Reported By: ronis
Assigned To: perex
======================================================================
Project: ALSA - driver
Issue ID: 665
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: normal
Status: assigned
Distribution:
Kernel Version:
======================================================================
Date Submitted: 11-22-2004 19:31 CET
Last Modified: 11-23-2004 22:15 CET
======================================================================
Summary: Build failure in
/usr/src/alsa/alsa-driver/acore/init.c
Description:
There's an unterminated #ifdef in init.c. (PM_CONFIG or more likely
CONFIG_PCI). Here's the log:
CC [M] /usr/src/alsa/alsa-driver/acore/init.o
/usr/src/alsa/alsa-driver/acore/init.c:680:1: unterminated #ifdef
make[4]: *** [/usr/src/alsa/alsa-driver/acore/init.o] Error 1
make[3]: *** [/usr/src/alsa/alsa-driver/acore] Error 2
make[2]: *** [_module_/usr/src/alsa/alsa-driver] Error 2
make[1]: *** [modules] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.9'
make: *** [compile] Error 2
Adding an extra #endif at the end of the file fixes things, although, I'm
not 100% sure that this is the right place top put things.
(BTW, I'm now running 2.6.9 but didn't have a chance to midify my
profile)
======================================================================
----------------------------------------------------------------------
tiwai - 11-23-04 18:27
----------------------------------------------------------------------
Hmm, it works fine on my system. At least there should be no rejected
files. So, I suspect that your tree is somehow broken.
Try once cvs clean checkout.
----------------------------------------------------------------------
ronis - 11-23-04 22:15
----------------------------------------------------------------------
OK I moved all the alsa-* directories out of the way, did cvs -z3 update
-dP, followed by my usual build script. The build now completes fully
and there are no
rejected patch files. Better yet, the driver works.
As you thought, my CVS tree must have been corrupted somehow.
I guess this can be closed.
Thanks for your help.
Issue History
Date Modified Username Field Change
======================================================================
11-22-04 19:31 ronis New Issue
11-23-04 15:59 tiwai Note Added: 0002517
11-23-04 16:52 ronis Note Added: 0002523
11-23-04 17:44 tiwai Note Added: 0002524
11-23-04 18:20 ronis Note Added: 0002525
11-23-04 18:27 tiwai Note Added: 0002526
11-23-04 22:15 ronis Note Added: 0002535
======================================================================
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ALSA - driver 0000665]: Build failure in /usr/src/alsa/alsa-driver/acore/init.c
@ 2004-11-23 17:27 bugtrack
0 siblings, 0 replies; 9+ messages in thread
From: bugtrack @ 2004-11-23 17:27 UTC (permalink / raw)
To: alsa-devel
A NOTE has been added to this issue.
======================================================================
<https://bugtrack.alsa-project.org/alsa-bug/view.php?id=665>
======================================================================
Reported By: ronis
Assigned To: perex
======================================================================
Project: ALSA - driver
Issue ID: 665
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: normal
Status: assigned
Distribution:
Kernel Version:
======================================================================
Date Submitted: 11-22-2004 19:31 CET
Last Modified: 11-23-2004 18:27 CET
======================================================================
Summary: Build failure in
/usr/src/alsa/alsa-driver/acore/init.c
Description:
There's an unterminated #ifdef in init.c. (PM_CONFIG or more likely
CONFIG_PCI). Here's the log:
CC [M] /usr/src/alsa/alsa-driver/acore/init.o
/usr/src/alsa/alsa-driver/acore/init.c:680:1: unterminated #ifdef
make[4]: *** [/usr/src/alsa/alsa-driver/acore/init.o] Error 1
make[3]: *** [/usr/src/alsa/alsa-driver/acore] Error 2
make[2]: *** [_module_/usr/src/alsa/alsa-driver] Error 2
make[1]: *** [modules] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.9'
make: *** [compile] Error 2
Adding an extra #endif at the end of the file fixes things, although, I'm
not 100% sure that this is the right place top put things.
(BTW, I'm now running 2.6.9 but didn't have a chance to midify my
profile)
======================================================================
----------------------------------------------------------------------
ronis - 11-23-04 18:20
----------------------------------------------------------------------
Yes. Basically, the first think I do is to run "cvs -z3 update -dP" from
the directory
above all my alsa-* directories.
On the other hand, I don't actually do anything in the kernel tree. My
build-script
works in
DIRS=( lib driver oss tools utils ) (alsa- is prepeded to each entry)
FLAGS=( "--with-debug=no --with-gnu-ld"
"--with-cards=atiixp,atiixp-modem --with-sequencer=yes"
"--disable-alsatest --with-gnu-ld"
"--disable-alsatest --with-gnu-ld"
"--disable-alsatest --with-gnu-ld" )
(the FLAGS are what I configure with in each, and then run make)
----------------------------------------------------------------------
tiwai - 11-23-04 18:27
----------------------------------------------------------------------
Hmm, it works fine on my system. At least there should be no rejected
files. So, I suspect that your tree is somehow broken.
Try once cvs clean checkout.
Issue History
Date Modified Username Field Change
======================================================================
11-22-04 19:31 ronis New Issue
11-23-04 15:59 tiwai Note Added: 0002517
11-23-04 16:52 ronis Note Added: 0002523
11-23-04 17:44 tiwai Note Added: 0002524
11-23-04 18:20 ronis Note Added: 0002525
11-23-04 18:27 tiwai Note Added: 0002526
======================================================================
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ALSA - driver 0000665]: Build failure in /usr/src/alsa/alsa-driver/acore/init.c
@ 2004-11-23 17:20 bugtrack
0 siblings, 0 replies; 9+ messages in thread
From: bugtrack @ 2004-11-23 17:20 UTC (permalink / raw)
To: alsa-devel
A NOTE has been added to this issue.
======================================================================
<https://bugtrack.alsa-project.org/alsa-bug/view.php?id=665>
======================================================================
Reported By: ronis
Assigned To: perex
======================================================================
Project: ALSA - driver
Issue ID: 665
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: normal
Status: assigned
Distribution:
Kernel Version:
======================================================================
Date Submitted: 11-22-2004 19:31 CET
Last Modified: 11-23-2004 18:20 CET
======================================================================
Summary: Build failure in
/usr/src/alsa/alsa-driver/acore/init.c
Description:
There's an unterminated #ifdef in init.c. (PM_CONFIG or more likely
CONFIG_PCI). Here's the log:
CC [M] /usr/src/alsa/alsa-driver/acore/init.o
/usr/src/alsa/alsa-driver/acore/init.c:680:1: unterminated #ifdef
make[4]: *** [/usr/src/alsa/alsa-driver/acore/init.o] Error 1
make[3]: *** [/usr/src/alsa/alsa-driver/acore] Error 2
make[2]: *** [_module_/usr/src/alsa/alsa-driver] Error 2
make[1]: *** [modules] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.9'
make: *** [compile] Error 2
Adding an extra #endif at the end of the file fixes things, although, I'm
not 100% sure that this is the right place top put things.
(BTW, I'm now running 2.6.9 but didn't have a chance to midify my
profile)
======================================================================
----------------------------------------------------------------------
tiwai - 11-23-04 17:44
----------------------------------------------------------------------
Did you update both alsa-driver and alsa-kernel trees?
----------------------------------------------------------------------
ronis - 11-23-04 18:20
----------------------------------------------------------------------
Yes. Basically, the first think I do is to run "cvs -z3 update -dP" from
the directory
above all my alsa-* directories.
On the other hand, I don't actually do anything in the kernel tree. My
build-script
works in
DIRS=( lib driver oss tools utils ) (alsa- is prepeded to each entry)
FLAGS=( "--with-debug=no --with-gnu-ld"
"--with-cards=atiixp,atiixp-modem --with-sequencer=yes"
"--disable-alsatest --with-gnu-ld"
"--disable-alsatest --with-gnu-ld"
"--disable-alsatest --with-gnu-ld" )
(the FLAGS are what I configure with in each, and then run make)
Issue History
Date Modified Username Field Change
======================================================================
11-22-04 19:31 ronis New Issue
11-23-04 15:59 tiwai Note Added: 0002517
11-23-04 16:52 ronis Note Added: 0002523
11-23-04 17:44 tiwai Note Added: 0002524
11-23-04 18:20 ronis Note Added: 0002525
======================================================================
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ALSA - driver 0000665]: Build failure in /usr/src/alsa/alsa-driver/acore/init.c
@ 2004-11-23 16:44 bugtrack
0 siblings, 0 replies; 9+ messages in thread
From: bugtrack @ 2004-11-23 16:44 UTC (permalink / raw)
To: alsa-devel
A NOTE has been added to this issue.
======================================================================
<https://bugtrack.alsa-project.org/alsa-bug/view.php?id=665>
======================================================================
Reported By: ronis
Assigned To: perex
======================================================================
Project: ALSA - driver
Issue ID: 665
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: normal
Status: assigned
Distribution:
Kernel Version:
======================================================================
Date Submitted: 11-22-2004 19:31 CET
Last Modified: 11-23-2004 17:44 CET
======================================================================
Summary: Build failure in
/usr/src/alsa/alsa-driver/acore/init.c
Description:
There's an unterminated #ifdef in init.c. (PM_CONFIG or more likely
CONFIG_PCI). Here's the log:
CC [M] /usr/src/alsa/alsa-driver/acore/init.o
/usr/src/alsa/alsa-driver/acore/init.c:680:1: unterminated #ifdef
make[4]: *** [/usr/src/alsa/alsa-driver/acore/init.o] Error 1
make[3]: *** [/usr/src/alsa/alsa-driver/acore] Error 2
make[2]: *** [_module_/usr/src/alsa/alsa-driver] Error 2
make[1]: *** [modules] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.9'
make: *** [compile] Error 2
Adding an extra #endif at the end of the file fixes things, although, I'm
not 100% sure that this is the right place top put things.
(BTW, I'm now running 2.6.9 but didn't have a chance to midify my
profile)
======================================================================
----------------------------------------------------------------------
ronis - 11-23-04 16:52
----------------------------------------------------------------------
I just tried the latest CVS and got the same result. I looked a little
further and noticed that part of the build patches various files, and that
some of these patches failed; specifically,
./acore/seq/seq.c.rej
./acore/info.c.rej
./acore/pcm_native.c.rej
./acore/init.c.rej
./acore/sound.c.rej
./pci/bt87x.c.rej
./pcmcia/pdaudiocf/pdaudiocf.c.rej
./pcmcia/vx/vxpocket.c.rej
./usb/usbaudio.c.rej
(others worked, albeit with various offets). Here are the rejected
patches from init.c:
***************
*** 791,797 ****
return 0;
/* FIXME: correct state value? */
err = card->pm_suspend(card, 0);
pci_save_state(dev);
return err;
}
--- 825,835 ----
return 0;
/* FIXME: correct state value? */
err = card->pm_suspend(card, 0);
+ #ifndef CONFIG_HAVE_PCI_SAVED_CONFIG
+ pci_save_state(dev, &pci_saved_config[card->number][0]);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
pci_save_state(dev);
+ #endif
return err;
}
***************
*** 803,812 ****
if (card->power_state == SNDRV_CTL_POWER_D0)
return 0;
/* restore the PCI config space */
pci_restore_state(dev);
/* FIXME: correct state value? */
return card->pm_resume(card, 0);
}
- #endif
#endif /* CONFIG_PM */
--- 841,858 ----
if (card->power_state == SNDRV_CTL_POWER_D0)
return 0;
/* restore the PCI config space */
+ #ifndef CONFIG_HAVE_PCI_SAVED_CONFIG
+ pci_restore_state(dev, &pci_saved_config[card->number][0]);
+ #elif defined(CONFIG_HAVE_NEW_PCI_SAVE_STATE)
pci_restore_state(dev);
+ #else
+ pci_restore_state(dev, dev->saved_config_space);
+ #endif
/* FIXME: correct state value? */
return card->pm_resume(card, 0);
}
+
+ #endif /* PCI_OLD_SUSPEND */
+ #endif /* CONFIG_PCI */
#endif /* CONFIG_PM */
I think my missing #endif is the /*CONFIG_PCI*/ one at the bottom, but
clearly much more is broken.
Something is wrong. I've looked in acore/init.c for lines like
***************pci_save_state(dev, &pci_saved_config[card->number][0]);
}
*** 791,797 ****
return 0;
/* FIXME: correct state value? */
err = card->pm_suspend(card, 0);
pci_save_state(dev);
return err;
They aren't there; moreover, pci_save_state now seems to take 2 arguments;
e.g.,
pci_save_state(dev, &pci_saved_config[card->number][0]);
As I mentioned in my first report, I'm running 2.6.9. Is this an issue?
David
(from line 801)}
----------------------------------------------------------------------
tiwai - 11-23-04 17:44
----------------------------------------------------------------------
Did you update both alsa-driver and alsa-kernel trees?
Issue History
Date Modified Username Field Change
======================================================================
11-22-04 19:31 ronis New Issue
11-23-04 15:59 tiwai Note Added: 0002517
11-23-04 16:52 ronis Note Added: 0002523
11-23-04 17:44 tiwai Note Added: 0002524
======================================================================
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ALSA - driver 0000665]: Build failure in /usr/src/alsa/alsa-driver/acore/init.c
@ 2004-11-23 15:52 bugtrack
0 siblings, 0 replies; 9+ messages in thread
From: bugtrack @ 2004-11-23 15:52 UTC (permalink / raw)
To: alsa-devel
A NOTE has been added to this issue.
======================================================================
<https://bugtrack.alsa-project.org/alsa-bug/view.php?id=665>
======================================================================
Reported By: ronis
Assigned To: perex
======================================================================
Project: ALSA - driver
Issue ID: 665
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: normal
Status: assigned
Distribution:
Kernel Version:
======================================================================
Date Submitted: 11-22-2004 19:31 CET
Last Modified: 11-23-2004 16:52 CET
======================================================================
Summary: Build failure in
/usr/src/alsa/alsa-driver/acore/init.c
Description:
There's an unterminated #ifdef in init.c. (PM_CONFIG or more likely
CONFIG_PCI). Here's the log:
CC [M] /usr/src/alsa/alsa-driver/acore/init.o
/usr/src/alsa/alsa-driver/acore/init.c:680:1: unterminated #ifdef
make[4]: *** [/usr/src/alsa/alsa-driver/acore/init.o] Error 1
make[3]: *** [/usr/src/alsa/alsa-driver/acore] Error 2
make[2]: *** [_module_/usr/src/alsa/alsa-driver] Error 2
make[1]: *** [modules] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.9'
make: *** [compile] Error 2
Adding an extra #endif at the end of the file fixes things, although, I'm
not 100% sure that this is the right place top put things.
(BTW, I'm now running 2.6.9 but didn't have a chance to midify my
profile)
======================================================================
----------------------------------------------------------------------
tiwai - 11-23-04 15:59
----------------------------------------------------------------------
Can't reproduce here. Could you try it with the latest CVS?
----------------------------------------------------------------------
ronis - 11-23-04 16:52
----------------------------------------------------------------------
I just tried the latest CVS and got the same result. I looked a little
further and noticed that part of the build patches various files, and that
some of these patches failed; specifically,
./acore/seq/seq.c.rej
./acore/info.c.rej
./acore/pcm_native.c.rej
./acore/init.c.rej
./acore/sound.c.rej
./pci/bt87x.c.rej
./pcmcia/pdaudiocf/pdaudiocf.c.rej
./pcmcia/vx/vxpocket.c.rej
./usb/usbaudio.c.rej
(others worked, albeit with various offets). Here are the rejected
patches from init.c:
***************
*** 791,797 ****
return 0;
/* FIXME: correct state value? */
err = card->pm_suspend(card, 0);
pci_save_state(dev);
return err;
}
--- 825,835 ----
return 0;
/* FIXME: correct state value? */
err = card->pm_suspend(card, 0);
+ #ifndef CONFIG_HAVE_PCI_SAVED_CONFIG
+ pci_save_state(dev, &pci_saved_config[card->number][0]);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)
pci_save_state(dev);
+ #endif
return err;
}
***************
*** 803,812 ****
if (card->power_state == SNDRV_CTL_POWER_D0)
return 0;
/* restore the PCI config space */
pci_restore_state(dev);
/* FIXME: correct state value? */
return card->pm_resume(card, 0);
}
- #endif
#endif /* CONFIG_PM */
--- 841,858 ----
if (card->power_state == SNDRV_CTL_POWER_D0)
return 0;
/* restore the PCI config space */
+ #ifndef CONFIG_HAVE_PCI_SAVED_CONFIG
+ pci_restore_state(dev, &pci_saved_config[card->number][0]);
+ #elif defined(CONFIG_HAVE_NEW_PCI_SAVE_STATE)
pci_restore_state(dev);
+ #else
+ pci_restore_state(dev, dev->saved_config_space);
+ #endif
/* FIXME: correct state value? */
return card->pm_resume(card, 0);
}
+
+ #endif /* PCI_OLD_SUSPEND */
+ #endif /* CONFIG_PCI */
#endif /* CONFIG_PM */
I think my missing #endif is the /*CONFIG_PCI*/ one at the bottom, but
clearly much more is broken.
Something is wrong. I've looked in acore/init.c for lines like
***************pci_save_state(dev, &pci_saved_config[card->number][0]);
}
*** 791,797 ****
return 0;
/* FIXME: correct state value? */
err = card->pm_suspend(card, 0);
pci_save_state(dev);
return err;
They aren't there; moreover, pci_save_state now seems to take 2 arguments;
e.g.,
pci_save_state(dev, &pci_saved_config[card->number][0]);
As I mentioned in my first report, I'm running 2.6.9. Is this an issue?
David
(from line 801)}
Issue History
Date Modified Username Field Change
======================================================================
11-22-04 19:31 ronis New Issue
11-23-04 15:59 tiwai Note Added: 0002517
11-23-04 16:52 ronis Note Added: 0002523
======================================================================
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ALSA - driver 0000665]: Build failure in /usr/src/alsa/alsa-driver/acore/init.c
@ 2004-11-23 14:59 bugtrack
0 siblings, 0 replies; 9+ messages in thread
From: bugtrack @ 2004-11-23 14:59 UTC (permalink / raw)
To: alsa-devel
A NOTE has been added to this issue.
======================================================================
<https://bugtrack.alsa-project.org/alsa-bug/view.php?id=665>
======================================================================
Reported By: ronis
Assigned To: perex
======================================================================
Project: ALSA - driver
Issue ID: 665
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: normal
Status: assigned
Distribution:
Kernel Version:
======================================================================
Date Submitted: 11-22-2004 19:31 CET
Last Modified: 11-23-2004 15:59 CET
======================================================================
Summary: Build failure in
/usr/src/alsa/alsa-driver/acore/init.c
Description:
There's an unterminated #ifdef in init.c. (PM_CONFIG or more likely
CONFIG_PCI). Here's the log:
CC [M] /usr/src/alsa/alsa-driver/acore/init.o
/usr/src/alsa/alsa-driver/acore/init.c:680:1: unterminated #ifdef
make[4]: *** [/usr/src/alsa/alsa-driver/acore/init.o] Error 1
make[3]: *** [/usr/src/alsa/alsa-driver/acore] Error 2
make[2]: *** [_module_/usr/src/alsa/alsa-driver] Error 2
make[1]: *** [modules] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.9'
make: *** [compile] Error 2
Adding an extra #endif at the end of the file fixes things, although, I'm
not 100% sure that this is the right place top put things.
(BTW, I'm now running 2.6.9 but didn't have a chance to midify my
profile)
======================================================================
----------------------------------------------------------------------
tiwai - 11-23-04 15:59
----------------------------------------------------------------------
Can't reproduce here. Could you try it with the latest CVS?
Issue History
Date Modified Username Field Change
======================================================================
11-22-04 19:31 ronis New Issue
11-23-04 15:59 tiwai Note Added: 0002517
======================================================================
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ALSA - driver 0000665]: Build failure in /usr/src/alsa/alsa-driver/acore/init.c
@ 2004-11-22 18:31 bugtrack
0 siblings, 0 replies; 9+ messages in thread
From: bugtrack @ 2004-11-22 18:31 UTC (permalink / raw)
To: alsa-devel
The following issue has been SUBMITTED.
======================================================================
<https://bugtrack.alsa-project.org/alsa-bug/view.php?id=665>
======================================================================
Reported By: ronis
Assigned To: perex
======================================================================
Project: ALSA - driver
Issue ID: 665
Category: 0_compilation problem_!!!
Reproducibility: always
Severity: block
Priority: normal
Status: assigned
Distribution:
Kernel Version:
======================================================================
Date Submitted: 11-22-2004 19:31 CET
Last Modified: 11-22-2004 19:31 CET
======================================================================
Summary: Build failure in
/usr/src/alsa/alsa-driver/acore/init.c
Description:
There's an unterminated #ifdef in init.c. (PM_CONFIG or more likely
CONFIG_PCI). Here's the log:
CC [M] /usr/src/alsa/alsa-driver/acore/init.o
/usr/src/alsa/alsa-driver/acore/init.c:680:1: unterminated #ifdef
make[4]: *** [/usr/src/alsa/alsa-driver/acore/init.o] Error 1
make[3]: *** [/usr/src/alsa/alsa-driver/acore] Error 2
make[2]: *** [_module_/usr/src/alsa/alsa-driver] Error 2
make[1]: *** [modules] Error 2
make[1]: Leaving directory `/usr/src/linux-2.6.9'
make: *** [compile] Error 2
Adding an extra #endif at the end of the file fixes things, although, I'm
not 100% sure that this is the right place top put things.
(BTW, I'm now running 2.6.9 but didn't have a chance to midify my
profile)
======================================================================
Issue History
Date Modified Username Field Change
======================================================================
11-22-04 19:31 ronis New Issue
======================================================================
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2004-12-27 14:48 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-11-24 11:19 [ALSA - driver 0000665]: Build failure in /usr/src/alsa/alsa-driver/acore/init.c bugtrack
-- strict thread matches above, loose matches on Subject: below --
2004-12-27 14:48 bugtrack
2004-11-23 21:15 bugtrack
2004-11-23 17:27 bugtrack
2004-11-23 17:20 bugtrack
2004-11-23 16:44 bugtrack
2004-11-23 15:52 bugtrack
2004-11-23 14:59 bugtrack
2004-11-22 18:31 bugtrack
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox