diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-04-15 13:03:45 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2003-04-15 13:03:45 +0000 |
| commit | c54764f9531d404cc54e5b5ddbfcc8e08f722503 (patch) | |
| tree | 929415510f12b7ab3cc5cbef61b07bb5f35afa3d /c | |
| parent | 2003-04-15 Joel Sherrill <joel@OARcorp.com> (diff) | |
| download | rtems-c54764f9531d404cc54e5b5ddbfcc8e08f722503.tar.bz2 | |
2003-04-15 Joel Sherrill <joel@OARcorp.com>
PR 387/rtems_misc
* ide/ata.c: Removed warning and moved to use of simpler libc routines.
* ide/ata_internal.h: Added missing newline and end of file.
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/libchip/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/libchip/ide/ata.c | 7 | ||||
| -rw-r--r-- | c/src/libchip/ide/ata_internal.h | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/c/src/libchip/ChangeLog b/c/src/libchip/ChangeLog index 296aef6c8a..d3f3001ac1 100644 --- a/c/src/libchip/ChangeLog +++ b/c/src/libchip/ChangeLog @@ -1,3 +1,9 @@ +2003-04-15 Joel Sherrill <joel@OARcorp.com> + + PR 387/rtems_misc + * ide/ata.c: Removed warning and moved to use of simpler libc routines. + * ide/ata_internal.h: Added missing newline and end of file. + 2003-03-27 Joel Sherrill <joel@OARcorp.com> * ide/Makefile.am: ATA code depends upon libchip/ide which is not diff --git a/c/src/libchip/ide/ata.c b/c/src/libchip/ide/ata.c index 29984d93cc..459f06818e 100644 --- a/c/src/libchip/ide/ata.c +++ b/c/src/libchip/ide/ata.c @@ -1185,8 +1185,10 @@ ata_initialize(rtems_device_major_number major, ata_devs[ata_devs_number].ctrl_minor = ctrl_minor; ata_devs[ata_devs_number].device = dev; - snprintf(name, ATA_MAX_NAME_LENGTH, "/dev/hd%c", - 'a' + 2 * ctrl_minor + dev); + /* The space leaves a hole for the character. */ + strcpy(name, "/dev/hd "); + name[7] = 'a' + 2 * ctrl_minor + dev; + device = rtems_filesystem_make_dev_t( major, (ata_devs_number * @@ -1314,3 +1316,4 @@ ata_process_request_on_init_phase(rtems_device_minor_number ctrl_minor, break; } } + diff --git a/c/src/libchip/ide/ata_internal.h b/c/src/libchip/ide/ata_internal.h index 0b17703ede..92850a6e63 100644 --- a/c/src/libchip/ide/ata_internal.h +++ b/c/src/libchip/ide/ata_internal.h @@ -325,4 +325,3 @@ typedef struct ata_ide_ctrl_s { #endif /* __ATA_INTERNAL_H__ */ -
\ No newline at end of file |