From owner-p4-projects@FreeBSD.ORG Sun Jul 8 08:03:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1FCBD16A46B; Sun, 8 Jul 2007 08:03:58 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C003E16A41F for ; Sun, 8 Jul 2007 08:03:57 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 977EC13C468 for ; Sun, 8 Jul 2007 08:03:57 +0000 (UTC) (envelope-from chub@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l6883vXW049831 for ; Sun, 8 Jul 2007 08:03:57 GMT (envelope-from chub@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l6883v2u049828 for perforce@freebsd.org; Sun, 8 Jul 2007 08:03:57 GMT (envelope-from chub@FreeBSD.org) Date: Sun, 8 Jul 2007 08:03:57 GMT Message-Id: <200707080803.l6883v2u049828@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to chub@FreeBSD.org using -f From: Brian Chu To: Perforce Change Reviews Cc: Subject: PERFORCE change 123096 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2007 08:03:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=123096 Change 123096 by chub@chub-msdosfs on 2007/07/08 08:03:16 Killed the endianness macros; using (get|put)u(long|short) defines and le(16|32)(dec|enc) functions to deal with the conversions instead. Affected files ... .. //depot/projects/soc2007/chub-msdosfs2/sys/geom/label/g_label_msdosfs.c#3 edit Differences ... ==== //depot/projects/soc2007/chub-msdosfs2/sys/geom/label/g_label_msdosfs.c#3 (text+ko) ==== @@ -44,14 +44,7 @@ #define G_LABEL_MSDOSFS_DIR "msdosfs" #define LABEL_NO_NAME "NO NAME " -/* - * Conversion macros for little endian encoded unsigned integers - * in byte streams to the local unsigned integer format. - */ #include -#define UINT16BYTES(p) ((uint32_t)((p)[0] + (256*(p)[1]))) -#define UINT32BYTES(p) ((uint32_t)((p)[0] + (256*(p)[1]) + \ - (65536*(p)[2]) + (16777216*(p)[3]))) static void g_label_msdosfs_taste(struct g_consumer *cp, char *label, size_t size) @@ -107,7 +100,7 @@ /* * Test if this is really a FAT volume and determine the FAT type. */ - if (UINT16BYTES(pfat_bpb50->bpbFATsecs) != 0) { + if (getushort(pfat_bpb50->bpbFATsecs) != 0) { /* The extended boot record is one place for FAT12/FAT16 * and another for FAT32. */ @@ -141,7 +134,7 @@ strlcpy(label, pfat_extboot->exVolumeLabel, MIN(size, sizeof(pfat_extboot->exVolumeLabel) + 1)); } - else if (UINT32BYTES(pfat_bpb710->bpbBigFATsecs) != 0) { + else if (getulong(pfat_bpb710->bpbBigFATsecs) != 0) { uint32_t fat_FirstDataSector, fat_BytesPerSector, offset; /* The extended boot record is one place for FAT12/FAT16 @@ -180,10 +173,10 @@ * the root directory. */ fat_FirstDataSector = - UINT16BYTES(pfat_bpb710->bpbResSectors) + + getushort(pfat_bpb710->bpbResSectors) + (pfat_bpb710->bpbFATs * - UINT32BYTES(pfat_bpb710->bpbBigFATsecs)); - fat_BytesPerSector = UINT16BYTES(pfat_bpb710->bpbBytesPerSec); + getulong(pfat_bpb710->bpbBigFATsecs)); + fat_BytesPerSector = getushort(pfat_bpb710->bpbBytesPerSec); G_LABEL_DEBUG(2, "MSDOSFS: FAT_FirstDataSector=0x%x, FAT_BytesPerSector=%d",