mirror of
https://github.com/freebsd/freebsd-src
synced 2024-11-05 18:22:52 +00:00
Ripped out APM-hooks. Not ready for prime time yet.
This commit is contained in:
Poul-Henning Kamp
parent
1ed171d405
commit
51b713ac2b
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=3310
4 changed files with 4 additions and 87 deletions
|
|
@ -35,7 +35,7 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: syscons.c,v 1.61 1994/10/01 02:56:19 davidg Exp $
|
||||
* $Id: syscons.c,v 1.62 1994/10/02 14:08:57 ache Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
|
|
@ -64,9 +64,6 @@
|
|||
#include <i386/isa/timerreg.h>
|
||||
#include <i386/isa/kbdtables.h>
|
||||
#include <i386/i386/cons.h>
|
||||
#ifdef APM
|
||||
#include <machine/apm_bios.h>
|
||||
#endif
|
||||
|
||||
#if !defined(NCONS)
|
||||
#define NCONS 12
|
||||
|
|
@ -291,16 +288,6 @@ struct isa_driver scdriver = {
|
|||
pcprobe, pcattach, "sc",
|
||||
};
|
||||
|
||||
#ifdef APM
|
||||
static int
|
||||
pc_resume(void)
|
||||
{
|
||||
/* when the system wakes up, modifier keys must be re-initialized */
|
||||
shfts = ctls = alts = agrs = metas = 0;
|
||||
return 0;
|
||||
}
|
||||
#endif /* APM */
|
||||
|
||||
int
|
||||
pcprobe(struct isa_device *dev)
|
||||
{
|
||||
|
|
@ -399,9 +386,6 @@ pcattach(struct isa_device *dev)
|
|||
/* get cursor going */
|
||||
cursor_pos(1);
|
||||
update_leds(console[0].status);
|
||||
#ifdef APM
|
||||
apm_resume_hook_init(pc_resume, "Syscons console", APM_MID_ORDER);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1470,8 +1454,6 @@ switch_scr(u_int next_scr)
|
|||
static void
|
||||
exchange_scr(void)
|
||||
{
|
||||
struct tty *tp;
|
||||
|
||||
bcopy(Crtat, old_scp->scr_buf, old_scp->xsize * old_scp->ysize * 2);
|
||||
old_scp->crt_base = old_scp->scr_buf;
|
||||
move_crsr(old_scp, old_scp->xpos, old_scp->ypos);
|
||||
|
|
@ -2446,9 +2428,6 @@ scgetc(int noblock)
|
|||
shutdown_nice();
|
||||
break;
|
||||
case SUSP:
|
||||
#ifdef APM
|
||||
apm_suspend_resume();
|
||||
#endif /* APM */
|
||||
break;
|
||||
|
||||
case DBG:
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: syscons.c,v 1.61 1994/10/01 02:56:19 davidg Exp $
|
||||
* $Id: syscons.c,v 1.62 1994/10/02 14:08:57 ache Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
|
|
@ -64,9 +64,6 @@
|
|||
#include <i386/isa/timerreg.h>
|
||||
#include <i386/isa/kbdtables.h>
|
||||
#include <i386/i386/cons.h>
|
||||
#ifdef APM
|
||||
#include <machine/apm_bios.h>
|
||||
#endif
|
||||
|
||||
#if !defined(NCONS)
|
||||
#define NCONS 12
|
||||
|
|
@ -291,16 +288,6 @@ struct isa_driver scdriver = {
|
|||
pcprobe, pcattach, "sc",
|
||||
};
|
||||
|
||||
#ifdef APM
|
||||
static int
|
||||
pc_resume(void)
|
||||
{
|
||||
/* when the system wakes up, modifier keys must be re-initialized */
|
||||
shfts = ctls = alts = agrs = metas = 0;
|
||||
return 0;
|
||||
}
|
||||
#endif /* APM */
|
||||
|
||||
int
|
||||
pcprobe(struct isa_device *dev)
|
||||
{
|
||||
|
|
@ -399,9 +386,6 @@ pcattach(struct isa_device *dev)
|
|||
/* get cursor going */
|
||||
cursor_pos(1);
|
||||
update_leds(console[0].status);
|
||||
#ifdef APM
|
||||
apm_resume_hook_init(pc_resume, "Syscons console", APM_MID_ORDER);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1470,8 +1454,6 @@ switch_scr(u_int next_scr)
|
|||
static void
|
||||
exchange_scr(void)
|
||||
{
|
||||
struct tty *tp;
|
||||
|
||||
bcopy(Crtat, old_scp->scr_buf, old_scp->xsize * old_scp->ysize * 2);
|
||||
old_scp->crt_base = old_scp->scr_buf;
|
||||
move_crsr(old_scp, old_scp->xpos, old_scp->ypos);
|
||||
|
|
@ -2446,9 +2428,6 @@ scgetc(int noblock)
|
|||
shutdown_nice();
|
||||
break;
|
||||
case SUSP:
|
||||
#ifdef APM
|
||||
apm_suspend_resume();
|
||||
#endif /* APM */
|
||||
break;
|
||||
|
||||
case DBG:
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ static int wdtest = 0;
|
|||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)wd.c 7.2 (Berkeley) 5/9/91
|
||||
* $Id: wd.c,v 1.46 1994/09/10 03:19:49 davidg Exp $
|
||||
* $Id: wd.c,v 1.47 1994/10/01 02:56:21 davidg Exp $
|
||||
*/
|
||||
|
||||
/* TODO:
|
||||
|
|
@ -164,9 +164,6 @@ static struct buf wdutab[NWD]; /* head of queue per drive */
|
|||
static struct buf rwdbuf[NWD]; /* buffers for raw IO */
|
||||
#endif
|
||||
static long wdxfer[NWD]; /* count of transfers */
|
||||
#ifdef APM
|
||||
static int wdsuspend_regist = 0;
|
||||
#endif /* APM */
|
||||
|
||||
|
||||
static void bad144intern(struct disk *);
|
||||
|
|
@ -187,9 +184,6 @@ static void wdsleep(int ctrlr, char *wmesg);
|
|||
static timeout_t wdtimeout;
|
||||
static int wdunwedge(struct disk *du);
|
||||
static int wdwait(struct disk *du, u_char bits_wanted, int timeout);
|
||||
#ifdef APM
|
||||
static int wdsuspend(void);
|
||||
#endif /* APM */
|
||||
|
||||
struct isa_driver wdcdriver = {
|
||||
wdprobe, wdattach, "wdc",
|
||||
|
|
@ -346,11 +340,6 @@ wdattach(struct isa_device *dvp)
|
|||
* doesn't work now because the ambient ipl is too high.
|
||||
*/
|
||||
wdtab[dvp->id_unit].b_active = 2;
|
||||
#ifdef APM
|
||||
if (!wdsuspend_regist) {
|
||||
apm_suspend_hook_init(wdsuspend, "IDE HDD", APM_MID_ORDER);
|
||||
}
|
||||
#endif /* APM */
|
||||
|
||||
return (1);
|
||||
}
|
||||
|
|
@ -1847,13 +1836,4 @@ void bad144intern(struct disk *du) {
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef APM
|
||||
static int wdsuspend(void)
|
||||
{
|
||||
/* Currently, this routine has not be implemented. Sorry... */
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif /* APM */
|
||||
|
||||
#endif /* NWDC > 0 */
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: syscons.c,v 1.61 1994/10/01 02:56:19 davidg Exp $
|
||||
* $Id: syscons.c,v 1.62 1994/10/02 14:08:57 ache Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
|
|
@ -64,9 +64,6 @@
|
|||
#include <i386/isa/timerreg.h>
|
||||
#include <i386/isa/kbdtables.h>
|
||||
#include <i386/i386/cons.h>
|
||||
#ifdef APM
|
||||
#include <machine/apm_bios.h>
|
||||
#endif
|
||||
|
||||
#if !defined(NCONS)
|
||||
#define NCONS 12
|
||||
|
|
@ -291,16 +288,6 @@ struct isa_driver scdriver = {
|
|||
pcprobe, pcattach, "sc",
|
||||
};
|
||||
|
||||
#ifdef APM
|
||||
static int
|
||||
pc_resume(void)
|
||||
{
|
||||
/* when the system wakes up, modifier keys must be re-initialized */
|
||||
shfts = ctls = alts = agrs = metas = 0;
|
||||
return 0;
|
||||
}
|
||||
#endif /* APM */
|
||||
|
||||
int
|
||||
pcprobe(struct isa_device *dev)
|
||||
{
|
||||
|
|
@ -399,9 +386,6 @@ pcattach(struct isa_device *dev)
|
|||
/* get cursor going */
|
||||
cursor_pos(1);
|
||||
update_leds(console[0].status);
|
||||
#ifdef APM
|
||||
apm_resume_hook_init(pc_resume, "Syscons console", APM_MID_ORDER);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1470,8 +1454,6 @@ switch_scr(u_int next_scr)
|
|||
static void
|
||||
exchange_scr(void)
|
||||
{
|
||||
struct tty *tp;
|
||||
|
||||
bcopy(Crtat, old_scp->scr_buf, old_scp->xsize * old_scp->ysize * 2);
|
||||
old_scp->crt_base = old_scp->scr_buf;
|
||||
move_crsr(old_scp, old_scp->xpos, old_scp->ypos);
|
||||
|
|
@ -2446,9 +2428,6 @@ scgetc(int noblock)
|
|||
shutdown_nice();
|
||||
break;
|
||||
case SUSP:
|
||||
#ifdef APM
|
||||
apm_suspend_resume();
|
||||
#endif /* APM */
|
||||
break;
|
||||
|
||||
case DBG:
|
||||
|
|
|
|||
Loading…
Reference in a new issue