Changeset ae827d0 in mainline

Timestamp:

2012-08-23T14:28:14Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

5572ad1

Parents:

9673fd3

Message:

rtc: make the driver - port IO / memory mapped IO - neutral.

Location:

uspace

Files:

• app/date/date.c (modified) (2 diffs)
• drv/time/cmos-rtc/cmos-rtc.c (modified) (1 diff)

uspace/app/date/date.c

@@ -111 +111 @@
         rc = loc_category_get_svcs(cat_id, &svc_ids, &svc_cnt);
         if (rc != EOK) {
-                printf(NAME ": Cannot get the list of services in the clock \
-                    category\n");
+                printf(NAME ": Cannot get the list of services in the clock "
+                    "category\n");
                 goto exit;
         }
@@ -118 +118 @@
         /* Check if there are available services in the clock category */
         if (svc_cnt == 0) {
-                printf(NAME ": No available service found in \
-                    the clock category\n");
+                printf(NAME ": No available service found in "
+                    "the clock category\n");
                 goto exit;
         }

uspace/drv/time/cmos-rtc/cmos-rtc.c

@@ -217 +217 @@
                 res = &hw_resources.resources[i];
 
-                if (res->type == IO_RANGE) {
-                        if (res->res.io_range.size < REG_COUNT) {
-                                ddf_msg(LVL_ERROR, "I/O range assigned to \
-                                    device %s is too small",
-                                    ddf_dev_get_name(rtc->dev));
-                                rc = ELIMIT;
-                                goto error;
-                        }
-                        rtc->io_addr = (ioport8_t *) res->res.io_range.address;
-                        ioport = true;
-                        ddf_msg(LVL_NOTE, "Device %s was assigned I/O address \
-                            0x%x", ddf_dev_get_name(rtc->dev), rtc->io_addr);
+                if (res->res.io_range.size < REG_COUNT) {
+                        ddf_msg(LVL_ERROR, "I/O range assigned to \
+                            device %s is too small",
+                            ddf_dev_get_name(rtc->dev));
+                        rc = ELIMIT;
+                        continue;
                 }
-        }
+
+                rtc->io_addr = (ioport8_t *) res->res.io_range.address;
+                ioport = true;
+                ddf_msg(LVL_NOTE, "Device %s was assigned I/O address "
+                    "0x%x", ddf_dev_get_name(rtc->dev), rtc->io_addr);
+                rc = EOK;
+                break;
+        }
+
+        if (rc != EOK)
+                goto error;
 
         if (!ioport) {