Changeset cfb79747 in mainline for uspace/drv/char/i8042/i8042.h

Timestamp:

2012-02-14T22:06:15Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a31aad1

Parents:

199112e4 (diff), e10d41a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/drv/char/i8042/i8042.h (modified) (4 diffs)

uspace/drv/char/i8042/i8042.h

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup kbd_port
  * @ingroup  kbd
  * @{
  */
+
 /** @file
  * @brief i8042 port driver.
@@ -41 +43 @@
 #include <fibril_synch.h>
 #include <ddf/driver.h>
-
 #include "buffer.h"
 
-#define BUFFER_SIZE 12
+#define NAME  "i8042"
+
+#define BUFFER_SIZE  12
 
 /** i8042 HW I/O interface */
@@ -55 +58 @@
 /** i8042 driver structure. */
 typedef struct i8042 {
-        i8042_regs_t *regs;    /**< I/O registers. */
-        ddf_fun_t *kbd_fun;    /**< Pirmary port device function. */
-        ddf_fun_t *aux_fun;  /**< Auxiliary port device function. */
-        buffer_t kbd_buffer;   /**< Primary port buffer. */
-        buffer_t aux_buffer;   /**< Aux. port buffer. */
+        i8042_regs_t *regs;             /**< I/O registers. */
+        ddf_fun_t *kbd_fun;             /**< Pirmary port device function. */
+        ddf_fun_t *aux_fun;             /**< Auxiliary port device function. */
+        buffer_t kbd_buffer;            /**< Primary port buffer. */
+        buffer_t aux_buffer;            /**< Aux. port buffer. */
         uint8_t aux_data[BUFFER_SIZE];  /**< Primary port buffer space. */
         uint8_t kbd_data[BUFFER_SIZE];  /**< Aux. port buffer space. */
@@ -66 +69 @@
 
 int i8042_init(i8042_t *, void *, size_t, int, int, ddf_dev_t *);
+
 #endif
+
 /**
  * @}