Skip to content

Commit

Permalink
Move i8042 and usrinput into common input directory.
Browse files Browse the repository at this point in the history
In anticipation of having more user input drivers in the future, create a
top level input directory within drivers, and then move i8042 and usrinput
into there.
  • Loading branch information
evangreen committed May 2, 2017
1 parent dbee7c4 commit eb3f645
Show file tree
Hide file tree
Showing 18 changed files with 85 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Below is a brief orientation of a few of the directories in the repository. Chec
* `usbkbd` - USB keyboard support
* `usbmass` - USB mass storage support
* `usbmouse` - USB mouse support
* `usrinput` - User input device support
* `input` - User input drivers
* `videocon` - Video terminal console driver
* `images` - Recipes to create the final images for each supported platform
* `include` - Public header files
Expand Down
7 changes: 3 additions & 4 deletions drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ DIRS = acpi \
dma \
fat \
gpio \
i8042 \
input \
net \
null \
part \
Expand All @@ -46,13 +46,12 @@ DIRS = acpi \
special \
term \
usb \
usrinput \
videocon \

include $(SRCROOT)/os/minoca.mk

i8042 usb: usrinput
usb: input
ata usb: part
net: usb
plat: usrinput spb
plat: input spb

2 changes: 1 addition & 1 deletion drivers/build.ck
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ function build() {
"drivers/ata:ata",
"drivers/devrem:devrem",
"drivers/fat:fat",
"drivers/i8042:i8042",
"drivers/input:input_drivers,"
"drivers/net:net_drivers",
"drivers/null:null",
"drivers/part:part",
Expand Down
36 changes: 36 additions & 0 deletions drivers/input/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
################################################################################
#
# Copyright (c) 2017 Minoca Corp.
#
# This file is licensed under the terms of the GNU General Public License
# version 3. Alternative licensing terms are available. Contact
# [email protected] for details. See the LICENSE file at the root of this
# project for complete licensing information.
#
# Module Name:
#
# Input
#
# Abstract:
#
# This directory contains User Input related drivers.
#
# Author:
#
# Evan Green 28-Apr-2017
#
# Environment:
#
# Kernel
#
################################################################################

INPUT_DEVICE_DRIVERS := i8042 \

DIRS = usrinput \
$(INPUT_DEVICE_DRIVERS) \

include $(SRCROOT)/os/minoca.mk

$(INPUT_DEVICE_DRIVERS): usrinput

41 changes: 41 additions & 0 deletions drivers/input/build.ck
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
/*++
Copyright (c) 2017 Minoca Corp.
This file is licensed under the terms of the GNU General Public License
version 3. Alternative licensing terms are available. Contact
[email protected] for details. See the LICENSE file at the root of this
project for complete licensing information.
Module Name:
Input
Abstract:
This directory contains user input related drivers.
Author:
Evan Green 28-Apr-2017
Environment:
Kernel
--*/

from menv import group;

function build() {
var entries;
var inputDrivers;

inputDrivers = [
"drivers/input/i8042:i8042"
];

entries = group("input_drivers", inputDrivers);
return entries;
}

File renamed without changes.
2 changes: 1 addition & 1 deletion drivers/i8042/build.ck → drivers/input/i8042/build.ck
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function build() {
];

dynlibs = [
"drivers/usrinput:usrinput"
"drivers/input/usrinput:usrinput"
];

drv = {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ function build() {

sources = [
"pl050.c",
"drivers/i8042:scancode.o"
"drivers/input/i8042:scancode.o"
];

dynlibs = [
"drivers/usrinput:usrinput"
"drivers/input/usrinput:usrinput"
];

drv = {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit eb3f645

Please sign in to comment.