X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/91447636331957f3d9b5ca5b508f07c526b0074d..bd504ef0e0b883cdd7917b73b3574eb9ce669905:/bsd/netat/adsp.c diff --git a/bsd/netat/adsp.c b/bsd/netat/adsp.c index b6c1cf6e6..65fe77206 100644 --- a/bsd/netat/adsp.c +++ b/bsd/netat/adsp.c @@ -1,23 +1,29 @@ /* * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. * - * @APPLE_LICENSE_HEADER_START@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * - * The contents of this file constitute Original Code as defined in and - * are subject to the Apple Public Source License Version 1.1 (the - * "License"). You may not use this file except in compliance with the - * License. Please obtain a copy of the License at - * http://www.apple.com/publicsource and read it before using this file. + * This file contains Original Code and/or Modifications of Original Code + * as defined in and that are subject to the Apple Public Source License + * Version 2.0 (the 'License'). You may not use this file except in + * compliance with the License. The rights granted to you under the License + * may not be used to create, or enable the creation or redistribution of, + * unlawful or unlicensed copies of an Apple operating system, or to + * circumvent, violate, or enable the circumvention or violation of, any + * terms of an Apple operating system software license agreement. * - * This Original Code and all software distributed under the License are - * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER + * Please obtain a copy of the License at + * http://www.opensource.apple.com/apsl/ and read it before using this file. + * + * The Original Code and all software distributed under the License are + * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES, * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT. Please see the - * License for the specific language governing rights and limitations - * under the License. + * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT. + * Please see the License for the specific language governing rights and + * limitations under the License. * - * @APPLE_LICENSE_HEADER_END@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* * Change log: @@ -50,8 +56,7 @@ struct adsp_debug adsp_dtable[1025]; int ad_entry = 0; #endif -extern atlock_t adspgen_lock; - +int adspAllocateCCB(gref) register gref_t *gref; /* READ queue */ { @@ -69,29 +74,22 @@ adspAllocateCCB(gref) sp->pid = gref->pid; /* save the caller process pointer */ sp->gref = gref; /* save a back pointer to the WRITE queue */ sp->sp_mp = ccb_mp; /* and its message block */ - ATLOCKINIT(sp->lock); - ATLOCKINIT(sp->lockClose); - ATLOCKINIT(sp->lockRemove); return 1; } +int adspRelease(gref) register gref_t *gref; /* READ queue */ { register CCBPtr sp; - int s, l; - ATDISABLE(l, adspgen_lock); if (gref->info) { sp = (CCBPtr)gbuf_rptr(((gbuf_t *)gref->info)); - ATDISABLE(s, sp->lock); - ATENABLE(s, adspgen_lock); /* Tells completion routine of close */ /* packet to remove us. */ if (sp->state == sPassive || sp->state == sClosed || sp->state == sOpening || sp->state == sListening) { - ATENABLE(l, sp->lock); if (sp->state == sListening) CompleteQueue(&sp->opb, errAborted); sp->removing = 1; /* Prevent allowing another dspClose. */ @@ -100,7 +98,6 @@ adspRelease(gref) } else { /* sClosing & sOpen */ sp->state = sClosing; } - ATENABLE(l, sp->lock); if (CheckOkToClose(sp)) { /* going to close */ sp->sendCtl = B_CTL_CLOSE; /* Send close advice */ @@ -110,18 +107,16 @@ adspRelease(gref) sp->sendCtl = B_CTL_CLOSE; /* Setup to send close advice */ } CheckSend(sp); /* and force out the close */ - ATDISABLE(s, sp->lock); sp->removing = 1; /* Prevent allowing another dspClose. */ sp->state = sClosed; - ATENABLE(s, sp->lock); DoClose(sp, errAborted, 0); /* to closed and remove CCB */ - } else - ATENABLE(l, adspgen_lock); + } + return 0; } - +int adspWriteHandler(gref, mp) gref_t *gref; /* WRITE queue */ gbuf_t *mp; @@ -152,7 +147,7 @@ adspWriteHandler(gref, mp) gbuf_freem(mp); return(STR_IGNORE); case dspAttention: - if ((error = adspAttention(sp, ap))) + if ((error = adspAttention(sp, (CCBPtr)ap))) gbuf_freem(mp); return(STR_IGNORE); } @@ -231,7 +226,7 @@ adspWriteHandler(gref, mp) return(STR_IGNORE); case ADSPCLDENY: ap->csCode = dspCLDeny; - if ((error = adspCLDeny(sp, ap))) { + if ((error = adspCLDeny(sp, (CCBPtr)ap))) { adspioc_ack(error, mp, gref); } return(STR_IGNORE); @@ -249,7 +244,7 @@ adspWriteHandler(gref, mp) return(STR_IGNORE); case ADSPATTENTION: ap->csCode = dspAttention; - if ((error = adspReadAttention(sp, ap))) { + if ((error = adspReadAttention((CCBPtr)sp, ap))) { adspioc_ack(error, mp, gref); } return(STR_IGNORE); @@ -279,9 +274,10 @@ adspWriteHandler(gref, mp) default: gbuf_freem(mp); } + return(STR_IGNORE); } - +int adspReadHandler(gref, mp) gref_t *gref; gbuf_t *mp; @@ -333,7 +329,7 @@ adspReadHandler(gref, mp) * Side Effects: * NONE */ - +int adsp_sendddp(sp, mp, length, dstnetaddr, ddptype) CCBPtr sp; gbuf_t *mp; @@ -359,11 +355,11 @@ adsp_sendddp(sp, mp, length, dstnetaddr, ddptype) /* Set up the DDP header */ ddp = (DDPX_FRAME *) gbuf_rptr(mp); - UAS_ASSIGN(ddp->ddpx_length, (length + DDPL_FRAME_LEN)); + UAS_ASSIGN_HTON(ddp->ddpx_length, (length + DDPL_FRAME_LEN)); UAS_ASSIGN(ddp->ddpx_cksm, 0); if (sp) { if (sp->useCheckSum) - UAS_ASSIGN(ddp->ddpx_cksm, 1); + UAS_ASSIGN_HTON(ddp->ddpx_cksm, 1); } NET_ASSIGN(ddp->ddpx_dnet, dstnetaddr->a.net); @@ -381,8 +377,8 @@ adsp_sendddp(sp, mp, length, dstnetaddr, ddptype) return 0; } -void NotifyUser(sp) - register CCBPtr sp; +void NotifyUser( + __unused CCBPtr sp) { /* @@ -390,8 +386,8 @@ void NotifyUser(sp) */ } -void UrgentUser(sp) - register CCBPtr sp; +void UrgentUser( + __unused CCBPtr sp) { /* pidsig(sp->pid, SIGURG);