d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revive APM hooking code for i386 arch now that the same source file is

Browse Source 
used for both i386 and alpha (the code was in sys/i386/isa/psm.c, but
was disabled when ported to alpha.)
This commit is contained in:
Kazutaka YOKOTA 1999-05-09 04:58:35 +00:00
parent 4e1cc0095d
commit d1a67a9435
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=46763
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/dev/atkbdc/psm.c
View File

@ -20,7 +20,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: psm.c,v 1.6 1999/05/07 10:10:40 phk Exp $
* $Id: psm.c,v 1.7 1999/05/08 21:59:29 dfr Exp $
*/
/*
@ -62,7 +62,9 @@
*/
#include "psm.h"
/* #include "apm.h" */
#ifdef __i386__
#include "apm.h"
#endif
#include "opt_devfs.h"
#include "opt_psm.h"
@ -85,6 +87,9 @@
#include <sys/select.h>
#include <sys/uio.h>
#ifdef __i386__
#include <machine/apm_bios.h>
#endif
#include <machine/clock.h>
#include <machine/limits.h>
#include <machine/mouse.h>
@ -2176,7 +2181,7 @@ enable_msintelli(struct psm_softc *sc)
static int
psmresume(void *dummy)
{
struct psm_softc *sc = psm_softc[(int)dummy];
struct psm_softc *sc = PSM_SOFTC((int)dummy);
int unit = (int)dummy;
int err = 0;
int s;

11
sys/isa/psm.c
View File

@ -20,7 +20,7 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: psm.c,v 1.6 1999/05/07 10:10:40 phk Exp $
* $Id: psm.c,v 1.7 1999/05/08 21:59:29 dfr Exp $
*/
/*
@ -62,7 +62,9 @@
*/
#include "psm.h"
/* #include "apm.h" */
#ifdef __i386__
#include "apm.h"
#endif
#include "opt_devfs.h"
#include "opt_psm.h"
@ -85,6 +87,9 @@
#include <sys/select.h>
#include <sys/uio.h>
#ifdef __i386__
#include <machine/apm_bios.h>
#endif
#include <machine/clock.h>
#include <machine/limits.h>
#include <machine/mouse.h>
@ -2176,7 +2181,7 @@ enable_msintelli(struct psm_softc *sc)
static int
psmresume(void *dummy)
{
struct psm_softc *sc = psm_softc[(int)dummy];
struct psm_softc *sc = PSM_SOFTC((int)dummy);
int unit = (int)dummy;
int err = 0;
int s;