View | Details | Raw Unified | Return to bug 161043
Collapse All | Expand All

(-)sys/conf/options.amd64 (+1 lines)
Lines 53-58 ATKBD_DFLT_KEYMAP opt_atkbd.h Link Here
53
# EOF
53
# EOF
54
# -------------------------------
54
# -------------------------------
55
HAMMER			opt_cpu.h
55
HAMMER			opt_cpu.h
56
DEV_PSM			opt_psm.h
56
PSM_HOOKRESUME		opt_psm.h
57
PSM_HOOKRESUME		opt_psm.h
57
PSM_RESETAFTERSUSPEND	opt_psm.h
58
PSM_RESETAFTERSUSPEND	opt_psm.h
58
PSM_DEBUG		opt_psm.h
59
PSM_DEBUG		opt_psm.h
(-)sys/conf/options.i386 (+1 lines)
Lines 93-98 VESA_DEBUG opt_vesa.h Link Here
93
# AGP debugging support
93
# AGP debugging support
94
AGP_DEBUG		opt_agp.h
94
AGP_DEBUG		opt_agp.h
95
95
96
DEV_PSM			opt_psm.h
96
PSM_DEBUG		opt_psm.h
97
PSM_DEBUG		opt_psm.h
97
PSM_HOOKRESUME		opt_psm.h
98
PSM_HOOKRESUME		opt_psm.h
98
PSM_RESETAFTERSUSPEND	opt_psm.h
99
PSM_RESETAFTERSUSPEND	opt_psm.h
(-)sys/conf/options.sparc64 (+1 lines)
Lines 19-24 OFW_PCI_DEBUG opt_ofw_pci.h Link Here
19
19
20
PMAP_STATS		opt_pmap.h
20
PMAP_STATS		opt_pmap.h
21
21
22
DEV_PSM			opt_psm.h
22
PSM_DEBUG		opt_psm.h
23
PSM_DEBUG		opt_psm.h
23
PSM_HOOKRESUME		opt_psm.h
24
PSM_HOOKRESUME		opt_psm.h
24
PSM_RESETAFTERSUSPEND	opt_psm.h
25
PSM_RESETAFTERSUSPEND	opt_psm.h
(-)sys/dev/acpica/acpi.c (+19 lines)
Lines 31-36 Link Here
31
__FBSDID("$FreeBSD$");
31
__FBSDID("$FreeBSD$");
32
32
33
#include "opt_acpi.h"
33
#include "opt_acpi.h"
34
#include "opt_psm.h"
35
34
#include <sys/param.h>
36
#include <sys/param.h>
35
#include <sys/kernel.h>
37
#include <sys/kernel.h>
36
#include <sys/proc.h>
38
#include <sys/proc.h>
Lines 65-70 __FBSDID("$FreeBSD$"); Link Here
65
67
66
#include <dev/acpica/acpivar.h>
68
#include <dev/acpica/acpivar.h>
67
#include <dev/acpica/acpiio.h>
69
#include <dev/acpica/acpiio.h>
70
#ifdef DEV_PSM
71
#include <dev/atkbdc/psm.h>
72
#endif
68
73
69
#include <vm/vm_param.h>
74
#include <vm/vm_param.h>
70
75
Lines 1258-1263 acpi_set_resource(device_t dev, device_t child, int type, int rid, Link Here
1258
	}
1263
	}
1259
    }
1264
    }
1260
1265
1266
#ifdef DEV_PSM
1267
    /*
1268
     * Ignore I/O port resources for PS/2 mouse devices.  Some BIOSes
1269
     * place the I/O port resources for the AT keyboard controller
1270
     * under the PS/2 mouse device instead of the keyboard device.
1271
     * Rather than engaging in crazy gymnastics to move the resources
1272
     * over to the keyboard controller, just ignore any I/O port
1273
     * resources and rely on the default hints to provide resources
1274
     * for the keyboard controller.
1275
     */
1276
    if (type == SYS_RES_IOPORT && ISA_PNP_PROBE(dev, child, psmcpnp_ids) == 0)
1277
	return (0);
1278
#endif
1279
1261
    /* If the resource is already allocated, fail. */
1280
    /* If the resource is already allocated, fail. */
1262
    if (resource_list_busy(rl, type, rid))
1281
    if (resource_list_busy(rl, type, rid))
1263
	return (EBUSY);
1282
	return (EBUSY);
(-)sys/dev/atkbdc/psm.c (-1 / +1 lines)
Lines 4921-4927 static driver_t psmcpnp_driver = { Link Here
4921
	1,			/* no softc */
4921
	1,			/* no softc */
4922
};
4922
};
4923
4923
4924
static struct isa_pnp_id psmcpnp_ids[] = {
4924
struct isa_pnp_id psmcpnp_ids[] = {
4925
	{ 0x030fd041, "PS/2 mouse port" },		/* PNP0F03 */
4925
	{ 0x030fd041, "PS/2 mouse port" },		/* PNP0F03 */
4926
	{ 0x0e0fd041, "PS/2 mouse port" },		/* PNP0F0E */
4926
	{ 0x0e0fd041, "PS/2 mouse port" },		/* PNP0F0E */
4927
	{ 0x120fd041, "PS/2 mouse port" },		/* PNP0F12 */
4927
	{ 0x120fd041, "PS/2 mouse port" },		/* PNP0F12 */
(-)sys/dev/atkbdc/psm.h (+2 lines)
Lines 29-32 Link Here
29
29
30
#define	PSM_DRIVER_NAME	"psm"
30
#define	PSM_DRIVER_NAME	"psm"
31
31
32
extern struct isa_pnp_id psmcpnp_ids[];
33
32
#endif /* !_DEV_ATKBDC_PSM_H_ */
34
#endif /* !_DEV_ATKBDC_PSM_H_ */

Return to bug 161043