On Sat, Jun 01, 2013 at 08:01:58PM +0200, Gregor Best wrote:
> On Sat, Jun 01, 2013 at 06:57:21AM -0700, Mike Larkin wrote:
> > [...]
> > Sure, go ahead.
> > [...]
>
> Then I propose the following variant of the patch:
>
code and dmesg looks fine, ok reyk@
acpi0: wakeup devices PCI0(S3) USB_(S1) P2P0(S3) S1F0(S3) S2F0(S3) S3F0(S3)
S4F0(S3) S5F0(S3) S6F0(S3) S7F0(S3) S8F0(S3) S9F0(S3) S10F(S3) S11F(S3)
S12F(S3) S13F(S3) [...]
> Index: dev/acpi/acpi.c
> ===================================================================
> RCS file: /cvs/src/sys/dev/acpi/acpi.c,v
> retrieving revision 1.245
> diff -u -p -u -r1.245 acpi.c
> --- dev/acpi/acpi.c 31 May 2013 22:43:43 -0000 1.245
> +++ dev/acpi/acpi.c 1 Jun 2013 17:57:45 -0000
> @@ -629,7 +629,7 @@ acpi_attach(struct device *parent, struc
> struct acpi_rsdp *rsdp;
> struct acpi_q *entry;
> struct acpi_dsdt *p_dsdt;
> - int idx;
> + int idx, wakeup_dev_ct;
> #ifndef SMALL_KERNEL
> struct acpi_wakeq *wentry;
> struct device *dev;
> @@ -796,8 +796,13 @@ acpi_attach(struct device *parent, struc
>
> #ifndef SMALL_KERNEL
> /* Display wakeup devices and lowest S-state */
> + wakeup_dev_ct = 0;
> printf("%s: wakeup devices", DEVNAME(sc));
> SIMPLEQ_FOREACH(wentry, &sc->sc_wakedevs, q_next) {
> + if (wakeup_dev_ct++ == 16) {
> + printf(" [...]");
> + break;
> + }
> printf(" %.4s(S%d)", wentry->q_node->name,
> wentry->q_state);
> }
>