Changeset 05b59393 in mainline for uspace/drv

Timestamp:

2017-10-04T18:02:14Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

c9e88da

Parents:

0b2d369

Message:

Fix a couple of benign clang warnings.
No change in semantics.

Location:

uspace/drv

Files:

• audio/sb16/dsp.c (modified) (3 diffs)
• bus/isa/i8237.c (modified) (2 diffs)
• bus/usb/ohci/ohci_rh.c (modified) (2 diffs)
• fb/amdm37x_dispc/amdm37x_dispc.c (modified) (1 diff)

uspace/drv/audio/sb16/dsp.c

@@ -75 +75 @@
                 [DSP_NO_BUFFER] = "NO BUFFER",
         };
-        if (state < ARRAY_SIZE(state_names))
+        if ((size_t)state < ARRAY_SIZE(state_names))
                 return state_names[state];
         return "UNKNOWN";
@@ -144 +144 @@
 {
         dsp_write(dsp, SET_SAMPLING_RATE_OUTPUT);
-        dsp_write(dsp, rate >> 8);
-        dsp_write(dsp, rate & 0xff);
-        ddf_log_verbose("Sampling rate: %hhx:%hhx.", rate >> 8, rate & 0xff);
+        uint8_t rate_lo = rate & 0xff;
+        uint8_t rate_hi = rate >> 8;
+        dsp_write(dsp, rate_hi);
+        dsp_write(dsp, rate_lo);
+        ddf_log_verbose("Sampling rate: %hhx:%hhx.", rate_hi, rate_lo);
 }
 
@@ -202 +204 @@
         
         return ret;
-}
-
-static inline size_t sample_count(pcm_sample_format_t format, size_t byte_count)
-{
-        return byte_count / pcm_sample_format_size(format);
 }
 

uspace/drv/bus/isa/i8237.c

@@ -371 +371 @@
         
         /* 16 bit transfers are a bit special */
-        ddf_msg(LVL_DEBUG, "Unspoiled address %#" PRIx32 " (size %" PRIu16 ")",
+        ddf_msg(LVL_DEBUG, "Unspoiled address %#" PRIx32 " (size %" PRIu32 ")",
             pa, size);
         if (is_dma16(channel)) {
@@ -388 +388 @@
         
         ddf_msg(LVL_DEBUG, "Setting channel %u to address %#" PRIx32 " "
-            "(size %" PRIu16 "), mode %hhx.", channel, pa, size, mode);
+            "(size %" PRIu32 "), mode %hhx.", channel, pa, size, mode);
         
         /* Mask DMA request */

uspace/drv/bus/usb/ohci/ohci_rh.c

@@ -367 +367 @@
         case USB_HUB_FEATURE_C_PORT_RESET:        /*20*/
                 usb_log_debug2("Clearing port C_CONNECTION, C_ENABLE, "
-                    "C_SUSPEND, C_OC or C_RESET on port %"PRIu16".\n", port);
+                    "C_SUSPEND, C_OC or C_RESET on port %u.\n", port);
                 /* Bit offsets correspond to the feature number */
                 OHCI_WR(hub->registers->rh_port_status[port],
@@ -416 +416 @@
         case USB_HUB_FEATURE_PORT_RESET:   /*4*/
                 usb_log_debug2("Setting port POWER, ENABLE, SUSPEND or RESET "
-                    "on port %"PRIu16".\n", port);
+                    "on port %u.\n", port);
                 /* Bit offsets correspond to the feature number */
                 OHCI_WR(hub->registers->rh_port_status[port], 1 << feature);

uspace/drv/fb/amdm37x_dispc/amdm37x_dispc.c

@@ -267 +267 @@
         amdm37x_dispc_t *dispc = vis->dev_ctx;
         const visual_t visual = mode.cell_visual.pixel_visual;
-        assert(visual < sizeof(pixel2visual_table) / sizeof(pixel2visual_table[0]));
+        assert((size_t)visual < sizeof(pixel2visual_table) / sizeof(pixel2visual_table[0]));
         const unsigned bpp = pixel2visual_table[visual].bpp;
         pixel2visual_t p2v = pixel2visual_table[visual].func;