Changeset 9e2e715 in mainline for uspace/srv/net/nil/nildummy/nildummy.c
- Timestamp:
- 2010-11-14T14:08:29Z (13 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a9db9b8, d52b0044, eb522e8
- Parents:
- 71e3289 (diff), fb04cba8 (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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/nil/nildummy/nildummy.c
r71e3289 r9e2e715 150 150 * netif_get_addr_req() function. 151 151 */ 152 static int 153 nildummy_device_message(device_id_t device_id, services_t service,size_t mtu)152 static int nildummy_device_message(device_id_t device_id, services_t service, 153 size_t mtu) 154 154 { 155 155 nildummy_device_ref device; … … 159 159 fibril_rwlock_write_lock(&nildummy_globals.devices_lock); 160 160 161 / / an existing device?161 /* An existing device? */ 162 162 device = nildummy_devices_find(&nildummy_globals.devices, device_id); 163 163 if (device) { … … 169 169 } 170 170 171 / / update mtu171 /* Update MTU */ 172 172 if (mtu > 0) 173 173 device->mtu = mtu; … … 179 179 fibril_rwlock_write_unlock(&nildummy_globals.devices_lock); 180 180 181 / / notify the upper layer module181 /* Notify the upper layer module */ 182 182 fibril_rwlock_read_lock(&nildummy_globals.protos_lock); 183 183 if (nildummy_globals.proto.phone) { … … 191 191 } 192 192 193 / / create a new device193 /* Create a new device */ 194 194 device = (nildummy_device_ref) malloc(sizeof(nildummy_device_t)); 195 195 if (!device) … … 203 203 device->mtu = NET_DEFAULT_MTU; 204 204 205 / / bind the device driver205 /* Bind the device driver */ 206 206 device->phone = netif_bind_service(device->service, device->device_id, 207 207 SERVICE_ETHERNET, nildummy_receiver); … … 212 212 } 213 213 214 / / get hardware address214 /* Get hardware address */ 215 215 rc = netif_get_addr_req(device->phone, device->device_id, &device->addr, 216 216 &device->addr_data); … … 221 221 } 222 222 223 / / add to the cache223 /* Add to the cache */ 224 224 index = nildummy_devices_add(&nildummy_globals.devices, 225 225 device->device_id, device); … … 247 247 * 248 248 */ 249 static int 250 nildummy_addr_message(device_id_t device_id,measured_string_ref *address)249 static int nildummy_addr_message(device_id_t device_id, 250 measured_string_ref *address) 251 251 { 252 252 nildummy_device_ref device; … … 279 279 * 280 280 */ 281 static int 282 nildummy_packet_space_message(device_id_t device_id, size_t *addr_len, 281 static int nildummy_packet_space_message(device_id_t device_id, size_t *addr_len, 283 282 size_t *prefix, size_t *content, size_t *suffix) 284 283 { … … 294 293 return ENOENT; 295 294 } 295 296 296 *content = device->mtu; 297 297 fibril_rwlock_read_unlock(&nildummy_globals.devices_lock); … … 303 303 } 304 304 305 int 306 nil_received_msg_local(int nil_phone, device_id_t device_id, packet_t packet, 307 services_t target) 305 int nil_received_msg_local(int nil_phone, device_id_t device_id, 306 packet_t packet, services_t target) 308 307 { 309 308 packet_t next; … … 355 354 * @return EINVAL if the service parameter is not known. 356 355 */ 357 static int 358 nildummy_send_message(device_id_t device_id, packet_t packet,services_t sender)356 static int nildummy_send_message(device_id_t device_id, packet_t packet, 357 services_t sender) 359 358 { 360 359 nildummy_device_ref device; … … 366 365 return ENOENT; 367 366 } 368 // send packet queue 367 368 /* Send packet queue */ 369 369 if (packet) 370 370 netif_send_msg(device->phone, device_id, packet, … … 374 374 } 375 375 376 int 377 nil_message_standalone(const char *name, ipc_callid_t callid, ipc_call_t *call, 378 ipc_call_t *answer, int *answer_count) 376 int nil_message_standalone(const char *name, ipc_callid_t callid, 377 ipc_call_t *call, ipc_call_t *answer, int *answer_count) 379 378 { 380 379 measured_string_ref address;
Note:
See TracChangeset
for help on using the changeset viewer.