[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[MiNT] [PATCH] Remove duplicate file part.h
Alan another patch.
Thanks for committing!
Commit message:
part.h header file belongs to the USB mass storage driver. Make the
driver's sources use the copy in his own directory and remove the
duplicated header in usb's source tree main directory.
Index: sys/usb/src.km/SRCFILES
===================================================================
RCS file: /mint/freemint/sys/usb/src.km/SRCFILES,v
retrieving revision 1.1
diff -u -8 -r1.1 SRCFILES
--- sys/usb/src.km/SRCFILES 29 Apr 2011 11:39:28 -0000 1.1
+++ sys/usb/src.km/SRCFILES 3 Apr 2014 08:25:11 -0000
@@ -1,17 +1,16 @@
# This file gets included by the Makefile in this directory to determine
# the files that should go only into source distributions.
HEADER = \
config.h \
global.h \
hub.h \
init.h \
- part.h \
ucd.h \
ucdload.h \
udd.h \
uddload.h \
usb.h \
usb_defs.h \
util.h \
version.h
Index: sys/usb/src.km/part.h
===================================================================
RCS file: sys/usb/src.km/part.h
diff -N sys/usb/src.km/part.h
--- sys/usb/src.km/part.h 29 Apr 2011 11:39:28 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,86 +0,0 @@
-/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-#ifndef _PART_H
-#define _PART_H
-
-typedef unsigned long long uint64_t;
-typedef unsigned long lbaint_t;
-
-typedef struct block_dev_desc
-{
- long if_type; /* type of the interface */
- long dev; /* device number */
- unsigned char part_type; /* partition type */
- unsigned char target; /* target SCSI ID */
- unsigned char lun; /* target LUN */
- unsigned char type; /* device type */
- unsigned char removable; /* removable device */
-#ifdef CONFIG_LBA48
- unsigned char lba48; /* device can use 48bit addr (ATA/ATAPI v7) */
-#endif
- lbaint_t lba; /* number of blocks */
- unsigned long blksz; /* block size */
- char vendor [40+1]; /* IDE model, SCSI Vendor */
- char product[20+1]; /* IDE Serial no, SCSI product */
- char revision[8+1]; /* firmware revision */
- unsigned long (*block_read)(long dev, unsigned long start, lbaint_t blkcnt, void *buffer);
- unsigned long (*block_write)(long dev, unsigned long start, lbaint_t blkcnt, const void *buffer);
- void *priv; /* driver private struct pointer */
-} block_dev_desc_t;
-
-/* Interface types: */
-#define IF_TYPE_UNKNOWN 0
-#define IF_TYPE_IDE 1
-#define IF_TYPE_SCSI 2
-#define IF_TYPE_ATAPI 3
-#define IF_TYPE_USB 4
-#define IF_TYPE_DOC 5
-#define IF_TYPE_MMC 6
-#define IF_TYPE_SD 7
-#define IF_TYPE_SATA 8
-
-/* Part types */
-#define PART_TYPE_UNKNOWN 0x00
-#define PART_TYPE_MAC 0x01
-#define PART_TYPE_DOS 0x02
-#define PART_TYPE_ISO 0x03
-#define PART_TYPE_AMIGA 0x04
-#define PART_TYPE_EFI 0x05
-
-/*
- * Type string for U-Boot bootable partitions
- */
-#define BOOT_PART_TYPE "U-Boot" /* primary boot partition type */
-#define BOOT_PART_COMP "PPCBoot" /* PPCBoot compatibility type */
-
-/* device types */
-#define DEV_TYPE_UNKNOWN 0xff /* not connected */
-#define DEV_TYPE_HARDDISK 0x00 /* harddisk */
-#define DEV_TYPE_TAPE 0x01 /* Tape */
-#define DEV_TYPE_CDROM 0x05 /* CD-ROM */
-#define DEV_TYPE_OPDISK 0x07 /* optical disk */
-
-void print_part(block_dev_desc_t *dev_desc);
-void init_part(block_dev_desc_t *dev_desc);
-void dev_print(block_dev_desc_t *dev_desc);
-
-long fat_register_device(block_dev_desc_t *dev_desc, long part_no, unsigned long *part_type, unsigned long *part_offset, unsigned long *part_size);
-
-#endif /* _PART_H */
Index: sys/usb/src.km/usb.h
===================================================================
RCS file: /mint/freemint/sys/usb/src.km/usb.h,v
retrieving revision 1.8
diff -u -8 -r1.8 usb.h
--- sys/usb/src.km/usb.h 20 Mar 2014 08:56:07 -0000 1.8
+++ sys/usb/src.km/usb.h 3 Apr 2014 08:25:11 -0000
@@ -27,17 +27,16 @@
#ifndef _USB_H_
#define _USB_H_
#include "mint/lists.h"
#include "mint/endian.h"
#include "mint/mdelay.h"
#include "ucd/pci-ohci/mod_devicetable.h"
#include "usb_defs.h"
-#include "part.h"
/* Everything is aribtrary */
#define USB_ALTSETTINGALLOC 4
#define USB_MAXALTSETTING 128 /* Hard limit */
#define USB_MAX_DEVICE 32
#define USB_MAXCONFIG 8
#define USB_MAXINTERFACES 8
Index: sys/usb/src.km/udd/storage/usb_storage.c
===================================================================
RCS file: /mint/freemint/sys/usb/src.km/udd/storage/usb_storage.c,v
retrieving revision 1.11
diff -u -8 -r1.11 usb_storage.c
--- sys/usb/src.km/udd/storage/usb_storage.c 8 Mar 2014 18:05:47 -0000 1.11
+++ sys/usb/src.km/udd/storage/usb_storage.c 3 Apr 2014 08:25:12 -0000
@@ -48,16 +48,17 @@
*/
#include <stddef.h>
#include "mint/mint.h"
#include "libkern/libkern.h"
#include "mint/dcntl.h"
+#include "part.h"
#include "scsi.h"
#include "../../config.h"
#include "../../usb.h"
#include "../udd_defs.h"
#include "../../usb_api.h"