Changeset 3ce5162 in mainline

Timestamp:

2012-01-25T18:03:38Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

5c5f522

Parents:

ed6fdc7 (diff), 5cc9eba (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 with mainline

Location:

uspace

Files:

• drv/bus/isa/isa.c (modified) (1 diff)
• drv/bus/usb/usbhid/mouse/mousedev.c (modified) (2 diffs)
• drv/nic/e1k/e1k.c (modified) (3 diffs)
• drv/nic/lo/lo.c (modified) (1 diff)
• drv/nic/rtl8139/general.h (modified) (1 diff)
• lib/drv/include/usbhc_iface.h (modified) (1 diff)
• srv/loc/loc.c (modified) (1 diff)
• srv/net/net/net.h (modified) (1 diff)
• srv/net/nil/nildummy/nildummy.c (modified) (2 diffs)

uspace/drv/bus/isa/isa.c

@@ -401 +401 @@
 
         val = skip_spaces(val);
-        irq = (int)strtol(val, &end, 10);
+        irq = (int) strtol(val, &end, 10);
 
         if (val != end)

uspace/drv/bus/usb/usbhid/mouse/mousedev.c

@@ -167 +167 @@
         return result;
 }
-/*----------------------------------------------------------------------------*/
+
 static bool usb_mouse_process_report(usb_hid_dev_t *hid_dev,
     usb_mouse_t *mouse_dev)
@@ -305 +305 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
+
 /** Get highest index of a button mentioned in given report.
  *

uspace/drv/nic/e1k/e1k.c

@@ -1402 +1402 @@
         fibril_mutex_unlock(&e1000->rx_lock);
         return EOK;
+        
 error:
         for (i = 0; i < E1000_RX_FRAME_COUNT; i++) {
@@ -1410 +1411 @@
                 }
         }
+        
         if (e1000->rx_frame_phys != NULL) {
                 free(e1000->rx_frame_phys);
                 e1000->rx_frame_phys = NULL;
         }
+        
         if (e1000->rx_frame_virt != NULL) {
                 free(e1000->rx_frame_virt);
                 e1000->rx_frame_phys = NULL;
         }
+        
         return rc;
 }
@@ -1642 +1646 @@
                 e1000->tx_frame_phys = NULL;
         }
+        
         dmamem_unmap_anonymous(e1000->tx_ring_virt);
 }

uspace/drv/nic/lo/lo.c

@@ -127 +127 @@
         printf("%s: Adding loopback device '%s'\n", NAME, dev->name);
         return EOK;
+        
 error:
         if (bound)
                 ddf_fun_unbind(fun);
+        
         if (fun != NULL)
                 ddf_fun_destroy(fun);

uspace/drv/nic/rtl8139/general.h

@@ -29 +29 @@
 /** @file
  *
- *  General functions and structures used in rtl8139 driver
+ * General functions and structures used in rtl8139 driver
  */
 

uspace/lib/drv/include/usbhc_iface.h

@@ -27 +27 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+
 /** @addtogroup libdrv
  * @addtogroup usb
  * @{
  */
+
 /** @file
  * @brief USB host controller interface definition.

uspace/srv/loc/loc.c

@@ -813 +813 @@
  * On success, answer will contain EOK int retval.
  * On failure, error code will be sent in retval.
+ *
  */
 static void loc_callback_create(ipc_callid_t iid, ipc_call_t *icall)
 {
-        cb_sess_t *cb_sess;
-        
-        cb_sess = calloc(1, sizeof(cb_sess_t));
+        cb_sess_t *cb_sess = calloc(1, sizeof(cb_sess_t));
         if (cb_sess == NULL) {
                 async_answer_0(iid, ENOMEM);

uspace/srv/net/net/net.h

@@ -96 +96 @@
         
         /** Serving network interface driver module index. */
-        service_id_t sid;  /**< Service ID */
-        async_sess_t *sess;      /**< Driver session. */
+        service_id_t sid;    /**< Service ID */
+        async_sess_t *sess;  /**< Driver session. */
         
         module_t *nil;  /**< Serving link layer module index. */

uspace/srv/net/nil/nildummy/nildummy.c

@@ -360 +360 @@
     services_t sender)
 {
-        packet_t *p;
-        
         fibril_rwlock_read_lock(&nildummy_globals.devices_lock);
         
@@ -371 +369 @@
         }
         
-        p = packet;
+        packet_t *p = packet;
         do {
                 nic_send_frame(device->sess, packet_get_data(p),