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

Slight reorganization of internal interface in the keyboard controller

Browse Source 
driver.
This commit is contained in:
yokota 1999-05-18 11:33:14 +00:00
parent 57b37c7af7
commit 66a10d17ab
7 changed files with 101 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/dev/atkbdc/atkbdc.c
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: $
* $Id: atkbdc.c,v 1.1 1999/01/09 02:44:50 yokota Exp $
* from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp
*/
@ -116,7 +116,15 @@ atkbdc_softc_t
}
int
atkbdc_probe_unit(atkbdc_softc_t *sc, int unit, int port)
atkbdc_probe_unit(int unit, int port)
{
if (port <= 0)
return ENXIO;
return 0;
}
int
atkbdc_attach_unit(int unit, atkbdc_softc_t *sc, int port)
{
return atkbdc_setup(sc, port);
}

49
sys/dev/atkbdc/atkbdc_isa.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: atkbdc_isa.c,v 1.4 1999/05/08 21:59:29 dfr Exp $
* $Id: atkbdc_isa.c,v 1.5 1999/05/09 20:45:53 peter Exp $
*/
#include "atkbdc.h"
@ -65,6 +65,8 @@ static int atkbdc_write_ivar(device_t bus, device_t dev, int index,
static device_method_t atkbdc_methods[] = {
DEVMETHOD(device_probe, atkbdc_probe),
DEVMETHOD(device_attach, atkbdc_attach),
DEVMETHOD(device_suspend, bus_generic_suspend),
DEVMETHOD(device_resume, bus_generic_resume),
DEVMETHOD(bus_print_child, atkbdc_print_child),
DEVMETHOD(bus_read_ivar, atkbdc_read_ivar),
@ -88,31 +90,12 @@ static driver_t atkbdc_driver = {
static int
atkbdc_probe(device_t dev)
{
atkbdc_softc_t *sc;
int unit;
int error;
unit = device_get_unit(dev);
sc = *(atkbdc_softc_t **)device_get_softc(dev);
if (sc == NULL) {
/*
* We have to maintain two copies of the kbdc_softc struct,
* as the low-level console needs to have access to the
* keyboard controller before kbdc is probed and attached.
* kbdc_soft[] contains the default entry for that purpose.
* See atkbdc.c. XXX
*/
sc = atkbdc_get_softc(unit);
if (sc == NULL)
return ENOMEM;
}
device_set_desc(dev, "keyboard controller (i8042)");
error = atkbdc_probe_unit(sc, unit, isa_get_port(dev));
error = atkbdc_probe_unit(device_get_unit(dev), isa_get_port(dev));
if (error == 0)
*(atkbdc_softc_t **)device_get_softc(dev) = sc;
isa_set_portsize(dev, IO_KBDSIZE);
return error;
}
@ -148,11 +131,29 @@ static int
atkbdc_attach(device_t dev)
{
atkbdc_softc_t *sc;
int unit;
int error;
int i;
unit = device_get_unit(dev);
sc = *(atkbdc_softc_t **)device_get_softc(dev);
if ((sc == NULL) || (sc->port <= 0))
return ENXIO;
if (sc == NULL) {
/*
* We have to maintain two copies of the kbdc_softc struct,
* as the low-level console needs to have access to the
* keyboard controller before kbdc is probed and attached.
* kbdc_soft[] contains the default entry for that purpose.
* See atkbdc.c. XXX
*/
sc = atkbdc_get_softc(unit);
if (sc == NULL)
return ENOMEM;
}
error = atkbdc_attach_unit(unit, sc, isa_get_port(dev));
if (error)
return error;
*(atkbdc_softc_t **)device_get_softc(dev) = sc;
/*
* Add all devices configured to be attached to atkbdc0.

49
sys/dev/atkbdc/atkbdc_subr.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: atkbdc_isa.c,v 1.4 1999/05/08 21:59:29 dfr Exp $
* $Id: atkbdc_isa.c,v 1.5 1999/05/09 20:45:53 peter Exp $
*/
#include "atkbdc.h"
@ -65,6 +65,8 @@ static int atkbdc_write_ivar(device_t bus, device_t dev, int index,
static device_method_t atkbdc_methods[] = {
DEVMETHOD(device_probe, atkbdc_probe),
DEVMETHOD(device_attach, atkbdc_attach),
DEVMETHOD(device_suspend, bus_generic_suspend),
DEVMETHOD(device_resume, bus_generic_resume),
DEVMETHOD(bus_print_child, atkbdc_print_child),
DEVMETHOD(bus_read_ivar, atkbdc_read_ivar),
@ -88,31 +90,12 @@ static driver_t atkbdc_driver = {
static int
atkbdc_probe(device_t dev)
{
atkbdc_softc_t *sc;
int unit;
int error;
unit = device_get_unit(dev);
sc = *(atkbdc_softc_t **)device_get_softc(dev);
if (sc == NULL) {
/*
* We have to maintain two copies of the kbdc_softc struct,
* as the low-level console needs to have access to the
* keyboard controller before kbdc is probed and attached.
* kbdc_soft[] contains the default entry for that purpose.
* See atkbdc.c. XXX
*/
sc = atkbdc_get_softc(unit);
if (sc == NULL)
return ENOMEM;
}
device_set_desc(dev, "keyboard controller (i8042)");
error = atkbdc_probe_unit(sc, unit, isa_get_port(dev));
error = atkbdc_probe_unit(device_get_unit(dev), isa_get_port(dev));
if (error == 0)
*(atkbdc_softc_t **)device_get_softc(dev) = sc;
isa_set_portsize(dev, IO_KBDSIZE);
return error;
}
@ -148,11 +131,29 @@ static int
atkbdc_attach(device_t dev)
{
atkbdc_softc_t *sc;
int unit;
int error;
int i;
unit = device_get_unit(dev);
sc = *(atkbdc_softc_t **)device_get_softc(dev);
if ((sc == NULL) || (sc->port <= 0))
return ENXIO;
if (sc == NULL) {
/*
* We have to maintain two copies of the kbdc_softc struct,
* as the low-level console needs to have access to the
* keyboard controller before kbdc is probed and attached.
* kbdc_soft[] contains the default entry for that purpose.
* See atkbdc.c. XXX
*/
sc = atkbdc_get_softc(unit);
if (sc == NULL)
return ENOMEM;
}
error = atkbdc_attach_unit(unit, sc, isa_get_port(dev));
if (error)
return error;
*(atkbdc_softc_t **)device_get_softc(dev) = sc;
/*
* Add all devices configured to be attached to atkbdc0.

5
sys/dev/atkbdc/atkbdcreg.h
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: $
* $Id: atkbdcreg.h,v 1.1 1999/01/09 02:44:50 yokota Exp $
* from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
*/
@ -201,7 +201,8 @@ typedef caddr_t KBDC;
/* function prototypes */
atkbdc_softc_t *atkbdc_get_softc(int unit);
int atkbdc_probe_unit(atkbdc_softc_t *sc, int unit, int port);
int atkbdc_probe_unit(int unit, int port);
int atkbdc_attach_unit(int unit, atkbdc_softc_t *sc, int port);
int atkbdc_configure(void);
KBDC kbdc_open(int port);

12
sys/dev/kbd/atkbdc.c
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: $
* $Id: atkbdc.c,v 1.1 1999/01/09 02:44:50 yokota Exp $
* from kbdio.c,v 1.13 1998/09/25 11:55:46 yokota Exp
*/
@ -116,7 +116,15 @@ atkbdc_softc_t
}
int
atkbdc_probe_unit(atkbdc_softc_t *sc, int unit, int port)
atkbdc_probe_unit(int unit, int port)
{
if (port <= 0)
return ENXIO;
return 0;
}
int
atkbdc_attach_unit(int unit, atkbdc_softc_t *sc, int port)
{
return atkbdc_setup(sc, port);
}

5
sys/dev/kbd/atkbdcreg.h
View File

@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: $
* $Id: atkbdcreg.h,v 1.1 1999/01/09 02:44:50 yokota Exp $
* from kbdio.h,v 1.8 1998/09/25 11:55:46 yokota Exp
*/
@ -201,7 +201,8 @@ typedef caddr_t KBDC;
/* function prototypes */
atkbdc_softc_t *atkbdc_get_softc(int unit);
int atkbdc_probe_unit(atkbdc_softc_t *sc, int unit, int port);
int atkbdc_probe_unit(int unit, int port);
int atkbdc_attach_unit(int unit, atkbdc_softc_t *sc, int port);
int atkbdc_configure(void);
KBDC kbdc_open(int port);

49
sys/isa/atkbdc_isa.c
View File

@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $Id: atkbdc_isa.c,v 1.4 1999/05/08 21:59:29 dfr Exp $
* $Id: atkbdc_isa.c,v 1.5 1999/05/09 20:45:53 peter Exp $
*/
#include "atkbdc.h"
@ -65,6 +65,8 @@ static int atkbdc_write_ivar(device_t bus, device_t dev, int index,
static device_method_t atkbdc_methods[] = {
DEVMETHOD(device_probe, atkbdc_probe),
DEVMETHOD(device_attach, atkbdc_attach),
DEVMETHOD(device_suspend, bus_generic_suspend),
DEVMETHOD(device_resume, bus_generic_resume),
DEVMETHOD(bus_print_child, atkbdc_print_child),
DEVMETHOD(bus_read_ivar, atkbdc_read_ivar),
@ -88,31 +90,12 @@ static driver_t atkbdc_driver = {
static int
atkbdc_probe(device_t dev)
{
atkbdc_softc_t *sc;
int unit;
int error;
unit = device_get_unit(dev);
sc = *(atkbdc_softc_t **)device_get_softc(dev);
if (sc == NULL) {
/*
* We have to maintain two copies of the kbdc_softc struct,
* as the low-level console needs to have access to the
* keyboard controller before kbdc is probed and attached.
* kbdc_soft[] contains the default entry for that purpose.
* See atkbdc.c. XXX
*/
sc = atkbdc_get_softc(unit);
if (sc == NULL)
return ENOMEM;
}
device_set_desc(dev, "keyboard controller (i8042)");
error = atkbdc_probe_unit(sc, unit, isa_get_port(dev));
error = atkbdc_probe_unit(device_get_unit(dev), isa_get_port(dev));
if (error == 0)
*(atkbdc_softc_t **)device_get_softc(dev) = sc;
isa_set_portsize(dev, IO_KBDSIZE);
return error;
}
@ -148,11 +131,29 @@ static int
atkbdc_attach(device_t dev)
{
atkbdc_softc_t *sc;
int unit;
int error;
int i;
unit = device_get_unit(dev);
sc = *(atkbdc_softc_t **)device_get_softc(dev);
if ((sc == NULL) || (sc->port <= 0))
return ENXIO;
if (sc == NULL) {
/*
* We have to maintain two copies of the kbdc_softc struct,
* as the low-level console needs to have access to the
* keyboard controller before kbdc is probed and attached.
* kbdc_soft[] contains the default entry for that purpose.
* See atkbdc.c. XXX
*/
sc = atkbdc_get_softc(unit);
if (sc == NULL)
return ENOMEM;
}
error = atkbdc_attach_unit(unit, sc, isa_get_port(dev));
if (error)
return error;
*(atkbdc_softc_t **)device_get_softc(dev) = sc;
/*
* Add all devices configured to be attached to atkbdc0.