| ufoma.c (223515) | ufoma.c (227461) |
|---|---|
| 1/* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ 2 3#include <sys/cdefs.h> | 1/* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ 2 3#include <sys/cdefs.h> |
| 4__FBSDID("$FreeBSD: head/sys/dev/usb/serial/ufoma.c 223515 2011-06-24 19:32:29Z hselasky $"); | 4__FBSDID("$FreeBSD: head/sys/dev/usb/serial/ufoma.c 227461 2011-11-12 08:16:45Z hselasky $"); |
| 5#define UFOMA_HANDSFREE 6/*- 7 * Copyright (c) 2005, Takanori Watanabe 8 * Copyright (c) 2003, M. Warner Losh <imp@FreeBSD.org>. 9 * All rights reserved. 10 * 11 * Redistribution and use in source and binary forms, with or without 12 * modification, are permitted provided that the following conditions --- 420 unchanged lines hidden (view full) --- 433 /* initialize mode variables */ 434 435 sc->sc_modetable = malloc(elements + 1, M_USBDEV, M_WAITOK); 436 437 if (sc->sc_modetable == NULL) { 438 goto detach; 439 } 440 sc->sc_modetable[0] = (elements + 1); | 5#define UFOMA_HANDSFREE 6/*- 7 * Copyright (c) 2005, Takanori Watanabe 8 * Copyright (c) 2003, M. Warner Losh <imp@FreeBSD.org>. 9 * All rights reserved. 10 * 11 * Redistribution and use in source and binary forms, with or without 12 * modification, are permitted provided that the following conditions --- 420 unchanged lines hidden (view full) --- 433 /* initialize mode variables */ 434 435 sc->sc_modetable = malloc(elements + 1, M_USBDEV, M_WAITOK); 436 437 if (sc->sc_modetable == NULL) { 438 goto detach; 439 } 440 sc->sc_modetable[0] = (elements + 1); |
| 441 bcopy(mad->bMode, &sc->sc_modetable[1], elements); | 441 memcpy(&sc->sc_modetable[1], mad->bMode, elements); |
| 442 443 sc->sc_currentmode = UMCPC_ACM_MODE_UNLINKED; 444 sc->sc_modetoactivate = mad->bMode[0]; 445 446 /* clear stall at first run, if any */ 447 mtx_lock(&sc->sc_mtx); 448 usbd_xfer_set_stall(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_WRITE]); 449 usbd_xfer_set_stall(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_READ]); --- 513 unchanged lines hidden (view full) --- 963 struct usb_cdc_line_state ls; 964 965 if (sc->sc_nobulk || 966 (sc->sc_currentmode == UMCPC_ACM_MODE_OBEX)) { 967 return; 968 } 969 DPRINTF("\n"); 970 | 442 443 sc->sc_currentmode = UMCPC_ACM_MODE_UNLINKED; 444 sc->sc_modetoactivate = mad->bMode[0]; 445 446 /* clear stall at first run, if any */ 447 mtx_lock(&sc->sc_mtx); 448 usbd_xfer_set_stall(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_WRITE]); 449 usbd_xfer_set_stall(sc->sc_bulk_xfer[UFOMA_BULK_ENDPT_READ]); --- 513 unchanged lines hidden (view full) --- 963 struct usb_cdc_line_state ls; 964 965 if (sc->sc_nobulk || 966 (sc->sc_currentmode == UMCPC_ACM_MODE_OBEX)) { 967 return; 968 } 969 DPRINTF("\n"); 970 |
| 971 bzero(&ls, sizeof(ls)); | 971 memset(&ls, 0, sizeof(ls)); |
| 972 973 USETDW(ls.dwDTERate, t->c_ospeed); 974 975 if (t->c_cflag & CSTOPB) { 976 ls.bCharFormat = UCDC_STOP_BIT_2; 977 } else { 978 ls.bCharFormat = UCDC_STOP_BIT_1; 979 } --- 281 unchanged lines hidden --- | 972 973 USETDW(ls.dwDTERate, t->c_ospeed); 974 975 if (t->c_cflag & CSTOPB) { 976 ls.bCharFormat = UCDC_STOP_BIT_2; 977 } else { 978 ls.bCharFormat = UCDC_STOP_BIT_1; 979 } --- 281 unchanged lines hidden --- |