libpayload: remove uhci_reg_maskX

[coreboot.git] / payloads / libpayload / drivers / usb / uhci_rh.c

diff --git a/payloads/libpayload/drivers/usb/uhci_rh.c b/payloads/libpayload/drivers/usb/uhci_rh.c
index 3957275bf02a20500bbb19e3c18a6a90e8ba3d62..507409925555fb6a1972ab1cd8a8ee480efc8d3c 100644 (file)
--- a/payloads/libpayload/drivers/usb/uhci_rh.c
+++ b/payloads/libpayload/drivers/usb/uhci_rh.c
@@ -31,6 +31,7 @@
 
 #include <libpayload.h>
 #include "uhci.h"
+#include "uhci_private.h"
 
 typedef struct {
        int port[2];
@@ -48,18 +49,22 @@ uhci_rh_enable_port (usbdev_t *dev, int port)
        else if (port == 2)
                port = PORTSC2;
        else {
-               printf("Invalid port %d\n", port);
+               debug("Invalid port %d\n", port);
                return;
        }
 
-       uhci_reg_mask16 (controller, port, ~(1 << 12), 0);      /* wakeup */
+       uhci_reg_write16(controller, port,
+                        uhci_reg_read16(controller, port) & ~(1 << 12));       /* wakeup */
 
-       uhci_reg_mask16 (controller, port, ~0, 1 << 9); /* reset */
+       uhci_reg_write16(controller, port,
+                        uhci_reg_read16(controller, port) | 1 << 9);   /* reset */
        mdelay (30);            // >10ms
-       uhci_reg_mask16 (controller, port, ~(1 << 9), 0);
+       uhci_reg_write16(controller, port,
+                        uhci_reg_read16(controller, port) & ~(1 << 9));
        mdelay (1);             // >5.3us per spec, <3ms because some devices make trouble
 
-       uhci_reg_mask16 (controller, port, ~0, 1 << 2); /* enable */
+       uhci_reg_write16(controller, port,
+                        uhci_reg_read16(controller, port) | 1 << 2);   /* enable */
        do {
                value = uhci_reg_read16 (controller, port);
                mdelay (1);
@@ -74,7 +79,8 @@ uhci_rh_disable_port (usbdev_t *dev, int port)
        port = PORTSC2;
        if (port == 1)
                port = PORTSC1;
-       uhci_reg_mask16 (controller, port, ~4, 0);
+       uhci_reg_write16(controller, port,
+                        uhci_reg_read16(controller, port) & ~4);
        int value;
        do {
                value = uhci_reg_read16 (controller, port);
@@ -93,7 +99,7 @@ uhci_rh_scanport (usbdev_t *dev, int port)
                portsc = PORTSC2;
                offset = 1;
        } else {
-               printf("Invalid port %d\n", port);
+               debug("Invalid port %d\n", port);
                return;
        }
        int devno = RH_INST (dev)->port[offset];
@@ -101,7 +107,8 @@ uhci_rh_scanport (usbdev_t *dev, int port)
                usb_detach_device(dev->controller, devno);
                RH_INST (dev)->port[offset] = -1;
        }
-       uhci_reg_mask16 (dev->controller, portsc, ~0, (1 << 3) | (1 << 2));     // clear port state change, enable port
+       uhci_reg_write16(dev->controller, portsc,
+                        uhci_reg_read16(dev->controller, portsc) | (1 << 3) | (1 << 2));       // clear port state change, enable port
 
        mdelay(100); // wait for signal to stabilize
 
@@ -177,7 +184,7 @@ uhci_rh_init (usbdev_t *dev)
        uhci_rh_enable_port (dev, 2);
        dev->data = malloc (sizeof (rh_inst_t));
        if (!dev->data)
-               usb_fatal ("Not enough memory for UHCI RH.\n");
+               fatal("Not enough memory for UHCI RH.\n");
 
        RH_INST (dev)->port[0] = -1;
        RH_INST (dev)->port[1] = -1;