SEO
vBulletin Search Engine Optimization
| |||||||
| Register | FAQ | Members List | Calendar | Search | Today's Posts | Mark Forums Read |
02-18-2008, 09:34 AM
| ||||
| ||||
 Re: combined apm and acpi On 11/25/07, Nikolay Sturm <sturm@erisiandiscord.de> wrote: > * Ted Unangst [2007-11-24]: > > revised: the stub is now called acpiapm (this name is only a prefix > > this doesn't build yes, sorry, i was trying to rename things and primarily use a amd64. machine/ps.h should be machine/acpiapm.h and cdev_apm_init in conf.c should be cdev_acpiapm_init. > > > Index: sys/arch/i386/i386/apm.c > > ================================================== ================= > > RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/apm.c,v > > retrieving revision 1.78 > > diff -u -u -r1.78 apm.c > > --- sys/arch/i386/i386/apm.c 3 Nov 2007 03:37:08 -0000 1.78 > > +++ sys/arch/i386/i386/apm.c 24 Nov 2007 21:23:24 -0000 > > @@ -66,6 +66,7 @@ > > #include <i386/isa/nvram.h> > > #include <dev/isa/isavar.h> > > > > +#include <machine/ps.h> > > I don't have this file on my machine and this > > > Index: sys/arch/i386/i386/conf.c > > ================================================== ================= > > RCS file: /home/tedu/cvs/src/sys/arch/i386/i386/conf.c,v > > retrieving revision 1.119 > > diff -u -u -r1.119 conf.c > > --- sys/arch/i386/i386/conf.c 18 Sep 2007 18:13:06 -0000 1.119 > > +++ sys/arch/i386/i386/conf.c 24 Nov 2007 21:24:21 -0000 > > @@ -224,7 +222,7 @@ > > cdev_disk_init(NCCD,ccd), /* 18: concatenated disk driver */ > > cdev_ss_init(NSS,ss), /* 19: SCSI scanner */ > > cdev_uk_init(NUK,uk), /* 20: unknown SCSI */ > > - cdev_apm_init(NAPM,apm), /* 21: Advanced Power Management */ > > + cdev_apm_init(1,acpiapm), /* 21: Advanced Power Management */ > > cdev_fd_init(1,filedesc), /* 22: file descriptor pseudo-device */ > > cdev_bpftun_init(NBPFILTER,bpf),/* 23: Berkeley packet filter */ > > cdev_notdef(), /* 24 */ > > Index: sys/arch/i386/include/conf.h > > ================================================== ================= > > RCS file: /home/tedu/cvs/src/sys/arch/i386/include/conf.h,v > > retrieving revision 1.12 > > diff -u -u -r1.12 conf.h > > --- sys/arch/i386/include/conf.h 31 Dec 2005 21:22:34 -0000 1.12 > > +++ sys/arch/i386/include/conf.h 24 Nov 2007 21:13:13 -0000 > > @@ -49,13 +49,7 @@ > > cdev_decl(pc); > > > > > > -#define cdev_apm_init(c,n) {\ > > - dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ > > - (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ > > - (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ > > - (dev_type_mmap((*))) enodev, 0, D_KQFILTER, dev_init(c,n,kqfilter) } > > - > > -#define cdev_acpi_init(c,n) {\ > > +#define cdev_acpiapm_init(c,n) {\ > > dev_init(c,n,open), dev_init(c,n,close), (dev_type_read((*))) enodev, \ > > (dev_type_write((*))) enodev, dev_init(c,n,ioctl), \ > > (dev_type_stop((*))) enodev, 0, (dev_type_poll((*))) enodev, \ > > kills the build. > > Nikolay      |
Linear Mode
