From: Juergen Beisert <jbe@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 05/13] ATA/DISK: Reorganize file structure and names for future updates
Date: Thu, 24 Nov 2011 13:43:43 +0100 [thread overview]
Message-ID: <1322138631-8963-6-git-send-email-jbe@pengutronix.de> (raw)
In-Reply-To: <1322138631-8963-1-git-send-email-jbe@pengutronix.de>
'ATA' means more an interface than a disk drive. Change the names to reflect
their real meaning.
Signed-off-by: Juergen Beisert <jbe@pengutronix.de>
---
drivers/Makefile | 2 +-
drivers/ata/Kconfig | 23 +++++++++++++----------
drivers/ata/Makefile | 2 +-
drivers/ata/disk_drive.c | 4 ++--
drivers/mci/Kconfig | 4 ++--
5 files changed, 19 insertions(+), 16 deletions(-)
diff --git a/drivers/Makefile b/drivers/Makefile
index 16b3bb1..592c39e 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -4,7 +4,7 @@ obj-y += serial/
obj-y += mtd/
obj-y += nor/
obj-y += usb/
-obj-$(CONFIG_ATA) += ata/
+obj-$(CONFIG_DISK) += ata/
obj-$(CONFIG_SPI) += spi/
obj-$(CONFIG_I2C) += i2c/
obj-$(CONFIG_MCI) += mci/
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 5be1805..025ff94 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -1,27 +1,30 @@
-menuconfig ATA
+menuconfig DISK
select BLOCK
- bool "ATA "
+ bool "Disk support "
help
- Add support for ATA types of drives like harddisks and CDROMs.
+ Add support for disk like drives like harddisks, CDROMs, SD cards and
+ CF cards.
-if ATA
+if DISK
-config ATA_WRITE
+config DISK_WRITE
select BLOCK_WRITE
- bool "support writing to ATA drives"
+ bool "support writing to disk drives"
comment "drive types"
-config ATA_DISK
- bool "disk drives"
+config DISK_DRIVE
+ bool "Generic disk drives"
help
- Add support for regular disk drives
+ Add support for generic disk drives. Common behaviour for this kind
+ of devices is using a partition table in the first sector. Say Y here
+ if you intend to work with disk drives (also CF cards and SD cards).
comment "interface types"
config ATA_BIOS
bool "BIOS based"
- select ATA_DISK
+ select DISK_DRIVE
depends on X86_BIOS_BRINGUP
help
Gain disk drive access via int13 calls to the standard PC-BIOS.
diff --git a/drivers/ata/Makefile b/drivers/ata/Makefile
index 30d15cc..c3260d7 100644
--- a/drivers/ata/Makefile
+++ b/drivers/ata/Makefile
@@ -1,6 +1,6 @@
# drive types
-obj-$(CONFIG_ATA_DISK) += disk_drive.o
+obj-$(CONFIG_DISK_DRIVE) += disk_drive.o
# interface types
diff --git a/drivers/ata/disk_drive.c b/drivers/ata/disk_drive.c
index 6a5dc87..c2a6a51 100644
--- a/drivers/ata/disk_drive.c
+++ b/drivers/ata/disk_drive.c
@@ -144,7 +144,7 @@ static int atablk_read(struct block_device *blk, void *buf, int block,
return atablk->intf->read(atablk->dev, block, num_blocks, buf);
}
-#ifdef CONFIG_ATA_WRITE
+#ifdef CONFIG_DISK_WRITE
static int atablk_write(struct block_device *blk, const void *buf, int block,
int num_blocks)
{
@@ -156,7 +156,7 @@ static int atablk_write(struct block_device *blk, const void *buf, int block,
static struct block_device_ops ataops = {
.read = atablk_read,
-#ifdef CONFIG_ATA_WRITE
+#ifdef CONFIG_DISK_WRITE
.write = atablk_write,
#endif
};
diff --git a/drivers/mci/Kconfig b/drivers/mci/Kconfig
index 0d5a0e0..d24e606 100644
--- a/drivers/mci/Kconfig
+++ b/drivers/mci/Kconfig
@@ -1,7 +1,7 @@
menuconfig MCI
bool "MCI drivers "
- select ATA
- select ATA_DISK
+ select DISK
+ select DISK_DRIVE
help
Add support for MCI drivers, used to handle MMC and SD cards
--
1.7.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2011-11-24 12:44 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-24 12:43 [PATCHv3] Rework of handling disk like media Juergen Beisert
2011-11-24 12:43 ` [PATCH 01/13] USB Mass Storage driver: Fix compile time warning Juergen Beisert
2011-11-24 12:43 ` [PATCH 02/13] Create a unique cdev number for on demand devices Juergen Beisert
2011-11-24 12:43 ` [PATCH 03/13] ATA/DISK: Add generic disk support when enabling the BIOS disk driver Juergen Beisert
2011-11-24 12:43 ` [PATCH 04/13] ATA/DISK: Enabling write support does not belong to 'drive types' Juergen Beisert
2011-11-24 12:43 ` Juergen Beisert [this message]
2011-11-24 12:43 ` [PATCH 06/13] ATA/DISK: The BIOS based disk driver is not an interface Juergen Beisert
2011-11-24 12:43 ` [PATCH 07/13] ATA/DISK: Share important constants and structures Juergen Beisert
2011-11-24 12:43 ` [PATCH 08/13] DISK: Add common partition handling for disk like media Juergen Beisert
2011-11-24 12:48 ` Erwin Rol
2011-11-24 12:43 ` [PATCH 09/13] Use generic block layer to access the drives and do partition parsing Juergen Beisert
2011-11-24 12:43 ` [PATCH 10/13] Remove 'disk_drive.c' as it is now replaced by generic partition handling Juergen Beisert
2011-11-24 12:43 ` [PATCH 11/13] ATA/DISK: Remove the now unused header <ata.h> Juergen Beisert
2011-11-24 12:43 ` [PATCH 12/13] ATA Disk Support: Add support for native ATA type drives Juergen Beisert
2011-11-25 14:36 ` Juergen Beisert
2011-11-24 12:43 ` [PATCH 13/13] Add driver for IDE like interfaces Juergen Beisert
-- strict thread matches above, loose matches on Subject: below --
2011-11-22 8:29 [PATCHv2] Rework of handling disk like media Juergen Beisert
2011-11-22 8:29 ` [PATCH 05/13] ATA/DISK: Reorganize file structure and names for future updates Juergen Beisert
2011-11-16 9:24 Rework of handling disk like media Juergen Beisert
2011-11-16 9:24 ` [PATCH 05/13] ATA/DISK: Reorganize file structure and names for future updates Juergen Beisert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1322138631-8963-6-git-send-email-jbe@pengutronix.de \
--to=jbe@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox