Changeset 137


Ignore:
Timestamp:
Aug 24, 2010, 1:36:51 PM (5 years ago)
Author:
oxygene
Message:

Drop old USB driver, and remove the "new" moniker from the new USB driver.
Also move usb driver out of its own directory - it's just one file.

Signed-off-by: Patrick Georgi <patrick.georgi@…>
Acked-by: Stefan Reinauer <stepan@…>

Location:
trunk/filo
Files:
2 deleted
7 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/filo/Config.in

    r129 r137  
    130130          Jens Axboe's fine IDE driver
    131131
    132 config USB_NEW_DISK
     132config USB_DISK
    133133        bool "USB Stack"
    134134        default y
    135         help
    136           Driver for USB Storage
    137 
    138 config USB_DISK
    139         bool "Old USB Stack (obsolete?)"
    140         default n
    141         depends on !USB_NEW_DISK
    142135        help
    143136          Driver for USB Storage
  • trunk/filo/Makefile

    r136 r137  
    7373BUILD-y := main/Makefile.inc main/grub/Makefile.inc fs/Makefile.inc
    7474BUILD-y += drivers/Makefile.inc
    75 BUILD-y += drivers/usb/Makefile.inc drivers/newusb/Makefile.inc drivers/flash/Makefile.inc
     75BUILD-y += drivers/flash/Makefile.inc
    7676
    7777include $(PLATFORM-y) $(BUILD-y)
     
    152152prepare:
    153153        $(Q)mkdir -p $(obj)/util/kconfig/lxdialog
    154         $(Q)mkdir -p $(obj)/i386 $(obj)/fs $(obj)/drivers/flash $(obj)/drivers/usb $(obj)/drivers/newusb
     154        $(Q)mkdir -p $(obj)/i386 $(obj)/fs $(obj)/drivers/flash
    155155        $(Q)mkdir -p $(obj)/main/grub
    156156
  • trunk/filo/configs/defconfig

    r129 r137  
    2121# CONFIG_IDE_DISK is not set
    2222CONFIG_IDE_NEW_DISK=y
    23 CONFIG_USB_NEW_DISK=y
     23CONFIG_USB_DISK=y
    2424# CONFIG_FLASH_DISK is not set
    2525CONFIG_SUPPORT_PCI=y
  • trunk/filo/drivers/Makefile.inc

    r86 r137  
    2020TARGETS-$(CONFIG_IDE_NEW_DISK) += drivers/ide_new.o
    2121TARGETS-$(CONFIG_VIA_SOUND) += drivers/via-sound.o
     22TARGETS-$(CONFIG_USB_DISK) += drivers/usb.o
    2223TARGETS-y += drivers/intel.o
    2324
  • trunk/filo/drivers/usb.c

    r136 r137  
    5555}
    5656
    57 int usb_new_probe(int drive)
     57int usb_probe(int drive)
    5858{
    5959        /* FIXME: need a place to periodically poll usb_poll().
     
    6767}
    6868
    69 int usb_new_read(const int drive, const sector_t sector, const int size, void *buffer)
     69int usb_read(const int drive, const sector_t sector, const int size, void *buffer)
    7070{
    7171        if (count < drive) return -1;
  • trunk/filo/fs/blockdev.c

    r116 r137  
    167167                name++;
    168168        } else if (memcmp(name, "ud", 2) == 0) {
    169                 *type = DISK_NEW_USB;
     169                *type = DISK_USB;
    170170                name += 2;
    171171                if (*name < 'a' || *name > 'z') {
     
    257257                break;
    258258#endif
    259 #if defined(CONFIG_USB_NEW_DISK) && defined(CONFIG_USB)
    260         case DISK_NEW_USB:
    261                 if (usb_new_probe(drive) != 0) {
    262                         debug("Failed to open USB.\n");
    263                         return 0;
    264                 }
    265                 disk_size = (uint32_t) - 1;     /* FIXME */
    266                 break;
    267 #endif
    268 
    269259#ifdef CONFIG_USB_DISK
    270260        case DISK_USB:
     
    407397                }
    408398#endif
    409 #if defined(CONFIG_USB_NEW_DISK) && defined(CONFIG_USB)
    410                 case DISK_NEW_USB:
     399#ifdef CONFIG_USB_DISK
     400                case DISK_USB:
    411401                {
    412402                        int count = (NUM_CACHE-hash>8)?8:(NUM_CACHE-hash);
    413                         if (usb_new_read(dev_drive, sector, count, buf) != 0)
     403                        if (usb_read(dev_drive, sector, count, buf) != 0)
    414404                                goto readerr;
    415405                        while (--count>0) {
     
    418408                        break;
    419409                }
    420 #endif
    421 #ifdef CONFIG_USB_DISK
    422                 case DISK_USB:
    423                         if (usb_read(dev_drive, sector, buf) != 0)
    424                                 goto readerr;
    425                         break;
    426410#endif
    427411
  • trunk/filo/include/fs.h

    r86 r137  
    4141#ifdef CONFIG_USB_DISK
    4242int usb_probe(int drive);
    43 int usb_read(int drive, sector_t sector, void *buffer);
    44 #endif
    45 
    46 #ifdef CONFIG_USB_NEW_DISK
    47 int usb_new_probe(int drive);
    48 int usb_new_read(const int drive, const sector_t sector, const int size, void *buffer);
     43int usb_read(const int drive, const sector_t sector, const int size, void *buffer);
    4944#endif
    5045
     
    5954#define DISK_USB 3
    6055#define DISK_FLASH 4
    61 #define DISK_NEW_USB 5
    6256
    6357int devopen(const char *name, int *reopen);
  • trunk/filo/main/filo.c

    r129 r137  
    7474
    7575#if defined(CONFIG_USB_DISK)
    76     usb_initialize();
    77 #endif
    78 #if defined(CONFIG_USB_NEW_DISK)
    7976#if defined(CONFIG_USB)
    8077    /* libpayload USB stack is there */
Note: See TracChangeset for help on using the changeset viewer.